Fix failing materialization of generator function frame on DSL

msimacek · msimacek · commit 667a87636a9c · 2025-11-20T17:51:33.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/PGenerator.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/PGenerator.java
@@ -265,7 +265,7 @@ public static boolean isGeneratorFrame(Frame frame) {
         Object frameInfo = frame.getFrameDescriptor().getInfo();
         // just to avoid interface dispatch we must cast the info object
         if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER) {
-            return frameInfo instanceof BytecodeDSLFrameInfo info && info.getCodeUnit().isGeneratorOrCoroutine();
+            return frameInfo instanceof BytecodeDSLFrameInfo info && info.getCodeUnit().isGeneratorOrCoroutine() && frame.getArguments()[0] instanceof MaterializedFrame;
         } else {
             return frameInfo instanceof BytecodeFrameInfo info && info.getCodeUnit().isGeneratorOrCoroutine();
         }

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public static boolean isGeneratorFrame(Frame frame) {`
`265`	`265`	`Object frameInfo = frame.getFrameDescriptor().getInfo();`
`266`	`266`	`// just to avoid interface dispatch we must cast the info object`
`267`	`267`	`if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER) {`
`268`		`- return frameInfo instanceof BytecodeDSLFrameInfo info && info.getCodeUnit().isGeneratorOrCoroutine();`
	`268`	`+ return frameInfo instanceof BytecodeDSLFrameInfo info && info.getCodeUnit().isGeneratorOrCoroutine() && frame.getArguments()[0] instanceof MaterializedFrame;`
`269`	`269`	`} else {`
`270`	`270`	`return frameInfo instanceof BytecodeFrameInfo info && info.getCodeUnit().isGeneratorOrCoroutine();`
`271`	`271`	`}`