generate hasexc from the C macros instead of defining it again

python · iritkatriel · Jul 18, 2023 · Jul 14, 2023 · Jul 14, 2023 · Jul 15, 2023
commit 24786fbc33c6118a78c29a224f6e35456b02f4dc
diff --git a/Include/cpython/compile.h b/Include/cpython/compile.h
@@ -75,4 +75,5 @@ PyAPI_FUNC(int) PyUnstable_OpcodeHasName(int opcode);
 PyAPI_FUNC(int) PyUnstable_OpcodeHasJump(int opcode);
 PyAPI_FUNC(int) PyUnstable_OpcodeHasFree(int opcode);
 PyAPI_FUNC(int) PyUnstable_OpcodeHasLocal(int opcode);
+PyAPI_FUNC(int) PyUnstable_OpcodeHasExc(int opcode);
 
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -30,15 +30,14 @@
 cmp_op = ('<', '<=', '==', '!=', '>', '>=')
 
 hascompare = []
-hasexc = []
 
 
 ENABLE_SPECIALIZATION = True
 
 def is_pseudo(op):
     return op >= MIN_PSEUDO_OPCODE and op <= MAX_PSEUDO_OPCODE
 
-oplists = [hascompare, hasexc]
+oplists = [hascompare]
 
 opmap = {}
 
@@ -240,11 +239,8 @@ def pseudo_op(name, op, real_ops):
 MIN_PSEUDO_OPCODE = 256
 
 pseudo_op('SETUP_FINALLY', 256, ['NOP'])
-hasexc.append(256)
 pseudo_op('SETUP_CLEANUP', 257, ['NOP'])
-hasexc.append(257)
 pseudo_op('SETUP_WITH', 258, ['NOP'])
-hasexc.append(258)
 pseudo_op('POP_BLOCK', 259, ['NOP'])
 
 pseudo_op('JUMP', 260, ['JUMP_FORWARD', 'JUMP_BACKWARD'])
@@ -277,6 +273,7 @@ def pseudo_op(name, op, real_ops):
     hasjabs = []
     hasfree = [op for op in opmap.values() if _opcode.has_free(op)]
     haslocal = [op for op in opmap.values() if _opcode.has_local(op)]
+    hasexc = [op for op in opmap.values() if _opcode.has_exc(op)]
 except (ImportError, AttributeError):
     hasarg = []
     hasconst = []
@@ -286,6 +283,7 @@ def pseudo_op(name, op, real_ops):
     hasjabs = []
     hasfree = []
     haslocal = []
+    hasexc = []
 
 _nb_ops = [
     ("NB_ADD", "+"),

diff --git a/Lib/test/test__opcode.py b/Lib/test/test__opcode.py
@@ -26,6 +26,7 @@ def test_invalid_opcodes(self):
         self.check_bool_function_result(_opcode.has_jump, invalid, False)
         self.check_bool_function_result(_opcode.has_free, invalid, False)
         self.check_bool_function_result(_opcode.has_local, invalid, False)
+        self.check_bool_function_result(_opcode.has_exc, invalid, False)
 
     def test_is_valid(self):
         names = [
@@ -77,6 +78,12 @@ def test_has_local(self):
         self.check_bool_function_result(_opcode.has_local, has_local, True)
         self.check_bool_function_result(_opcode.has_local, no_local, False)
 
+    def test_has_exc(self):
+        has_exc = ['SETUP_FINALLY', 'SETUP_WITH', 'SETUP_CLEANUP']
+        no_exc = ['DELETE_DEREF', 'POP_TOP', 'NOP', 'CACHE']
+        self.check_bool_function_result(_opcode.has_exc, has_exc, True)
+        self.check_bool_function_result(_opcode.has_exc, no_exc, False)
+
     def test_stack_effect(self):
         self.assertEqual(stack_effect(dis.opmap['POP_TOP']), -1)
         self.assertEqual(stack_effect(dis.opmap['BUILD_SLICE'], 0), -1)

diff --git a/Modules/_opcode.c b/Modules/_opcode.c
@@ -161,7 +161,7 @@ or builtin scopes.
 
 static int
 _opcode_has_free_impl(PyObject *module, int opcode)
-/*[clinic end generated code: output=d81ae4d79af0ee26 input=6b2ce67a4a4017b1]*/
+/*[clinic end generated code: output=d81ae4d79af0ee26 input=f94ce9c2475f3ff0]*/
 {
     return PyUnstable_OpcodeIsValid(opcode) &&
            PyUnstable_OpcodeHasFree(opcode);
@@ -183,9 +183,24 @@ _opcode_has_local_impl(PyObject *module, int opcode)
 {
     return PyUnstable_OpcodeIsValid(opcode) &&
            PyUnstable_OpcodeHasLocal(opcode);
-
 }
 
+/*[clinic input]
+
+_opcode.has_exc -> bool
+
+  opcode: int
+
+Return True if the opcode sets and exception handler, False otherwise.
+[clinic start generated code]*/
+
+static int
+_opcode_has_exc_impl(PyObject *module, int opcode)
+/*[clinic end generated code: output=41b68dff0ec82a52 input=a3f202bb94f233b5]*/
+{
+    return PyUnstable_OpcodeIsValid(opcode) &&
+           PyUnstable_OpcodeHasExc(opcode);
+}
 
 /*[clinic input]
 
@@ -215,6 +230,7 @@ opcode_functions[] =  {
     _OPCODE_HAS_JUMP_METHODDEF
     _OPCODE_HAS_FREE_METHODDEF
     _OPCODE_HAS_LOCAL_METHODDEF
+    _OPCODE_HAS_EXC_METHODDEF
     _OPCODE_GET_SPECIALIZATION_STATS_METHODDEF
     {NULL, NULL, 0, NULL}
 };

diff --git a/Modules/clinic/_opcode.c.h b/Modules/clinic/_opcode.c.h
@@ -908,6 +908,12 @@ PyUnstable_OpcodeHasLocal(int opcode)
     return OPCODE_HAS_LOCAL(opcode);
 }
 
+int
+PyUnstable_OpcodeHasExc(int opcode)
+{
+    return IS_BLOCK_PUSH_OPCODE(opcode);
+}
+
 static int
 codegen_addop_noarg(instr_sequence *seq, int opcode, location loc)
 {