Fix potential deopt loop in CheckAndLoadLocal

steve-s · steve-s · commit d9e96e3fe485 · 2025-12-11T15:47:48.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java
@@ -3607,11 +3607,10 @@ public static Object doObject(VirtualFrame frame, LocalAccessor accessor, int in
         @Specialization(replaces = "doObject")
         public static Object doObjectOrUnbound(VirtualFrame frame, LocalAccessor accessor, int index,
                         @Bind BytecodeNode bytecodeNode) {
-            try {
-                return accessor.getObject(bytecodeNode, frame);
-            } catch (FrameSlotTypeException e) {
+            if (accessor.isCleared(bytecodeNode, frame)) {
                 throw raiseUnbound(bytecodeNode, index);
             }
+            return accessor.getObject(bytecodeNode, frame);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3607,11 +3607,10 @@ public static Object doObject(VirtualFrame frame, LocalAccessor accessor, int in`
`3607`	`3607`	`@Specialization(replaces = "doObject")`
`3608`	`3608`	`public static Object doObjectOrUnbound(VirtualFrame frame, LocalAccessor accessor, int index,`
`3609`	`3609`	`@Bind BytecodeNode bytecodeNode) {`
`3610`		`- try {`
`3611`		`- return accessor.getObject(bytecodeNode, frame);`
`3612`		`- } catch (FrameSlotTypeException e) {`
	`3610`	`+ if (accessor.isCleared(bytecodeNode, frame)) {`
`3613`	`3611`	`throw raiseUnbound(bytecodeNode, index);`
`3614`	`3612`	`}`
	`3613`	`+ return accessor.getObject(bytecodeNode, frame);`
`3615`	`3614`	`}`
`3616`	`3615`	`}`
`3617`	`3616`