Introduce and use PythonUtils#assertUncached

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectFormat.java

@@ -56,7 +56,7 @@
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -134,11 +134,11 @@ static Object doGeneric(VirtualFrame frame, Object obj, Object formatSpec,
         }
 
         @Specialization(guards = "isString(formatSpec)", replaces = "doGeneric")
-        @TruffleBoundary
-        static Object doGenericUncached(Object obj, Object formatSpec) {
+        static Object doGenericUncached(VirtualFrame frame, Object obj, Object formatSpec) {
+            PythonUtils.assertUncached();
             Object klass = GetClassNode.getUncached().execute(obj);
             Object slot = LookupCallableSlotInMRONode.getUncached(SpecialMethodSlot.Format).execute(klass);
-            return CallBinaryMethodNode.getUncached().executeObject(null, slot, obj, formatSpec);
+            return CallBinaryMethodNode.getUncached().executeObject(frame, slot, obj, formatSpec);
         }
 
         // Note: PRaiseNode is @Exclusive to workaround a bug in DSL

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/DeleteAttributeNode.java

@@ -45,7 +45,7 @@
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NeverDefault;
@@ -68,10 +68,10 @@ protected void doIt(VirtualFrame frame, Object object, Object key,
     }
 
     @Specialization(replaces = "doIt")
-    @TruffleBoundary
-    protected void doItUncached(Object object, Object key) {
+    protected void doItUncached(VirtualFrame frame, Object object, Object key) {
+        PythonUtils.assertUncached();
         Object klass = GetClassNode.getUncached().execute(object);
         Object method = LookupCallableSlotInMRONode.getUncached(SpecialMethodSlot.DelAttr).execute(klass);
-        CallBinaryMethodNode.getUncached().executeObject(null, method, object, key);
+        CallBinaryMethodNode.getUncached().executeObject(frame, method, object, key);
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadNameNode.java

@@ -45,13 +45,11 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
-import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -81,7 +79,7 @@ protected static HashingStorage getStorage(VirtualFrame frame) {
 
     @Specialization(guards = "!hasLocals(frame)")
     protected Object readFromLocals(VirtualFrame frame, TruffleString attributeId,
-                    @Shared("readGlobal") @Cached ReadGlobalOrBuiltinNode readGlobalNode) {
+                    @Cached ReadGlobalOrBuiltinNode readGlobalNode) {
         return readGlobalNode.execute(frame, attributeId);
     }
 
@@ -96,17 +94,4 @@ protected Object readFromLocalsDict(VirtualFrame frame, TruffleString attributeI
             return result;
         }
     }
-
-    @Specialization(guards = "hasLocals(frame)", replaces = "readFromLocalsDict")
-    protected Object readFromLocals(VirtualFrame frame, TruffleString attributeId,
-                    @Shared("readGlobal") @Cached ReadGlobalOrBuiltinNode readGlobalNode,
-                    @Cached PyObjectGetItem getItem,
-                    @Cached IsBuiltinClassProfile keyError) {
-        Object frameLocals = PArguments.getSpecialArgument(frame);
-        try {
-            return getItem.execute(frame, frameLocals, attributeId);
-        } catch (PException e) {
-            return readGlobalsIfKeyError(frame, attributeId, readGlobalNode, e, keyError);
-        }
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java

@@ -89,6 +89,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
+import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.MaterializedFrame;
@@ -864,4 +865,24 @@ public static long crc32(int initialValue, byte[] bytes, int offset, int length)
                     0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
                     0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
     };
+
+    /**
+     * Use as a documentation and safety guard in specializations that are meant to be activated
+     * only in the uncached case. Those Specializations exist only to allow to generate an uncached
+     * variant of the node, but should never be activated in a regular cached case.
+     *
+     * Note that such specializations can take VirtualFrame and should forward it to other uncached
+     * (and cached) nodes. The uncached nodes may be executed during the uncached execution of the
+     * bytecode root node where it is allowed to pass the VirtualFrame around without materializing
+     * it.
+     */
+    public static void assertUncached() {
+        if (!TruffleOptions.AOT) {
+            // We cannot assert that it's never part of compilation, because then it would fail
+            // during native-image build since it cannot prove that this Specialization is never
+            // activated at runtime and includes this in runtime compiled methods.
+            CompilerAsserts.neverPartOfCompilation();
+        }
+        CompilerDirectives.transferToInterpreter();
+    }
 }