Add test

Author: Fidget-Spinner

Lib/test/test_generated_cases.py

@@ -59,14 +59,14 @@ class TestEffects(unittest.TestCase):
     def test_effect_sizes(self):
         stack = Stack()
         inputs = [
-            x := StackItem("x", None, "1"),
-            y := StackItem("y", None, "oparg"),
-            z := StackItem("z", None, "oparg*2"),
+            x := StackItem("x", None, "1", []),
+            y := StackItem("y", None, "oparg", []),
+            z := StackItem("z", None, "oparg*2", []),
         ]
         outputs = [
-            StackItem("x", None, "1"),
-            StackItem("b", None, "oparg*4"),
-            StackItem("c", None, "1"),
+            StackItem("x", None, "1", []),
+            StackItem("b", None, "oparg*4", []),
+            StackItem("c", None, "1", []),
         ]
         null = CWriter.null()
         stack.pop(z, null)
@@ -2253,5 +2253,28 @@ def test_validate_uop_unused_size_mismatch(self):
                                     "Inputs must have equal sizes"):
             self.run_cases_test(input, input2, output)
 
+    def test_uop_type_attribute_input(self):
+        input = """
+        op(OP, (foo -- )) {
+        }
+        """
+        input2 = """
+        op(OP, (type(&PyLong_Type) foo -- )) {
+            (void)foo;
+        }
+        """
+        output = """
+        case OP: {
+            JitOptSymbol *foo;
+            foo = stack_pointer[-1];
+            (void)foo;
+            assert(sym_matches_type(foo, &PyLong_Type));
+            stack_pointer += -1;
+            assert(WITHIN_STACK_BOUNDS());
+            break;
+        }
+        """
+        self.run_cases_test(input, input2, output)
+
 if __name__ == "__main__":
     unittest.main()

Tools/cases_generator/optimizer_generator.py

@@ -154,11 +154,6 @@ def get_type(item: StackItem) -> str | None:
             return attribute.expr
     return None
 
-def emit_sym_set_type_for_stack_effect(emitter: Emitter, items: list[StackItem]) -> None:
-    for var in items:
-        typ = get_type(var)
-        if typ is not None:
-            emitter.emit(f"sym_set_type({var.name}, {typ});\n")
 
 
 def write_uop(
@@ -198,9 +193,10 @@ def write_uop(
             _, storage = emitter.emit_tokens(override, storage, None, False)
             # Emit type effects.
             out.start_line()
-            emit_sym_set_type_for_stack_effect(emitter, override.stack.inputs)
-            emit_sym_set_type_for_stack_effect(emitter, override.stack.outputs)
-            out.start_line()
+            for var in override.stack.inputs:
+                typ = get_type(var)
+                if typ is not None:
+                    emitter.emit(f"assert(sym_matches_type({var.name}, {typ}));\n")
             storage.flush(out)
         else:
             emit_default(out, uop, stack)