[GR-27735] [GR-27736] Various C API fixes.

fangerer · fangerer · commit 4f225619c782 · 2021-03-03T12:06:55.000Z
PullRequest: graalpython/1637
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -358,6 +358,11 @@ freefunc get_tp_free(PyTypeObject* obj) {
 	return obj->tp_free;
 }
 
+/** to be used from Java code only; reads native 'tp_as_buffer' field */
+PyBufferProcs* get_tp_as_buffer(PyTypeObject* obj) {
+	return obj->tp_as_buffer;
+}
+
 /** to be used from Java code only; reads native 'tp_flags' field */
 unsigned long get_tp_flags(PyTypeObject* obj) {
 	return obj->tp_flags;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java
@@ -1493,7 +1493,13 @@ long getHash() {
     abstract static class PyTruffleFrameNewNode extends PythonBuiltinNode {
         @Specialization
         Object newFrame(Object threadState, PCode code, PythonObject globals, Object locals) {
-            return factory().createPFrame(threadState, code, globals, locals);
+            Object frameLocals;
+            if (locals == null || PGuards.isPNone(locals)) {
+                frameLocals = factory().createDict();
+            } else {
+                frameLocals = locals;
+            }
+            return factory().createPFrame(threadState, code, globals, frameLocals);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java
@@ -249,16 +249,16 @@ private PDict getSysDict() {
             return (PDict) getDictNode.execute(getContext().getCore().lookupBuiltinModule("sys"));
         }
 
-        private PDict getGlobalsDict(Object globals) {
+        private Object getGlobalsDict(Object globals) {
             if (globals instanceof PDict) {
-                return (PDict) globals;
+                return globals;
             }
             if (getDictNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 reportPolymorphicSpecialize();
                 getDictNode = insert(GetDictNode.create());
             }
-            return (PDict) getDictNode.execute(globals);
+            return getDictNode.execute(globals);
         }
 
         private PFrame getCallerFrame(VirtualFrame frame, int stackLevel) {
@@ -710,7 +710,7 @@ private void setupContext(VirtualFrame frame, int stackLevel, String[] filename,
                 lineno[0] = 1;
             } else {
                 globals = getGlobalsDict(f.getGlobals());
-                if (globals == null) {
+                if (globals == null || globals instanceof PNone) {
                     globals = getSysDict();
                 }
                 lineno[0] = f.getLine();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java
@@ -98,6 +98,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.WrapVoidPtrNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapperFactory.ReadTypeNativeMemberNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.capi.PyDateTimeMRNode.DateTimeMode;
 import com.oracle.graal.python.builtins.objects.cext.capi.UnicodeObjectNodes.UnicodeAsWideCharNode;
 import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
@@ -162,6 +163,7 @@
 import com.oracle.truffle.api.CompilerDirectives.ValueType;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLogger;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -431,6 +433,7 @@ static Object doTpAsBuffer(PythonManagedClass object, @SuppressWarnings("unused"
                         @Cached BranchProfile notMemoryview,
                         @Cached BranchProfile notBuffer,
                         @Cached BranchProfile notMmap,
+                        @Cached LookupNativeMemberInMRONode lookupTpAsBufferNode,
                         @Shared("getNativeNullNode") @Cached GetNativeNullNode getNativeNullNode,
                         @Shared("nullToSulongNode") @Cached ToSulongNode toSulongNode) {
             PythonBuiltinClass pBytes = context.getCore().lookupType(PythonBuiltinClassType.PBytes);
@@ -458,8 +461,16 @@ static Object doTpAsBuffer(PythonManagedClass object, @SuppressWarnings("unused"
                 return new PyBufferProcsWrapper(pMmap);
             }
             notMmap.enter();
-            // NULL pointer
-            return toSulongNode.execute(getNativeNullNode.execute());
+            /*
+             * Managed classes don't store PyBufferProcs objects and so there is no attribute. This
+             * is why we use managedMemberName == "".
+             */
+            Object result = lookupTpAsBufferNode.execute(object, NativeMember.TP_AS_BUFFER, "");
+            if (result == PNone.NO_VALUE) {
+                // NULL pointer
+                return toSulongNode.execute(getNativeNullNode.execute());
+            }
+            return toSulongNode.execute(result);
         }
 
         @Specialization(guards = "eq(TP_AS_SEQUENCE, key)")
@@ -978,15 +989,15 @@ protected static boolean isPyDateTimeCAPI(PythonObject object, GetClassNode getC
             return isPyDateTimeCAPIType(getNameNode.execute(getClassNode.execute(object)));
         }
 
-        protected static boolean isPyDateTime(PythonObject object, GetClassNode getClassNode, GetNameNode getNameNode) {
-            return "datetime".equals(getNameNode.execute(getClassNode.execute(object)));
-        }
-
         protected static boolean isPyDateTimeCAPIType(String className) {
             return "PyDateTime_CAPI".equals(className);
 
         }
 
+        protected static DateTimeMode getDateTimeMode(PythonObject object, GetClassNode getClassNode, GetNameNode getNameNode) {
+            return PyDateTimeMRNode.getModeFromTypeName(getNameNode.execute(getClassNode.execute(object)));
+        }
+
         @Specialization(guards = "isPyDateTimeCAPI(object, getClassNode, getNameNode)", limit = "1")
         static Object doDatetimeCAPI(PythonObject object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, String key,
                         @Cached LookupAttributeInMRONode.Dynamic getAttrNode,
@@ -996,12 +1007,13 @@ static Object doDatetimeCAPI(PythonObject object, @SuppressWarnings("unused") Py
             return toSulongNode.execute(getAttrNode.execute(getClassNode.execute(object), key));
         }
 
-        @Specialization(guards = "isPyDateTime(object, getClassNode, getNameNode)", limit = "1")
+        @Specialization(guards = "mode != null", limit = "1")
         static Object doDatetimeData(PythonObject object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
                         @Shared("getNameNode") @Cached @SuppressWarnings("unused") GetNameNode getNameNode,
                         @Shared("getClassNode") @Cached @SuppressWarnings("unused") GetClassNode getClassNode,
+                        @Bind("getDateTimeMode(object, getClassNode, getNameNode)") DateTimeMode mode,
                         @Cached PyDateTimeMRNode pyDateTimeMRNode) {
-            return pyDateTimeMRNode.execute(object, key);
+            return pyDateTimeMRNode.execute(object, key, mode);
         }
 
         @Specialization(guards = "eq(F_LINENO, key)")
@@ -1024,13 +1036,19 @@ static Object doFCode(PFrame object, @SuppressWarnings("unused") PythonNativeWra
         // TODO fallback guard
         @Specialization
         static Object doGeneric(@SuppressWarnings("unused") Object object, DynamicObjectNativeWrapper nativeWrapper, String key,
-                        @CachedLibrary(limit = "1") HashingStorageLibrary lib) throws UnknownIdentifierException {
+                        @CachedLibrary(limit = "1") HashingStorageLibrary lib,
+                        @Shared("toSulongNode") @Cached ToSulongNode toSulongNode,
+                        @Cached GetNativeNullNode getNativeNullNode) throws UnknownIdentifierException {
             // This is the preliminary generic case: There are native members we know that they
             // exist but we do currently not represent them. So, store them into a dynamic object
             // such that native code at least reads the value that was written before.
             if (nativeWrapper.isMemberReadable(key)) {
                 logGeneric(key);
-                return lib.getItem(nativeWrapper.getNativeMemberStore(), key);
+                DynamicObjectStorage nativeMemberStore = nativeWrapper.getNativeMemberStore();
+                if (nativeMemberStore != null) {
+                    return lib.getItem(nativeMemberStore, key);
+                }
+                return toSulongNode.execute(getNativeNullNode.execute());
             }
             throw UnknownIdentifierException.create(key);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java
@@ -79,6 +79,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_GET_TP_DICTOFFSET("get_tp_dictoffset"),
     FUN_GET_TP_BASICSIZE("get_tp_basicsize"),
     FUN_GET_TP_ITEMSIZE("get_tp_itemsize"),
+    FUN_GET_TP_AS_BUFFER("get_tp_as_buffer"),
     FUN_GET_BYTE_ARRAY_TYPE_ID("get_byte_array_typeid"),
     FUN_GET_PTR_ARRAY_TYPE_ID("get_ptr_array_typeid"),
     FUN_PTR_COMPARE("truffle_ptr_compare"),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeMember.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeMember.java
@@ -226,6 +226,7 @@ public enum NativeMember {
 
     // PyDateTime_Date
     DATETIME_DATA("data"),
+    DATETIME_TZINFO("tzinfo"),
 
     // PySetObject
     SET_USED("used", PRIMITIVE),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyDateTimeMRNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyDateTimeMRNode.java
@@ -40,12 +40,15 @@
  */
 package com.oracle.graal.python.builtins.objects.cext.capi;
 
+import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject.PInteropGetAttributeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CArrayWrappers.CByteArrayWrapper;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToSulongNode;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
-import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.runtime.PythonOptions;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -57,7 +60,24 @@
 @ImportStatic({NativeMember.class, PythonOptions.class})
 public abstract class PyDateTimeMRNode extends Node {
 
-    public abstract Object execute(PythonObject object, String key);
+    public enum DateTimeMode {
+        DATE,
+        TIME,
+        DATE_TIME
+    }
+
+    static DateTimeMode getModeFromTypeName(String typeName) {
+        if ("date".equals(typeName)) {
+            return DateTimeMode.DATE;
+        } else if ("datetime".equals(typeName)) {
+            return DateTimeMode.DATE_TIME;
+        } else if ("time".equals(typeName)) {
+            return DateTimeMode.TIME;
+        }
+        return null;
+    }
+
+    public abstract Object execute(PythonObject object, String key, DateTimeMode mode);
 
     public static final String YEAR = "year";
     public static final String MONTH = "month";
@@ -66,12 +86,15 @@ public abstract class PyDateTimeMRNode extends Node {
     public static final String MIN = "minute";
     public static final String SEC = "second";
     public static final String USEC = "microsecond";
+    public static final String TZINFO = "tzinfo";
 
     /**
      * Fields are packed into successive bytes, each viewed as unsigned and big-endian, unless
      * otherwise noted:
      *
-     * <code>
+     * PyDateTime_DateTime:
+     * 
+     * <pre>
      * byte offset
      *  0           year     2 bytes, 1-9999
      *  2           month    1 byte, 1-12
@@ -81,10 +104,32 @@ public abstract class PyDateTimeMRNode extends Node {
      *  6           second   1 byte, 0-59
      *  7           usecond  3 bytes, 0-999999
      * 10
-     * </code>
+     * </pre>
+     *
+     * PyDateTime_Date:
+     * 
+     * <pre>
+     * byte offset
+     *  0           year     2 bytes, 1-9999
+     *  2           month    1 byte, 1-12
+     *  3           day      1 byte, 1-31
+     * 10
+     * </pre>
+     * 
+     * PyDateTime_Time:
+     * 
+     * <pre>
+     * byte offset
+     *  4           hour     1 byte, 0-23
+     *  5           minute   1 byte, 0-59
+     *  6           second   1 byte, 0-59
+     *  7           usecond  3 bytes, 0-999999
+     * 10
+     * </pre>
      */
-    @Specialization(guards = "eq(DATETIME_DATA,key)")
-    Object doData(PythonObject object, @SuppressWarnings("unused") String key,
+    @Specialization(guards = {"eq(DATETIME_DATA, key)", "cachedMode == mode", "cachedMode != null"}, limit = "1")
+    static Object doData(PythonObject object, @SuppressWarnings("unused") String key, @SuppressWarnings("unused") DateTimeMode mode,
+                    @Cached("mode") DateTimeMode cachedMode,
                     @Cached PInteropGetAttributeNode getYearNode,
                     @Cached PInteropGetAttributeNode getMonthNode,
                     @Cached PInteropGetAttributeNode getDayNode,
@@ -93,39 +138,63 @@ Object doData(PythonObject object, @SuppressWarnings("unused") String key,
                     @Cached PInteropGetAttributeNode getSecNode,
                     @Cached PInteropGetAttributeNode getUSecNode,
                     @CachedLibrary(limit = "getCallSiteInlineCacheMaxDepth()") PythonObjectLibrary lib) {
+
         // passing null here should be ok, since we should be in an interop situation
-        int year = lib.asSize(getYearNode.execute(object, YEAR));
-        int month = lib.asSize(getMonthNode.execute(object, MONTH));
-        int day = lib.asSize(getDayNode.execute(object, DAY));
-        int hour = lib.asSize(getHourNode.execute(object, HOUR));
-        int min = lib.asSize(getMinNode.execute(object, MIN));
-        int sec = lib.asSize(getSecNode.execute(object, SEC));
-        int usec = lib.asSize(getUSecNode.execute(object, USEC));
-        assert year >= 0 && year < 0x10000;
-        assert month >= 0 && month < 0x100;
-        assert day >= 0 && day < 0x100;
-        assert hour >= 0 && hour < 0x100;
-        assert min >= 0 && min < 0x100;
-        assert sec >= 0 && sec < 0x100;
-        assert usec >= 0 && sec < 0x1000000;
-        byte[] data = new byte[]{(byte) (year >> 8), (byte) year, (byte) month, (byte) day, (byte) hour, (byte) min, (byte) sec, (byte) (usec >> 16), (byte) (usec >> 8), (byte) usec};
+        int year = -1;
+        int month = -1;
+        int day = -1;
+        int hour = -1;
+        int min = -1;
+        int sec = -1;
+        int usec = -1;
+        if (cachedMode == DateTimeMode.DATE || cachedMode == DateTimeMode.DATE_TIME) {
+            year = lib.asSize(getYearNode.execute(object, YEAR));
+            month = lib.asSize(getMonthNode.execute(object, MONTH));
+            day = lib.asSize(getDayNode.execute(object, DAY));
+            assert year >= 0 && year < 0x10000;
+            assert month >= 0 && month < 0x100;
+            assert day >= 0 && day < 0x100;
+        }
+        if (cachedMode == DateTimeMode.TIME || cachedMode == DateTimeMode.DATE_TIME) {
+            hour = lib.asSize(getHourNode.execute(object, HOUR));
+            min = lib.asSize(getMinNode.execute(object, MIN));
+            sec = lib.asSize(getSecNode.execute(object, SEC));
+            usec = lib.asSize(getUSecNode.execute(object, USEC));
+            assert hour >= 0 && hour < 0x100;
+            assert min >= 0 && min < 0x100;
+            assert sec >= 0 && sec < 0x100;
+            assert usec >= 0 && sec < 0x1000000;
+        }
 
+        byte[] data;
+        switch (cachedMode) {
+            case DATE:
+                data = new byte[]{(byte) (year >> 8), (byte) year, (byte) month, (byte) day};
+                break;
+            case TIME:
+                data = new byte[]{(byte) hour, (byte) min, (byte) sec, (byte) (usec >> 16), (byte) (usec >> 8), (byte) usec};
+                break;
+            case DATE_TIME:
+                data = new byte[]{(byte) (year >> 8), (byte) year, (byte) month, (byte) day, (byte) hour, (byte) min, (byte) sec, (byte) (usec >> 16), (byte) (usec >> 8), (byte) usec};
+                break;
+            default:
+                throw CompilerDirectives.shouldNotReachHere();
+        }
         return new CByteArrayWrapper(data);
     }
 
-    protected static GetAttributeNode createAttr(String expected) {
-        return GetAttributeNode.create(expected, null);
+    @Specialization(guards = "eq(DATETIME_TZINFO, key)")
+    static Object doTzinfo(PythonObject object, @SuppressWarnings("unused") String key, @SuppressWarnings("unused") DateTimeMode mode,
+                    @Cached ReadAttributeFromObjectNode getTzinfoNode,
+                    @Cached ToSulongNode toSulongNode) {
+        Object value = getTzinfoNode.execute(object, TZINFO);
+        if (value != PNone.NO_VALUE) {
+            return toSulongNode.execute(value);
+        }
+        throw CompilerDirectives.shouldNotReachHere();
     }
 
     protected static boolean eq(NativeMember expected, String actual) {
         return expected.getMemberName().equals(actual);
     }
-
-    public static PyDateTimeMRNode create() {
-        return PyDateTimeMRNodeGen.create();
-    }
-
-    public static PyDateTimeMRNode getUncached() {
-        return PyDateTimeMRNodeGen.getUncached();
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1493,7 +1493,13 @@ long getHash() {`
`1493`	`1493`	`abstract static class PyTruffleFrameNewNode extends PythonBuiltinNode {`
`1494`	`1494`	`@Specialization`
`1495`	`1495`	`Object newFrame(Object threadState, PCode code, PythonObject globals, Object locals) {`
`1496`		`- return factory().createPFrame(threadState, code, globals, locals);`
	`1496`	`+ Object frameLocals;`
	`1497`	`+ if (locals == null \|\| PGuards.isPNone(locals)) {`
	`1498`	`+ frameLocals = factory().createDict();`
	`1499`	`+ } else {`
	`1500`	`+ frameLocals = locals;`
	`1501`	`+ }`
	`1502`	`+ return factory().createPFrame(threadState, code, globals, frameLocals);`
`1497`	`1503`	`}`
`1498`	`1504`	`}`
`1499`	`1505`
Original file line number	Diff line number	Diff line change
`@@ -249,16 +249,16 @@ private PDict getSysDict() {`
`249`	`249`	`return (PDict) getDictNode.execute(getContext().getCore().lookupBuiltinModule("sys"));`
`250`	`250`	`}`
`251`	`251`
`252`		`- private PDict getGlobalsDict(Object globals) {`
	`252`	`+ private Object getGlobalsDict(Object globals) {`
`253`	`253`	`if (globals instanceof PDict) {`
`254`		`- return (PDict) globals;`
	`254`	`+ return globals;`
`255`	`255`	`}`
`256`	`256`	`if (getDictNode == null) {`
`257`	`257`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`258`	`258`	`reportPolymorphicSpecialize();`
`259`	`259`	`getDictNode = insert(GetDictNode.create());`
`260`	`260`	`}`
`261`		`- return (PDict) getDictNode.execute(globals);`
	`261`	`+ return getDictNode.execute(globals);`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`private PFrame getCallerFrame(VirtualFrame frame, int stackLevel) {`
`@@ -710,7 +710,7 @@ private void setupContext(VirtualFrame frame, int stackLevel, String[] filename,`
`710`	`710`	`lineno[0] = 1;`
`711`	`711`	`} else {`
`712`	`712`	`globals = getGlobalsDict(f.getGlobals());`
`713`		`- if (globals == null) {`
	`713`	`+ if (globals == null \|\| globals instanceof PNone) {`
`714`	`714`	`globals = getSysDict();`
`715`	`715`	`}`
`716`	`716`	`lineno[0] = f.getLine();`