support reading native __dict__ from dictoffset

timfel · timfel · commit de82377f1701 · 2018-11-23T17:52:46.000+01:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/typeobject.c b/graalpython/com.oracle.graal.python.cext/src/typeobject.c
@@ -232,6 +232,7 @@ int PyType_Ready(PyTypeObject* cls) {
     PyDict_SetItemString(native_members, "tp_name", polyglot_from_string(cls->tp_name, SRC_CS));
     PyDict_SetItemString(native_members, "tp_doc", polyglot_from_string(cls->tp_doc ? cls->tp_doc : "", SRC_CS));
     PyDict_SetItemString(native_members, "tp_basicsize", PyLong_FromSsize_t(cls->tp_basicsize));
+    PyDict_SetItemString(native_members, "tp_dictoffset", PyLong_FromSsize_t(cls->tp_dictoffset));
     const char* class_name = cls->tp_name;
     PyTypeObject* javacls = polyglot_invoke(PY_TRUFFLE_CEXT,
                                             "PyType_Ready",
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -83,6 +83,7 @@
 import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.MayRaiseUnaryNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.HandleCache;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PrimitiveNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeMemberNames;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PySequenceArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassInitNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassNativeWrapper;
@@ -522,13 +523,14 @@ Object run(Object typestruct, PythonClass metaClass, PTuple baseClasses, PDict n
             }
 
             // 'tp_name' contains the fully-qualified name, i.e., 'module.A.B...'
-            String fqname = getStringItem(nativeMembers, "tp_name");
-            String doc = getStringItem(nativeMembers, "tp_doc");
+            String fqname = getStringItem(nativeMembers, NativeMemberNames.TP_NAME);
+            String doc = getStringItem(nativeMembers, NativeMemberNames.TP_DOC);
             // the qualified name (i.e. without module name) like 'A.B...'
             String qualName = getQualName(fqname);
             PythonNativeClass cclass = factory().createNativeClassWrapper(typestruct, metaClass, qualName, bases);
             writeNode.execute(cclass, SpecialAttributeNames.__DOC__, doc);
-            writeNode.execute(cclass, SpecialAttributeNames.__BASICSIZE__, getLongItem(nativeMembers, "tp_basicsize"));
+            writeNode.execute(cclass, SpecialAttributeNames.__BASICSIZE__, getLongItem(nativeMembers, NativeMemberNames.TP_BASICSIZE));
+            writeNode.execute(cclass, SpecialAttributeNames.__DICTOFFSET__, getLongItem(nativeMembers, NativeMemberNames.TP_DICTOFFSET));
             String moduleName = getModuleName(fqname);
             if (moduleName != null) {
                 writeNode.execute(cclass, SpecialAttributeNames.__MODULE__, moduleName);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeMemberNames.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeMemberNames.java
@@ -57,6 +57,8 @@ public final class NativeMemberNames {
     public static final String TP_NAME = "tp_name";
     public static final String TP_BASE = "tp_base";
     public static final String TP_BASICSIZE = "tp_basicsize";
+    public static final String TP_DICTOFFSET = "tp_dictoffset";
+    public static final String TP_DOC = "tp_doc";
     public static final String TP_ALLOC = "tp_alloc";
     public static final String TP_AS_NUMBER = "tp_as_number";
     public static final String TP_HASH = "tp_hash";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonNativeObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonNativeObject.java
@@ -41,14 +41,15 @@
 package com.oracle.graal.python.builtins.objects.cext;
 
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
+import com.oracle.truffle.api.interop.TruffleObject;
 
 /**
  * A simple wrapper around objects created through the Python C API that can be cast to PyObject*.
  */
 public class PythonNativeObject extends PythonAbstractObject {
-    public final Object object;
+    public final TruffleObject object;
 
-    public PythonNativeObject(Object obj) {
+    public PythonNativeObject(TruffleObject obj) {
         object = obj;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -64,11 +64,13 @@
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.function.PythonCallable;
+import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
+import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
@@ -93,6 +95,11 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.ForeignAccess;
+import com.oracle.truffle.api.interop.Message;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -507,6 +514,7 @@ protected PNone doIt(Object object, Object key,
     static abstract class DictNode extends PythonBinaryBuiltinNode {
         private final IsBuiltinClassProfile exactObjInstanceProfile = IsBuiltinClassProfile.create();
         private final IsBuiltinClassProfile exactBuiltinInstanceProfile = IsBuiltinClassProfile.create();
+        @Child private Node readNode;
 
         protected boolean isExactObjectInstance(PythonObject self) {
             return exactObjInstanceProfile.profileObject(self, PythonBuiltinClassType.PythonObject);
@@ -534,6 +542,38 @@ Object dict(PythonObject self, PDict dict) {
             return PNone.NONE;
         }
 
+        @Specialization(guards = "isNoValue(none)")
+        Object dict(PythonNativeObject self, @SuppressWarnings("unused") PNone none,
+                        @Cached("create(__DICTOFFSET__)") LookupInheritedAttributeNode getDictoffset,
+                        @Cached("create()") BranchProfile noOffset,
+                        @Cached("create()") BranchProfile wrongType,
+                        @Cached("create()") CExtNodes.ToJavaNode toJava) {
+            Object dictoffset = getDictoffset.execute(self);
+            int offset;
+            if (dictoffset instanceof Long) {
+                offset = ((Long) dictoffset).intValue();
+            } else if (dictoffset instanceof Integer) {
+                offset = (Integer) dictoffset;
+            } else if (dictoffset instanceof PInt) {
+                offset = ((PInt) dictoffset).intValue();
+            } else if (dictoffset instanceof PNone) {
+                noOffset.enter();
+                throw raise(AttributeError, "'%p' object has no attribute '__dict__'", self);
+            } else {
+                wrongType.enter();
+                throw raise(TypeError, "tp_dictoffset of native type is not an integer, got '%p'", dictoffset);
+            }
+            if (readNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                readNode = insert(Message.READ.createNode());
+            }
+            try {
+                return toJava.execute(ForeignAccess.sendRead(readNode, self.object, offset));
+            } catch (UnknownIdentifierException | UnsupportedMessageException e) {
+                throw raise(AttributeError, "'%p' object has no native '__dict__'", self);
+            }
+        }
+
         @Fallback
         Object dict(Object self, @SuppressWarnings("unused") Object dict) {
             throw raise(AttributeError, "'%p' object has no attribute '__dict__'", self);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java
@@ -212,7 +212,7 @@ private Object op(VirtualFrame frame, PythonClass self, Object[] arguments, PKey
                         // https://github.com/python/cpython/blob/2102c789035ccacbac4362589402ac68baa2cd29/Objects/typeobject.c#L3538
                     } else {
                         Object initMethod = lookupInit.execute(newInstanceKlass);
-                        if (newMethod != PNone.NO_VALUE) {
+                        if (initMethod != PNone.NO_VALUE) {
                             Object[] initArgs;
                             if (doCreateArgs) {
                                 initArgs = PositionalArgumentsNode.prependArgument(newInstance, arguments, arguments.length);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/SpecialAttributeNames.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/SpecialAttributeNames.java
@@ -68,4 +68,6 @@ public abstract class SpecialAttributeNames {
     public static final String __CONTEXT__ = "__context__";
     public static final String __BASICSIZE__ = "__basicsize__";
     public static final String __NEW__ = "__new__";
+    public static final Object __SLOTS__ = "__slots__";
+    public static final String __DICTOFFSET__ = "__dictoffset__";
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java
@@ -199,7 +199,7 @@ public PythonObject createPythonObject(PythonClass cls) {
         return trace(new PythonObject(cls, cls.getInstanceShape()));
     }
 
-    public PythonNativeObject createNativeObjectWrapper(Object obj) {
+    public PythonNativeObject createNativeObjectWrapper(TruffleObject obj) {
         return trace(new PythonNativeObject(obj));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,6 @@ public abstract class SpecialAttributeNames {`
`68`	`68`	`public static final String __CONTEXT__ = "__context__";`
`69`	`69`	`public static final String __BASICSIZE__ = "__basicsize__";`
`70`	`70`	`public static final String __NEW__ = "__new__";`
	`71`	`+ public static final Object __SLOTS__ = "__slots__";`
	`72`	`+ public static final String __DICTOFFSET__ = "__dictoffset__";`
`71`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public PythonObject createPythonObject(PythonClass cls) {`
`199`	`199`	`return trace(new PythonObject(cls, cls.getInstanceShape()));`
`200`	`200`	`}`
`201`	`201`
`202`		`- public PythonNativeObject createNativeObjectWrapper(Object obj) {`
	`202`	`+ public PythonNativeObject createNativeObjectWrapper(TruffleObject obj) {`
`203`	`203`	`return trace(new PythonNativeObject(obj));`
`204`	`204`	`}`
`205`	`205`