fix: bb_test_pop_if_false not setting flag (python#24)

Fidget-Spinner · web-flow · commit 7cab3165ca95 · 2023-06-08T22:11:46.000+08:00
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -1977,6 +1977,7 @@ dummy_func(
                 }
                 else {
                     ERROR_IF(err < 0, error);
+                    bb_test = BB_TEST(1, 0);
                 }
             }
         }
@@ -2018,6 +2019,7 @@ dummy_func(
                 }
                 else {
                     ERROR_IF(err < 0, error);
+                    bb_test = BB_TEST(1, 0);
                 }
             }
         }
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/tier2.c b/Python/tier2.c
@@ -1131,6 +1131,7 @@ emit_type_guard(_Py_CODEUNIT *write_curr, int guard_opcode, int guard_oparg, int
     fprintf(stderr, "emitted type guard %p %s\n", write_curr,
         _PyOpcode_OpName[guard_opcode]);
 #endif
+    assert(guard_oparg <= 0xFF);
     write_curr->op.code = guard_opcode;
     write_curr->op.arg = guard_oparg & 0xFF;
     write_curr++;
@@ -3009,6 +3010,7 @@ _PyTier2_RewriteForwardJump(_Py_CODEUNIT *bb_branch, _Py_CODEUNIT *target)
     }
     else {
         _py_set_opcode(write_curr, NOP);
+        write_curr->op.arg = 0;
         write_curr++;
     }
     _py_set_opcode(write_curr,
@@ -3064,6 +3066,7 @@ _PyTier2_RewriteBackwardJump(_Py_CODEUNIT *jump_backward_lazy, _Py_CODEUNIT *tar
     }
     else {
         _py_set_opcode(write_curr, NOP);
+        write_curr->op.arg = 0;
         write_curr++;
     }
     _py_set_opcode(write_curr, is_backwards_jump
diff --git a/tier2_test.py b/tier2_test.py
@@ -493,4 +493,30 @@ def f(x,l):
 
     # As long as it doesn't crash, everything's good.
 
+######################################################################
+# Tests for: Tier 2 BB_TEST_POP_IF_FALSE flag setting                #
+######################################################################
+with TestInfo("tier 2 BB_TEST_POP_IF_FALSE flag setting"):
+    # See https://github.com/pylbbv/pylbbv/issues/23 for more information.
+    import sys
+
+    class A:
+        def __init__(self): ...
+        def __add__(self, _): return "Hewwo!"
+
+    def f(a):
+        b = 1
+        if a: b = A()
+        print(b)
+        return b+b
+
+
+    for _ in range(63): f(0)
+
+    assert f(1) == "Hewwo!"
+
+    assert f(0) == 2
+
+    # As long as it doesn't crash, everything's good.
+
 print("Tests completed ^-^")

Original file line number	Diff line number	Diff line change
`@@ -1977,6 +1977,7 @@ dummy_func(`
`1977`	`1977`	`}`
`1978`	`1978`	`else {`
`1979`	`1979`	`ERROR_IF(err < 0, error);`
	`1980`	`+ bb_test = BB_TEST(1, 0);`
`1980`	`1981`	`}`
`1981`	`1982`	`}`
`1982`	`1983`	`}`
`@@ -2018,6 +2019,7 @@ dummy_func(`
`2018`	`2019`	`}`
`2019`	`2020`	`else {`
`2020`	`2021`	`ERROR_IF(err < 0, error);`
	`2022`	`+ bb_test = BB_TEST(1, 0);`
`2021`	`2023`	`}`
`2022`	`2024`	`}`
`2023`	`2025`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1131,6 +1131,7 @@ emit_type_guard(_Py_CODEUNIT *write_curr, int guard_opcode, int guard_oparg, int`
`1131`	`1131`	`fprintf(stderr, "emitted type guard %p %s\n", write_curr,`
`1132`	`1132`	`_PyOpcode_OpName[guard_opcode]);`
`1133`	`1133`	`#endif`
	`1134`	`+ assert(guard_oparg <= 0xFF);`
`1134`	`1135`	`write_curr->op.code = guard_opcode;`
`1135`	`1136`	`write_curr->op.arg = guard_oparg & 0xFF;`
`1136`	`1137`	`write_curr++;`
`@@ -3009,6 +3010,7 @@ _PyTier2_RewriteForwardJump(_Py_CODEUNIT bb_branch, _Py_CODEUNIT target)`
`3009`	`3010`	`}`
`3010`	`3011`	`else {`
`3011`	`3012`	`_py_set_opcode(write_curr, NOP);`
	`3013`	`+ write_curr->op.arg = 0;`
`3012`	`3014`	`write_curr++;`
`3013`	`3015`	`}`
`3014`	`3016`	`_py_set_opcode(write_curr,`
`@@ -3064,6 +3066,7 @@ _PyTier2_RewriteBackwardJump(_Py_CODEUNIT jump_backward_lazy, _Py_CODEUNIT tar`
`3064`	`3066`	`}`
`3065`	`3067`	`else {`
`3066`	`3068`	`_py_set_opcode(write_curr, NOP);`
	`3069`	`+ write_curr->op.arg = 0;`
`3067`	`3070`	`write_curr++;`
`3068`	`3071`	`}`
`3069`	`3072`	`_py_set_opcode(write_curr, is_backwards_jump`