gh-105481: simplify definition of pseudo ops in Lib/opcode.py

iritkatriel · iritkatriel · commit a9205b744d24 · 2023-08-01T21:44:35.000+01:00
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -19,23 +19,11 @@
 
 cmp_op = ('<', '<=', '==', '!=', '>', '>=')
 
-def is_pseudo(op):
-    return op >= MIN_PSEUDO_OPCODE and op <= MAX_PSEUDO_OPCODE
-
 opmap = {}
 
-# pseudo opcodes (used in the compiler) mapped to the values
-# they can become in the actual code.
-_pseudo_ops = {}
-
 def def_op(name, op):
     opmap[name] = op
 
-def pseudo_op(name, op, real_ops):
-    def_op(name, op)
-    _pseudo_ops[name] = real_ops
-
-
 # Instruction opcodes for compiled code
 # Blank lines correspond to available opcodes
 
@@ -213,24 +201,29 @@ def pseudo_op(name, op, real_ops):
 
 
 MIN_PSEUDO_OPCODE = 256
+MAX_PSEUDO_OPCODE = -1
 
-pseudo_op('SETUP_FINALLY', 256, ['NOP'])
-pseudo_op('SETUP_CLEANUP', 257, ['NOP'])
-pseudo_op('SETUP_WITH', 258, ['NOP'])
-pseudo_op('POP_BLOCK', 259, ['NOP'])
+def pseudo_op(name, op):
+    global MAX_PSEUDO_OPCODE
+    if op > MAX_PSEUDO_OPCODE:
+        MAX_PSEUDO_OPCODE = op
+    def_op(name, op)
 
-pseudo_op('JUMP', 260, ['JUMP_FORWARD', 'JUMP_BACKWARD'])
-pseudo_op('JUMP_NO_INTERRUPT', 261, ['JUMP_FORWARD', 'JUMP_BACKWARD_NO_INTERRUPT'])
+pseudo_op('SETUP_FINALLY', 256)
+pseudo_op('SETUP_CLEANUP', 257)
+pseudo_op('SETUP_WITH', 258)
+pseudo_op('POP_BLOCK', 259)
 
-pseudo_op('LOAD_METHOD', 262, ['LOAD_ATTR'])
-pseudo_op('LOAD_SUPER_METHOD', 263, ['LOAD_SUPER_ATTR'])
-pseudo_op('LOAD_ZERO_SUPER_METHOD', 264, ['LOAD_SUPER_ATTR'])
-pseudo_op('LOAD_ZERO_SUPER_ATTR', 265, ['LOAD_SUPER_ATTR'])
+pseudo_op('JUMP', 260)
+pseudo_op('JUMP_NO_INTERRUPT', 261)
 
-pseudo_op('STORE_FAST_MAYBE_NULL', 266, ['STORE_FAST'])
-pseudo_op('LOAD_CLOSURE', 267, ['LOAD_FAST'])
+pseudo_op('LOAD_METHOD', 262)
+pseudo_op('LOAD_SUPER_METHOD', 263)
+pseudo_op('LOAD_ZERO_SUPER_METHOD', 264)
+pseudo_op('LOAD_ZERO_SUPER_ATTR', 265)
 
-MAX_PSEUDO_OPCODE = MIN_PSEUDO_OPCODE + len(_pseudo_ops) - 1
+pseudo_op('STORE_FAST_MAYBE_NULL', 266)
+pseudo_op('LOAD_CLOSURE', 267)
 
 del def_op, pseudo_op
 
diff --git a/Misc/NEWS.d/next/Library/2023-08-01-21-43-58.gh-issue-105481.cl2ajS.rst b/Misc/NEWS.d/next/Library/2023-08-01-21-43-58.gh-issue-105481.cl2ajS.rst
@@ -0,0 +1,3 @@
+Remove ``opcode.is_pseudo``, which was added in 3.12, was never documented
+and not intended to be used externally. It is a shortcut for ``op >=
+opcode.MIN_PSEUDO_OPCODE and op <= opcode.MAX_PSEUDO_OPCODE``.
diff --git a/Tools/build/generate_opcode_h.py b/Tools/build/generate_opcode_h.py
@@ -72,12 +72,14 @@ def main(opcode_py,
     opcode = get_python_module_dict(opcode_py)
     opmap = opcode['opmap']
     opname = opcode['opname']
-    is_pseudo = opcode['is_pseudo']
 
     MIN_PSEUDO_OPCODE = opcode["MIN_PSEUDO_OPCODE"]
     MAX_PSEUDO_OPCODE = opcode["MAX_PSEUDO_OPCODE"]
     MIN_INSTRUMENTED_OPCODE = opcode["MIN_INSTRUMENTED_OPCODE"]
 
+    def is_pseudo(op):
+        return op >= MIN_PSEUDO_OPCODE and op <= MAX_PSEUDO_OPCODE
+
     NUM_OPCODES = len(opname)
     used = [ False ] * len(opname)
     next_op = 1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Remove ``opcode.is_pseudo``, which was added in 3.12, was never documented
	`2`	+and not intended to be used externally. It is a shortcut for ``op >=
	`3`	+opcode.MIN_PSEUDO_OPCODE and op <= opcode.MAX_PSEUDO_OPCODE``.