fix: wrong offset in BB_BRANCH_IF_FLAG_SET codegen (python#21)

oraluben · Jun 4, 2023 · b398fab · b398fab
1 parent f876fdb
commit b398fab
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -3355,10 +3355,10 @@ dummy_func(
                 _Py_CODEUNIT *t2_nextinstr = NULL;
                 _PyBBBranchCache *cache = (_PyBBBranchCache *)next_instr;
                 _Py_CODEUNIT *tier1_fallback = NULL;
-
                 t2_nextinstr = _PyTier2_GenerateNextBB(
                     frame, cache->bb_id_tagged, next_instr - 1,
-                    oparg, &tier1_fallback, bb_test);
+                //  v   We generate from the tier1 consequent BB, so offset (oparg) is 0.
+                    0, &tier1_fallback, bb_test);
                 if (t2_nextinstr == NULL) {
                     // Fall back to tier 1.
                     next_instr = tier1_fallback;

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
@@ -1044,7 +1044,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
     [BB_BRANCH] = { true, INSTR_FMT_IBC },
     [BB_BRANCH_IF_FLAG_UNSET] = { true, INSTR_FMT_IBC },
     [BB_JUMP_IF_FLAG_UNSET] = { true, INSTR_FMT_IBC },
-    [BB_BRANCH_IF_FLAG_SET] = { true, INSTR_FMT_IBC },
+    [BB_BRANCH_IF_FLAG_SET] = { true, INSTR_FMT_IXC },
     [BB_JUMP_IF_FLAG_SET] = { true, INSTR_FMT_IBC },
     [BB_JUMP_BACKWARD_LAZY] = { true, INSTR_FMT_IB },
 };

diff --git a/tier2_test.py b/tier2_test.py
@@ -477,4 +477,20 @@ def f(x):
     trigger_tier2(f, (1,))
 
     # As long as it doesn't crash, everything's good.
+
+######################################################################
+# Tests for: Tier 2 BB_BRANCH_IF_FLAG_SET codegen                    #
+######################################################################
+with TestInfo("tier 2 BB_BRANCH_IF_FLAG_SET codegen"):
+    # See https://github.com/pylbbv/pylbbv/issues/18 for more information.
+    def f(x,l):
+        for _ in l:
+            _
+        x+x # Force it to be optimisable
+
+    trigger_tier2(f, (1, []))
+    f(1, [1])
+
+    # As long as it doesn't crash, everything's good.
+
 print("Tests completed ^-^")