Replace kill/pop_dead_inputs with pop_input

Author: mpage

Lib/test/test_generated_cases.py

@@ -1674,35 +1674,10 @@ def test_pystackref_frompyobject_new_next_to_cmacro(self):
         """
         self.run_cases_test(input, output)
 
-    def test_pop_dead_inputs_all_live(self):
+    def test_pop_input(self):
         input = """
         inst(OP, (a, b --)) {
-            POP_DEAD_INPUTS();
-            HAM(a, b);
-            INPUTS_DEAD();
-        }
-        """
-        output = """
-        TARGET(OP) {
-            frame->instr_ptr = next_instr;
-            next_instr += 1;
-            INSTRUCTION_STATS(OP);
-            _PyStackRef a;
-            _PyStackRef b;
-            b = stack_pointer[-1];
-            a = stack_pointer[-2];
-            HAM(a, b);
-            stack_pointer += -2;
-            assert(WITHIN_STACK_BOUNDS());
-            DISPATCH();
-        }
-        """
-        self.run_cases_test(input, output)
-
-    def test_pop_dead_inputs_some_live(self):
-        input = """
-        inst(OP, (a, b, c --)) {
-            POP_DEAD_INPUTS();
+            POP_INPUT();
             HAM(a);
             INPUTS_DEAD();
         }
@@ -1713,8 +1688,8 @@ def test_pop_dead_inputs_some_live(self):
             next_instr += 1;
             INSTRUCTION_STATS(OP);
             _PyStackRef a;
-            a = stack_pointer[-3];
-            stack_pointer += -2;
+            a = stack_pointer[-2];
+            stack_pointer += -1;
             assert(WITHIN_STACK_BOUNDS());
             HAM(a);
             stack_pointer += -1;
@@ -1724,29 +1699,14 @@ def test_pop_dead_inputs_some_live(self):
         """
         self.run_cases_test(input, output)
 
-    def test_pop_dead_inputs_with_output(self):
+    def test_pop_input_with_empty_stack(self):
         input = """
-        inst(OP, (a, b -- c)) {
-            POP_DEAD_INPUTS();
-            c = SPAM();
-        }
-        """
-        output = """
-        TARGET(OP) {
-            frame->instr_ptr = next_instr;
-            next_instr += 1;
-            INSTRUCTION_STATS(OP);
-            _PyStackRef c;
-            stack_pointer += -2;
-            assert(WITHIN_STACK_BOUNDS());
-            c = SPAM();
-            stack_pointer[0] = c;
-            stack_pointer += 1;
-            assert(WITHIN_STACK_BOUNDS());
-            DISPATCH();
+        inst(OP, (--)) {
+            POP_INPUT();
         }
         """
-        self.run_cases_test(input, output)
+        with self.assertRaises(SyntaxError):
+            self.run_cases_test(input, "")
 
     def test_no_escaping_calls_in_branching_macros(self):
 

Python/bytecodes.c

@@ -2221,9 +2221,8 @@ dummy_func(
             assert(index < FT_ATOMIC_LOAD_SSIZE_RELAXED(mod_keys->dk_nentries));
             PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(mod_keys) + index;
             PyObject *attr_o = FT_ATOMIC_LOAD_PTR_RELAXED(ep->me_value);
-            DEAD(mod_keys);
             // Clear mod_keys from stack in case we need to deopt
-            POP_DEAD_INPUTS();
+            POP_INPUT();
             DEOPT_IF(attr_o == NULL);
             #ifdef Py_GIL_DISABLED
             int increfed = _Py_TryIncrefCompareStackRef(&ep->me_value, attr_o, &attr);
@@ -2258,36 +2257,31 @@ dummy_func(
         op(_LOAD_ATTR_WITH_HINT, (hint/1, owner, dict: PyDictObject * -- attr, null if (oparg & 1))) {
             PyObject *attr_o;
             if (!LOCK_OBJECT(dict)) {
-                DEAD(dict);
-                POP_DEAD_INPUTS();
+                POP_INPUT();
                 DEOPT_IF(true);
             }
 
             if (hint >= (size_t)dict->ma_keys->dk_nentries) {
                 UNLOCK_OBJECT(dict);
-                DEAD(dict);
-                POP_DEAD_INPUTS();
+                POP_INPUT();
                 DEOPT_IF(true);
             }
             PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
             if (dict->ma_keys->dk_kind != DICT_KEYS_UNICODE) {
                 UNLOCK_OBJECT(dict);
-                DEAD(dict);
-                POP_DEAD_INPUTS();
+                POP_INPUT();
                 DEOPT_IF(true);
             }
             PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint;
             if (ep->me_key != name) {
                 UNLOCK_OBJECT(dict);
-                DEAD(dict);
-                POP_DEAD_INPUTS();
+                POP_INPUT();
                 DEOPT_IF(true);
             }
             attr_o = ep->me_value;
             if (attr_o == NULL) {
                 UNLOCK_OBJECT(dict);
-                DEAD(dict);
-                POP_DEAD_INPUTS();
+                POP_INPUT();
                 DEOPT_IF(true);
             }
             STAT_INC(LOAD_ATTR, hit);

Tools/cases_generator/generators_common.py

@@ -120,7 +120,7 @@ def __init__(self, out: CWriter):
             "PyStackRef_AsPyObjectSteal": self.stackref_steal,
             "DISPATCH": self.dispatch,
             "INSTRUCTION_SIZE": self.instruction_size,
-            "POP_DEAD_INPUTS": self.pop_dead_inputs,
+            "POP_INPUT": self.pop_input,
         }
         self.out = out
 
@@ -349,7 +349,7 @@ def save_stack(
         self.emit_save(storage)
         return True
 
-    def pop_dead_inputs(
+    def pop_input(
         self,
         tkn: Token,
         tkn_iter: TokenIterator,
@@ -360,7 +360,11 @@ def pop_dead_inputs(
         next(tkn_iter)
         next(tkn_iter)
         next(tkn_iter)
-        storage.pop_dead_inputs(self.out)
+        if not storage.inputs:
+            raise analysis_error("stack is empty", tkn)
+        storage.inputs[-1].defined = False
+        storage.clear_dead_inputs()
+        storage.flush(self.out)
         return True
 
     def emit_reload(self, storage: Storage) -> None:

Tools/cases_generator/stack.py

@@ -512,10 +512,6 @@ def flush(self, out: CWriter, cast_type: str = "uintptr_t", extract_bits: bool =
         self._push_defined_outputs()
         self.stack.flush(out, cast_type, extract_bits)
 
-    def pop_dead_inputs(self, out: CWriter, cast_type: str = "uintptr_t", extract_bits: bool = True) -> None:
-        self.clear_dead_inputs()
-        self.stack.flush(out, cast_type, extract_bits)
-
     def save(self, out: CWriter) -> None:
         assert self.spilled >= 0
         if self.spilled == 0: