Make RESUME a viable uop

Author: gvanrossum

Include/internal/pycore_opcode_metadata.h

@@ -2633,6 +2633,7 @@ def dummy(x):
         self.assertIsNotNone(ex)
         uops = {opname for opname, _, _ in ex}
         self.assertIn("_PUSH_FRAME", uops)
+        self.assertIn("_BINARY_OP_ADD_INT", uops)
 
 
 

Lib/test/test_capi/test_misc.py

@@ -135,6 +135,7 @@ dummy_func(
         }
 
         inst(RESUME, (--)) {
+            #if TIER_ONE
             assert(tstate->cframe == &cframe);
             assert(frame == cframe.current_frame);
             /* Possibly combine this with eval breaker */
@@ -143,7 +144,9 @@ dummy_func(
                 ERROR_IF(err, error);
                 next_instr--;
             }
-            else if (oparg < 2) {
+            else
+            #endif
+            if (oparg < 2) {
                 CHECK_EVAL_BREAKER();
             }
         }

Python/bytecodes.c

@@ -92,7 +92,7 @@ def variable_used_unspecialized(node: parsing.Node, name: str) -> bool:
             if text == "#if":
                 if (
                     i + 1 < len(node.tokens)
-                    and node.tokens[i + 1].text == "ENABLE_SPECIALIZATION"
+                    and node.tokens[i + 1].text in ("ENABLE_SPECIALIZATION", "TIER_ONE")
                 ):
                     skipping = True
             elif text in ("#else", "#endif"):

Python/executor_cases.c.h

@@ -122,8 +122,8 @@ def __init__(self, inst: parsing.InstDef):
     def is_viable_uop(self) -> bool:
         """Whether this instruction is viable as a uop."""
         dprint: typing.Callable[..., None] = lambda *args, **kwargs: None
-        if "PUSH_FRAME" in self.name:
-            dprint = print
+        # if "RESUME" in self.name:
+        #     dprint = print
 
         if self.name == "EXIT_TRACE":
             return True  # This has 'return frame' but it's okay