implement getLazyPythonClass for direct subclasses of PythonAbstractObject

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PEllipsis.java

@@ -40,8 +40,14 @@
  */
 package com.oracle.graal.python.builtins.objects;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
 
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PEllipsis extends PythonAbstractObject {
 
     public static final PEllipsis INSTANCE = new PEllipsis();
@@ -59,4 +65,10 @@ public String toString() {
     public int compareTo(Object o) {
         return this.hashCode() - o.hashCode();
     }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    public LazyPythonClass getLazyPythonClass() {
+        return PythonBuiltinClassType.PEllipsis;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PNone.java

@@ -25,12 +25,16 @@
  */
 package com.oracle.graal.python.builtins.objects;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
 @ExportLibrary(InteropLibrary.class)
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PNone extends PythonAbstractObject {
 
     public static final PNone NONE = new PNone();
@@ -54,4 +58,10 @@ public int compareTo(Object o) {
     static boolean isNull(@SuppressWarnings("unused") PNone self) {
         return true;
     }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    public LazyPythonClass getLazyPythonClass() {
+        return PythonBuiltinClassType.PNone;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PNotImplemented.java

@@ -25,8 +25,14 @@
  */
 package com.oracle.graal.python.builtins.objects;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
 
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PNotImplemented extends PythonAbstractObject {
 
     public static final PNotImplemented NOT_IMPLEMENTED = new PNotImplemented();
@@ -43,4 +49,10 @@ public String toString() {
     public int compareTo(Object o) {
         return this.hashCode() - o.hashCode();
     }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    public LazyPythonClass getLazyPythonClass() {
+        return PythonBuiltinClassType.PNotImplemented;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cell/PCell.java

@@ -40,11 +40,17 @@
  */
 package com.oracle.graal.python.builtins.objects.cell;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
 
+@ExportLibrary(PythonObjectLibrary.class)
 public final class PCell extends PythonAbstractObject {
     private final Assumption effectivelyFinal;
     private Object ref;
@@ -101,4 +107,10 @@ public int compareTo(Object o) {
         CompilerDirectives.transferToInterpreter();
         throw new UnsupportedOperationException();
     }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    public LazyPythonClass getLazyPythonClass() {
+        return PythonBuiltinClassType.PCell;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonAbstractNativeObject.java

@@ -146,11 +146,17 @@ public boolean hasDict() {
         return true;
     }
 
+    @ExportMessage
+    @SuppressWarnings({"static-method", "unused"})
+    public void setDict(PHashingCollection value) throws UnsupportedMessageException {
+        throw UnsupportedMessageException.create();
+    }
+
     @ExportMessage
     @GenerateUncached
     public static abstract class GetDict {
         @Specialization
-        public PHashingCollection getNativeDictionary(Object self,
+        public static PHashingCollection getNativeDictionary(PythonAbstractNativeObject self,
                         @Cached PRaiseNode raiseNode,
                         @Exclusive @Cached ToSulongNode toSulong,
                         @Exclusive @Cached ToJavaNode toJava,
@@ -184,7 +190,7 @@ public static Assumption getSingleContextAssumption() {
         @Specialization(guards = "object == cachedObject", limit = "1", assumptions = "singleContextAssumption")
         public static PythonAbstractClass getNativeClassCachedIdentity(PythonAbstractNativeObject object,
                                                                        @Shared("assumption") @Cached(value = "getSingleContextAssumption()") Assumption singleContextAssumption,
-                                                                       @Exclusive @Cached("object") PythonNativeObject cachedObject,
+                                                                       @Exclusive @Cached("object") PythonAbstractNativeObject cachedObject,
                                                                        @Exclusive @Cached("getNativeClassUncached(cachedObject)") PythonAbstractClass cachedClass) {
             // TODO: (tfel) is this really something we can do? It's so rare for this class to
             // change that it shouldn't be worth the effort, but in native code, anything can
@@ -196,7 +202,7 @@ public static PythonAbstractClass getNativeClassCachedIdentity(PythonAbstractNat
         @Specialization(guards = "cachedObject.equals(object)", limit = "1", assumptions = "singleContextAssumption")
         public static PythonAbstractClass getNativeClassCached(PythonAbstractNativeObject object,
                                                         @Shared("assumption") @Cached(value = "getSingleContextAssumption()") Assumption singleContextAssumption,
-                                                        @Exclusive @Cached("object") PythonNativeObject cachedObject,
+                                                        @Exclusive @Cached("object") PythonAbstractNativeObject cachedObject,
                                                         @Exclusive @Cached("getNativeClassUncached(cachedObject)") PythonAbstractClass cachedClass) {
             // TODO same as for 'getNativeClassCachedIdentity'
             return cachedClass;
@@ -211,7 +217,6 @@ public static PythonAbstractClass getNativeClass(PythonAbstractNativeObject obje
             return (PythonAbstractClass) toJavaNode.execute(callGetObTypeNode.call(FUN_GET_OB_TYPE, object.getPtr()));
         }
 
-        @Specialization(replaces = "getNativeClass")
         public static PythonAbstractClass getNativeClassUncached(PythonAbstractNativeObject object) {
             // do not convert wrap 'object.object' since that is really the native pointer
             // object

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

@@ -37,7 +37,6 @@
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
-import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -55,7 +54,6 @@
 import com.oracle.truffle.api.object.Property;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.object.dsl.Layout;
-import com.oracle.truffle.api.profiles.BranchProfile;
 
 @ExportLibrary(PythonObjectLibrary.class)
 public class PythonObject extends PythonAbstractObject {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java

@@ -40,9 +40,11 @@
  */
 package com.oracle.graal.python.builtins.objects.object;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.GenerateLibrary;
 import com.oracle.truffle.api.library.GenerateLibrary.Abstract;
@@ -68,7 +70,9 @@ public void setDict(PythonAbstractObject receiver, PHashingCollection dict) thro
 
     public abstract LazyPythonClass getLazyPythonClass(PythonAbstractObject receiver);
 
-    public abstract void setLazyPythonClass(PythonAbstractObject receiver, LazyPythonClass cls);
+    public void setLazyPythonClass(PythonAbstractObject receiver, LazyPythonClass cls) {
+        PRaiseNode.getUncached().raise(PythonBuiltinClassType.TypeError, "__class__ assignment only supported for heap types or ModuleType subclasses, not '%p'", receiver);
+    }
 
     static final LibraryFactory<PythonObjectLibrary> FACTORY = LibraryFactory.resolve(PythonObjectLibrary.class);
 

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

@@ -127,7 +127,7 @@ protected Object readFromBuiltinModuleDict(@SuppressWarnings("unused") PythonMod
                     @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltinDict,
                     @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltinMappingproxy,
                     @Cached HashingStorageNodes.GetItemNode getItemNode) {
-        return readDirectlyFromBuiltinDict((PHashingCollection) cachedDict, key, getDictStorage, getItemNode);
+        return readDirectlyFromBuiltinDict(cachedDict, key, getDictStorage, getItemNode);
     }
 
     // read from a builtin dict