Fix: Duplicates in _PyOpcode_OpName (python#59)

oraluben · Jul 11, 2023 · e44bf1c · e44bf1c
1 parent 4dd472a
commit e44bf1c
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 45 deletions.
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -479,8 +479,8 @@ def pseudo_op(name, op, real_ops):
     'BB_BRANCH', # When both exits have not been generated.
     # The BB_BRANCH transitions to one of these two.
     # This happens when the fall through is generated, but not the other branch.
-    'BB_BRANCH_IF_FLAG_UNSET',  # When alternate exit is not yet generated.
-    'BB_BRANCH_IF_FLAG_SET',    # When successor exit is not yet generated.
+    # Duplicated in the specialised # 'BB_BRANCH_IF_FLAG_UNSET',  # When alternate exit is not yet generated.
+    # Duplicated in the specialised # 'BB_BRANCH_IF_FLAG_SET',    # When successor exit is not yet generated.
     # When both edges are generated
     'BB_JUMP_IF_FLAG_UNSET',
     'BB_JUMP_IF_FLAG_SET',
@@ -490,9 +490,9 @@ def pseudo_op(name, op, real_ops):
     # These tests correspond to the jump instructions
     # FOR_ITER's null (iterator) check
     'BB_TEST_ITER',
-    'BB_TEST_ITER_RANGE',
-    'BB_TEST_ITER_LIST',
-    'BB_TEST_ITER_TUPLE',
+    # Duplicated in the specialised # 'BB_TEST_ITER_RANGE',
+    # Duplicated in the specialised # 'BB_TEST_ITER_LIST',
+    # Duplicated in the specialised # 'BB_TEST_ITER_TUPLE',
     # POP_JUMP_IF_FALSE, POP_JUMP_IF_TRUE
     'BB_TEST_POP_IF_FALSE',
     'BB_TEST_POP_IF_TRUE',

diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
diff --git a/Tools/build/generate_opcode_h.py b/Tools/build/generate_opcode_h.py
@@ -102,6 +102,7 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
     for name in opcode['_specialized_instructions']:
         while used[next_op]:
             next_op += 1
+        assert name not in opname_including_specialized
         specialized_opmap[name] = next_op
         opname_including_specialized[next_op] = name
         used[next_op] = True
@@ -117,6 +118,7 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
     for name in opcode['_uops']:
         while used[next_op]:
             next_op += 1
+        assert name not in opname_including_specialized
         uop_opmap[name] = next_op
         opname_including_specialized[next_op] = name
         used[next_op] = True