propagate only if false

iritkatriel · iritkatriel · commit 63e5c9cdb85d · 2024-01-24T14:48:40.000Z
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
@@ -1032,12 +1032,16 @@ basicblock_remove_redundant_nops(basicblock *bb) {
                 cfg_instr *next_instr = &bb->b_instr[src + 1];
                 int next_lineno = next_instr->i_loc.lineno;
                 if (next_lineno == lineno) {
-                    next_instr->i_loc_propagated = src_instr->i_loc_propagated;
+                    if (!src_instr->i_loc_propagated) {
+                        next_instr->i_loc_propagated = 0;
+                    }
                     continue;
                 }
                 if (next_lineno < 0) {
                     next_instr->i_loc = src_instr->i_loc;
-                    next_instr->i_loc_propagated = src_instr->i_loc_propagated;
+                    if (!src_instr->i_loc_propagated) {
+                        next_instr->i_loc_propagated = 0;
+                    }
                     continue;
                 }
             }
@@ -1057,7 +1061,9 @@ basicblock_remove_redundant_nops(basicblock *bb) {
                         break;
                     }
                     if (next_instr && lineno == next_instr->i_loc.lineno) {
-                        next_instr->i_loc_propagated = src_instr->i_loc_propagated;
+                        if (!src_instr->i_loc_propagated) {
+                            next_instr->i_loc_propagated = 0;
+                        }
                         continue;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1032,12 +1032,16 @@ basicblock_remove_redundant_nops(basicblock *bb) {`
`1032`	`1032`	`cfg_instr *next_instr = &bb->b_instr[src + 1];`
`1033`	`1033`	`int next_lineno = next_instr->i_loc.lineno;`
`1034`	`1034`	`if (next_lineno == lineno) {`
`1035`		`- next_instr->i_loc_propagated = src_instr->i_loc_propagated;`
	`1035`	`+ if (!src_instr->i_loc_propagated) {`
	`1036`	`+ next_instr->i_loc_propagated = 0;`
	`1037`	`+ }`
`1036`	`1038`	`continue;`
`1037`	`1039`	`}`
`1038`	`1040`	`if (next_lineno < 0) {`
`1039`	`1041`	`next_instr->i_loc = src_instr->i_loc;`
`1040`		`- next_instr->i_loc_propagated = src_instr->i_loc_propagated;`
	`1042`	`+ if (!src_instr->i_loc_propagated) {`
	`1043`	`+ next_instr->i_loc_propagated = 0;`
	`1044`	`+ }`
`1041`	`1045`	`continue;`
`1042`	`1046`	`}`
`1043`	`1047`	`}`
`@@ -1057,7 +1061,9 @@ basicblock_remove_redundant_nops(basicblock *bb) {`
`1057`	`1061`	`break;`
`1058`	`1062`	`}`
`1059`	`1063`	`if (next_instr && lineno == next_instr->i_loc.lineno) {`
`1060`		`- next_instr->i_loc_propagated = src_instr->i_loc_propagated;`
	`1064`	`+ if (!src_instr->i_loc_propagated) {`
	`1065`	`+ next_instr->i_loc_propagated = 0;`
	`1066`	`+ }`
`1061`	`1067`	`continue;`
`1062`	`1068`	`}`
`1063`	`1069`	`}`