[3.11] GH-91409: Don't overwrite valid locations with NOP locations (GH-95067) (GH-95068)

(cherry picked from commit 742d4614e1)
This commit is contained in:
Brandt Bucher 2022-07-20 15:01:42 -07:00 committed by GitHub
parent 6515738c0e
commit e2fce3a8e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 1 deletions

View file

@ -9045,7 +9045,10 @@ clean_basic_block(basicblock *bb) {
/* or, if the next instruction has same line number or no line number */
if (src < bb->b_iused - 1) {
int next_lineno = bb->b_instr[src+1].i_lineno;
if (next_lineno < 0 || next_lineno == lineno) {
if (next_lineno == lineno) {
continue;
}
if (next_lineno < 0) {
COPY_INSTR_LOC(bb->b_instr[src], bb->b_instr[src+1]);
continue;
}