gh-106812: Small stack effect fixes (#107759)

- Generalize the syntax for the type of a stack effect to allow a trailing `*`,
  so we can declare something as e.g. `PyCodeObject *`.

- When generating assignments for stack effects,
  the type of the value on the stack should be the default (i.e., `PyObject *`)
  even when the variable copied to/from it has a different type,
  so that an appropriate cast is generated
  However, not when the variable is an array --
  then the type is taken from the variable (as it is always `PyObject **`).

diff --git a/Tools/cases_generator/interpreter_definition.md b/Tools/cases_generator/interpreter_definition.md
index f141848631d04ab2d4c29f7bd8d6d6428f0c9c31..5c4238756748a7a736573e7f841fdc5334cf8283 100644 (file)
--- a/Tools/cases_generator/interpreter_definition.md
+++ b/Tools/cases_generator/interpreter_definition.md
@@ -108,7 +108,7 @@ and a piece of C code describing its semantics::
     NAME [":" type] [ "if" "(" C-expression ")" ]
 
   type:
-    NAME
+    NAME ["*"]
 
   stream:
     NAME "/" size

diff --git a/Tools/cases_generator/parsing.py b/Tools/cases_generator/parsing.py
index 5610ac661a89451cef19d3710ae69c2e59344cfd..cdd20d7a0b3f59c246def3ba58f0106a27d36e2b 100644 (file)
--- a/Tools/cases_generator/parsing.py
+++ b/Tools/cases_generator/parsing.py
@@ -252,12 +252,14 @@ class Parser(PLexer):
 
     @contextual
     def stack_effect(self) -> StackEffect | None:
-        #   IDENTIFIER [':' IDENTIFIER] ['if' '(' expression ')']
+        #   IDENTIFIER [':' IDENTIFIER [TIMES]] ['if' '(' expression ')']
         # | IDENTIFIER '[' expression ']'
         if tkn := self.expect(lx.IDENTIFIER):
             type_text = ""
             if self.expect(lx.COLON):
                 type_text = self.require(lx.IDENTIFIER).text.strip()
+                if self.expect(lx.TIMES):
+                    type_text += " *"
             cond_text = ""
             if self.expect(lx.IF):
                 self.require(lx.LPAREN)

diff --git a/Tools/cases_generator/stacking.py b/Tools/cases_generator/stacking.py
index 23eca3037f896d6e2fdb75fa46c0ba3d4f75ec7f..d457ce01a8f438d3e677cf13a0ea6b4f6792df95 100644 (file)
--- a/Tools/cases_generator/stacking.py
+++ b/Tools/cases_generator/stacking.py
@@ -120,6 +120,14 @@ class StackItem:
             ), f"Push or pop above current stack level: {res}"
         return res
 
+    def as_stack_effect(self, lax: bool = False) -> StackEffect:
+        return StackEffect(
+            self.as_variable(lax=lax),
+            self.effect.type if self.effect.size else "",
+            self.effect.cond,
+            self.effect.size,
+        )
+
 
 @dataclasses.dataclass
 class CopyEffect:
@@ -356,24 +364,14 @@ def write_components(
         for peek in mgr.peeks:
             out.assign(
                 peek.effect,
-                StackEffect(
-                    peek.as_variable(),
-                    peek.effect.type,
-                    peek.effect.cond,
-                    peek.effect.size,
-                ),
+                peek.as_stack_effect(),
             )
         # Initialize array outputs
         for poke in mgr.pokes:
             if poke.effect.size and poke.effect.name not in mgr.instr.unmoved_names:
                 out.assign(
                     poke.effect,
-                    StackEffect(
-                        poke.as_variable(lax=True),
-                        poke.effect.type,
-                        poke.effect.cond,
-                        poke.effect.size,
-                    ),
+                    poke.as_stack_effect(lax=True),
                 )
 
         if len(parts) == 1:
@@ -390,11 +388,6 @@ def write_components(
         for poke in mgr.pokes:
             if not poke.effect.size and poke.effect.name not in mgr.instr.unmoved_names:
                 out.assign(
-                    StackEffect(
-                        poke.as_variable(),
-                        poke.effect.type,
-                        poke.effect.cond,
-                        poke.effect.size,
-                    ),
+                    poke.as_stack_effect(),
                     poke.effect,
                 )