Fix: add forgotten WeakReference.get()

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/PythonDispatchers.java

@@ -62,6 +62,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.utilities.TruffleWeakReference;
 
 abstract class PythonDispatchers {
     private PythonDispatchers() {
@@ -87,7 +88,13 @@ static FunctionInvokeNode createInvokeNode(PFunction callee) {
     @GenerateCached(false)
     @ImportStatic(PGuards.class)
     abstract static class UnaryPythonSlotDispatcherNode extends PythonSlotDispatcherNodeBase {
-        abstract Object execute(VirtualFrame frame, Node inliningTarget, Object callable, Object type, Object self);
+        final Object execute(VirtualFrame frame, Node inliningTarget, Object callable, Object type, Object self) {
+            assert !(callable instanceof TruffleWeakReference<?>);
+            assert !(type instanceof TruffleWeakReference<?>);
+            return executeImpl(frame, inliningTarget, callable, type, self);
+        }
+
+        abstract Object executeImpl(VirtualFrame frame, Node inliningTarget, Object callable, Object type, Object self);
 
         @Specialization(guards = {"isSingleContext()", "callee == cachedCallee", "isSimpleSignature(cachedCallee, 1)"}, limit = "getCallSiteInlineCacheMaxDepth()")
         protected static Object doCachedPFunction(VirtualFrame frame, @SuppressWarnings("unused") PFunction callee, @SuppressWarnings("unused") Object type, Object self,
@@ -121,7 +128,13 @@ static Object doGeneric(VirtualFrame frame, Node inliningTarget, Object callable
     @GenerateInline
     @GenerateCached(false)
     abstract static class BinaryPythonSlotDispatcherNode extends PythonSlotDispatcherNodeBase {
-        abstract Object execute(VirtualFrame frame, Node inliningTarget, Object callable, Object type, Object self, Object arg1);
+        final Object execute(VirtualFrame frame, Node inliningTarget, Object callable, Object type, Object self, Object arg1) {
+            assert !(callable instanceof TruffleWeakReference<?>);
+            assert !(type instanceof TruffleWeakReference<?>);
+            return executeImpl(frame, inliningTarget, callable, type, self, arg1);
+        }
+
+        abstract Object executeImpl(VirtualFrame frame, Node inliningTarget, Object callable, Object type, Object self, Object arg1);
 
         @Specialization(guards = {"isSingleContext()", "callee == cachedCallee", "isSimpleSignature(cachedCallee, 2)"}, limit = "getCallSiteInlineCacheMaxDepth()")
         protected static Object doCachedPFunction(VirtualFrame frame, @SuppressWarnings("unused") PFunction callee, @SuppressWarnings("unused") Object type, Object self, Object arg1,
@@ -156,7 +169,13 @@ static Object doGeneric(VirtualFrame frame, Node inliningTarget, Object callable
     @GenerateInline
     @GenerateCached(false)
     abstract static class TernaryOrBinaryPythonSlotDispatcherNode extends PythonSlotDispatcherNodeBase {
-        abstract Object execute(VirtualFrame frame, Node inliningTarget, boolean callTernary, Object callable, Object type, Object self, Object arg1, Object arg2);
+        final Object execute(VirtualFrame frame, Node inliningTarget, boolean callTernary, Object callable, Object type, Object self, Object arg1, Object arg2) {
+            assert !(callable instanceof TruffleWeakReference<?>);
+            assert !(type instanceof TruffleWeakReference<?>);
+            return executeImpl(frame, inliningTarget, callTernary, callable, type, self, arg1, arg2);
+        }
+
+        abstract Object executeImpl(VirtualFrame frame, Node inliningTarget, boolean callTernary, Object callable, Object type, Object self, Object arg1, Object arg2);
 
         @Idempotent
         static int getArgsCount(boolean callTernary) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlot.java

@@ -298,8 +298,8 @@ public static boolean isSlotFactory(NodeFactory<?> factory) {
      * Convenience base class for Python slots that has only one callable.
      */
     public static final class TpSlotPythonSingle extends TpSlotPython {
-        final TruffleWeakReference<Object> callable;
-        final TruffleWeakReference<Object> type;
+        private final TruffleWeakReference<Object> callable;
+        private final TruffleWeakReference<Object> type;
         private final TruffleString name;
 
         public TpSlotPythonSingle(Object callable, Object type, TruffleString name) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotDescrSet.java

@@ -127,9 +127,9 @@ public PBuiltinFunction createBuiltin(Python3Core core, Object type, TruffleStri
     }
 
     public static final class TpSlotDescrSetPython extends TpSlotPython {
-        final TruffleWeakReference<Object> setCallable;
-        final TruffleWeakReference<Object> delCallable;
-        final TruffleWeakReference<Object> type;
+        private final TruffleWeakReference<Object> setCallable;
+        private final TruffleWeakReference<Object> delCallable;
+        private final TruffleWeakReference<Object> type;
 
         public TpSlotDescrSetPython(Object setCallable, Object delCallable, Object type) {
             this.setCallable = asWeakRef(setCallable);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotGetAttr.java

@@ -126,9 +126,9 @@ public abstract static class GetAttrBuiltinNode extends PythonBinaryBuiltinNode
     }
 
     public static final class TpSlotGetAttrPython extends TpSlotPython {
-        final TruffleWeakReference<Object> getattr;
-        final TruffleWeakReference<Object> getattribute;
-        final TruffleWeakReference<Object> type;
+        private final TruffleWeakReference<Object> getattr;
+        private final TruffleWeakReference<Object> getattribute;
+        private final TruffleWeakReference<Object> type;
 
         public TpSlotGetAttrPython(Object getattribute, Object getattr, Object type) {
             this.getattr = asWeakRef(getattr);
@@ -156,6 +156,10 @@ public Object getGetattr() {
             return safeGet(getattr);
         }
 
+        public boolean hasGetattr() {
+            return getattr != null;
+        }
+
         public Object getGetattribute() {
             return safeGet(getattribute);
         }
@@ -283,15 +287,15 @@ static Object callCachedBuiltin(VirtualFrame frame, @SuppressWarnings("unused")
             return slotNode.executeGetAttr(frame, self, name);
         }
 
-        @Specialization(guards = "isNoValue(slot.getattr)")
+        @Specialization(guards = "!slot.hasGetattr()")
         static Object callPythonSimple(VirtualFrame frame, Node inliningTarget, TpSlotGetAttrPython slot, Object self, Object name,
                         @Exclusive @Cached BinaryPythonSlotDispatcherNode callPythonFun) {
             // equivalent of typeobject.c:slot_tp_getattro, which is used if there is no __getattr__
             // hook
-            return callPythonFun.execute(frame, inliningTarget, slot.getattribute, slot.type, self, name);
+            return callPythonFun.execute(frame, inliningTarget, slot.getGetattribute(), slot.getType(), self, name);
         }
 
-        @Specialization(guards = "!isNoValue(slot.getattr)")
+        @Specialization(guards = "slot.hasGetattr()")
         static Object callPythonSimple(VirtualFrame frame, Node inliningTarget, TpSlotGetAttrPython slot, Object self, Object name,
                         @Exclusive @Cached BinaryPythonSlotDispatcherNode callPythonFun,
                         @Cached IsBuiltinObjectProfile errorProfile) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotInquiry.java

@@ -158,7 +158,7 @@ static boolean doIt(VirtualFrame frame, TpSlotPythonSingle slot, Object self,
             // TODO: it is not clear to me why CPython lookups __len__ in the slot wrapper although
             // the slow wrapper is assigned only in the presence of __bool__ magic method and not
             // __len__. We ignore the __len__ lookup for now.
-            Object result = dispatcherNode.execute(frame, inliningTarget, slot.getCallable(), slot.type, self);
+            Object result = dispatcherNode.execute(frame, inliningTarget, slot.getCallable(), slot.getType(), self);
             if (!pyBoolCheckNode.execute(inliningTarget, result)) {
                 throw raiseNode.get(inliningTarget).raise(TypeError, ErrorMessages.BOOL_SHOULD_RETURN_BOOL, result);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotLen.java

@@ -241,7 +241,7 @@ static int doIt(VirtualFrame frame, TpSlotPythonSingle slot, Object self,
                         @Cached CastToJavaIntLossyNode castLossy,
                         @Cached PyNumberAsSizeNode asSizeNode) {
             // See CPython: slot_sq_length
-            Object result = dispatcherNode.execute(frame, inliningTarget, slot.getCallable(), slot.type, self);
+            Object result = dispatcherNode.execute(frame, inliningTarget, slot.getCallable(), slot.getType(), self);
             if (!genericCheck.wasEntered(inliningTarget)) {
                 try {
                     return checkLen(inliningTarget, raiseNode, PGuards.expectInteger(result));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotSetAttr.java

@@ -145,9 +145,9 @@ public final Object execute(VirtualFrame frame, Object obj, Object nameObj, Obje
     }
 
     public static final class TpSlotSetAttrPython extends TpSlotPython {
-        final TruffleWeakReference<Object> setattr;
-        final TruffleWeakReference<Object> delattr;
-        final TruffleWeakReference<Object> type;
+        private final TruffleWeakReference<Object> setattr;
+        private final TruffleWeakReference<Object> delattr;
+        private final TruffleWeakReference<Object> type;
 
         public TpSlotSetAttrPython(Object setattr, Object delattr, Object type) {
             this.setattr = asWeakRef(setattr);