[GR-71765] Replace CheckAndLoadLocal with illegalLocalException.

PullRequest: graalpython/4177

Author: DSouzaM

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java

@@ -1457,7 +1457,7 @@ private void emitNameFastOperation(String mangled, NameOperation op, Builder b)
         BytecodeLocal local = locals.get(mangled);
         switch (op) {
             case Read:
-                b.emitCheckAndLoadLocal(local, varnames.get(mangled));
+                b.emitLoadLocal(local);
                 break;
             case Delete:
                 b.emitDeleteLocal(local, varnames.get(mangled));
@@ -1612,7 +1612,9 @@ public void setUpFrame(ArgumentsTy args, Builder b) {
         if (scope.isFunction()) {
             String[] regularVariables = orderedKeys(varnames, new String[0]);
             for (int i = 0; i < regularVariables.length; i++) {
-                locals.put(regularVariables[i], b.createLocal());
+                // For user locals, store a varnames table index in the "info" field.
+                int index = varnames.get(regularVariables[i]);
+                locals.put(regularVariables[i], b.createLocal(null, index));
             }
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

@@ -285,14 +285,12 @@
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
-import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
@@ -304,6 +302,8 @@
 
 @GenerateBytecode(//
                 languageClass = PythonLanguage.class, //
+                illegalLocalException = PException.class, //
+                illegalLocalExceptionFactory = "raiseUnboundLocalException", //
                 enableBlockScoping = false, //
                 enableYield = true, //
                 enableSerialization = true, //
@@ -3623,40 +3623,6 @@ static void doInteropException(AbstractTruffleException exception) {
         }
     }
 
-    /**
-     * Loads a user-defined local variable. Unlike a built-in LoadLocal, this operation raises an
-     * unbound local error if the local has not been set.
-     * <p>
-     * This operation makes use of Truffle's boxing overloads. When an operation tries to quicken
-     * this one for boxing elimination, the correct overload will be selected.
-     */
-    @Operation(storeBytecodeIndex = false)
-    @ConstantOperand(type = LocalAccessor.class)
-    @ConstantOperand(type = int.class)
-    public static final class CheckAndLoadLocal {
-        @Specialization(rewriteOn = {FrameSlotTypeException.class, UnexpectedResultException.class})
-        public static int doInt(VirtualFrame frame, LocalAccessor accessor, int index,
-                        @Bind BytecodeNode bytecodeNode) throws UnexpectedResultException {
-            return accessor.getInt(bytecodeNode, frame);
-        }
-
-        @Specialization(replaces = "doInt", rewriteOn = FrameSlotTypeException.class)
-        public static Object doObject(VirtualFrame frame, LocalAccessor accessor, int index,
-                        @Bind BytecodeNode bytecodeNode) {
-            return accessor.getObject(bytecodeNode, frame);
-        }
-
-        @StoreBytecodeIndex
-        @Specialization(replaces = "doObject")
-        public static Object doObjectOrUnbound(VirtualFrame frame, LocalAccessor accessor, int index,
-                        @Bind BytecodeNode bytecodeNode) {
-            if (accessor.isCleared(bytecodeNode, frame)) {
-                throw raiseUnbound(bytecodeNode, index);
-            }
-            return accessor.getObject(bytecodeNode, frame);
-        }
-    }
-
     @Operation(storeBytecodeIndex = false)
     @ConstantOperand(type = LocalAccessor.class)
     @ConstantOperand(type = int.class)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -51,15 +51,19 @@
 import com.oracle.graal.python.builtins.objects.traceback.MaterializeLazyTracebackNode;
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
 import com.oracle.graal.python.lib.PyExceptionInstanceCheckNode;
+import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.PRootNode;
 import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.nodes.bytecode_dsl.PBytecodeDSLRootNode;
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.bytecode.BytecodeNode;
+import com.oracle.truffle.api.bytecode.LocalVariable;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -75,6 +79,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
+import com.oracle.truffle.api.strings.TruffleString;
 
 /**
  * Serves both as a throwable carrier of the python exception object ({@link PBaseException}) and as
@@ -583,4 +588,14 @@ public boolean getShouldTrace() {
     public void dontTraceOnReraise() {
         shouldTrace = true;
     }
+
+    @TruffleBoundary
+    public static PException raiseUnboundLocalException(BytecodeNode bytecodeNode, LocalVariable localVariable) {
+        Object info = localVariable.getInfo();
+        if (info == null || !(info instanceof Integer i)) {
+            throw CompilerDirectives.shouldNotReachHere("User locals must have their info field set to a varnames index.");
+        }
+        TruffleString localName = ((PBytecodeDSLRootNode) bytecodeNode.getRootNode()).getCodeUnit().varnames[i];
+        throw PRaiseNode.raiseStatic(bytecodeNode, PythonBuiltinClassType.UnboundLocalError, ErrorMessages.LOCAL_VAR_REFERENCED_BEFORE_ASSIGMENT, localName);
+    }
 }

mx.graalpython/suite.py

@@ -53,15 +53,15 @@
             },
             {
                 "name": "tools",
-                "version": "560591a86456e570b6f089a41fc9aa358f9f7fb5",
+                "version": "b9735919ef1c105c97260207f62f656ab8f960a1",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "regex",
-                "version": "560591a86456e570b6f089a41fc9aa358f9f7fb5",
+                "version": "b9735919ef1c105c97260207f62f656ab8f960a1",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

pyproject.toml

@@ -8,4 +8,4 @@ required-version = '23'
 # Disables the black formatter in this repository
 # If individual suites want to enable the formatter, they can create a
 # pyproject.toml with their own configuration in their suite folder
-force-exclude = '.*graalpy.*|.*scripts/[^w].*py|benchmarks/*'
+force-exclude = '.*graalpy.*|.*scripts/.*py|benchmarks/*'