[GR-34468] Various C API fixes.

PullRequest: graalpython/1998

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_complex.py

@@ -98,7 +98,7 @@ def compile_module(self, name):
         code='''int isNaN(double d) {
             return d != d;
         }
-        
+
         int wrap_PyComplex_AsCComplex(PyObject* obj, double expectedReal, double expectedImag) {
             Py_complex res = PyComplex_AsCComplex(obj);
             if ((res.real == expectedReal && res.imag == expectedImag) || (isNaN(res.real) && isNaN(expectedReal))) {
@@ -120,6 +120,26 @@ def compile_module(self, name):
         callfunction="wrap_PyComplex_AsCComplex",
     )
 
+    test_PyComplex_cval = CPyExtFunction(
+        lambda args: (args[0].real, args[0].imag) if type(args[0]) is complex else None,
+        lambda: (
+            (complex(1.0, 2.0), ),
+            (DummyComplexSubclass(2.0, 3.0), ),
+        ),
+        code='''
+        PyObject* wrap_PyComplex_cval(PyObject* obj) {
+            if (PyComplex_CheckExact(obj)) {
+                Py_complex res = ((PyComplexObject *)obj)->cval;
+                return PyTuple_Pack(2, PyFloat_FromDouble(res.real), PyFloat_FromDouble(res.imag));
+            }
+            return Py_None;
+        }''',
+        resultspec="O",
+        argspec='O',
+        arguments=["PyObject* obj"],
+        callfunction="wrap_PyComplex_cval",
+    )
+
     test_PyComplex_RealAsDouble = CPyExtFunction(
         _reference_realasdouble,
         lambda: (
@@ -147,4 +167,3 @@ def compile_module(self, name):
         arguments=["PyObject* obj"],
         cmpfunc=unhandled_error_compare
     )
-

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py

@@ -694,6 +694,8 @@ def compile_module(self, name):
         lambda: (
             (0, 0),
             (1, 1),
+            (False, 0),
+            (True, 1),
             (-1, -1),
             (1, 1),
             (1<<29, 1),

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_set.py

@@ -182,3 +182,23 @@ def compile_module(self, name):
         arguments=["PyObject* o", "PyObject* item"],
         cmpfunc=unhandled_error_compare
     )
+
+    test_PySet_GET_SIZE = CPyExtFunction(
+        lambda args: len(args[0]),
+        lambda: (
+            (set(),),
+            (set(),),
+            (set([1, 2, 3]),),
+            (set({'a', 'b'}),),
+            (frozenset([1, 2, 3]),),
+            (frozenset({'a', 'b'}),),
+            (frozenset([None]),),
+            (FrozenSetSubclass(),),
+            (SetSubclass([None]),),
+        ),
+        resultspec="n",
+        argspec='O',
+        arguments=["PyObject* o"],
+        cmpfunc=unhandled_error_compare
+    )
+

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

@@ -184,6 +184,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -3182,12 +3183,17 @@ abstract static class ObSizeNode extends PNodeWithContext {
         public abstract long execute(Object object);
 
         @Specialization
-        long doInteger(@SuppressWarnings("unused") int object) {
+        static long doBoolean(boolean object) {
+            return object ? 1 : 0;
+        }
+
+        @Specialization
+        long doInteger(int object) {
             return doLong(object);
         }
 
         @Specialization
-        long doLong(@SuppressWarnings("unused") long object) {
+        long doLong(long object) {
             long t = PInt.abs(object);
             int sign = object < 0 ? -1 : 1;
             int size = 0;
@@ -3208,7 +3214,7 @@ long doPythonNativeVoidPtr(@SuppressWarnings("unused") PythonNativeVoidPtr objec
             return ((Long.SIZE - 1) / getContext().getCApiContext().getPyLongBitsInDigit() + 1);
         }
 
-        @Specialization(guards = "isFallback(object)")
+        @Fallback
         static long doOther(Object object,
                         @Cached PyObjectSizeNode sizeNode) {
             try {
@@ -3217,10 +3223,6 @@ static long doOther(Object object,
                 return -1;
             }
         }
-
-        static boolean isFallback(Object object) {
-            return !(object instanceof PInt || object instanceof Integer || object instanceof Long || object instanceof PythonNativeVoidPtr);
-        }
     }
 
     @GenerateUncached

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

@@ -113,6 +113,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
@@ -129,7 +130,7 @@
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.property.PProperty;
-import com.oracle.graal.python.builtins.objects.set.PSet;
+import com.oracle.graal.python.builtins.objects.set.PBaseSet;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.str.StringNodes.StringLenNode;
@@ -866,6 +867,11 @@ static Object doObDigit(PInt object, @SuppressWarnings("unused") PythonNativeWra
             return new PyLongDigitsWrapper(object);
         }
 
+        @Specialization(guards = "eq(COMPLEX_CVAL, key)")
+        static Object doComplexCVal(PComplex object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
+            return new PyComplexWrapper(object);
+        }
+
         @Specialization(guards = "eq(UNICODE_WSTR, key)")
         static Object doWstr(PString object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
                         @Shared("asWideCharNode") @Cached UnicodeAsWideCharNode asWideCharNode,
@@ -1059,7 +1065,7 @@ static Object doDQualname(PythonObject object, @SuppressWarnings("unused") Pytho
         }
 
         @Specialization(guards = "eq(SET_USED, key)", limit = "1")
-        static long doSetUsed(PSet object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
+        static long doSetUsed(PBaseSet object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
                         @CachedLibrary("object.getDictStorage()") HashingStorageLibrary lib) {
             return lib.length(object.getDictStorage());
         }

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

@@ -191,6 +191,9 @@ public enum NativeMember {
     // PyLongObject
     OB_DIGIT("ob_digit"),
 
+    // PyComplexObject
+    COMPLEX_CVAL("cval"),
+
     // PySliceObject
     START("start", OBJECT),
     STOP("stop", OBJECT),

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

@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins.objects.cext.capi;
+
+import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
+import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext.LLVMType;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetLLVMType;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.IsPointerNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.ToNativeNode;
+import com.oracle.graal.python.builtins.objects.complex.PComplex;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
+
+/**
+ * Emulates type {@code Py_complex}.
+ */
+@ExportLibrary(InteropLibrary.class)
+@ExportLibrary(value = NativeTypeLibrary.class, useForAOT = false)
+public final class PyComplexWrapper extends PythonNativeWrapper {
+
+    public static final String REAL = "real";
+    public static final String IMAG = "imag";
+
+    public PyComplexWrapper(PComplex delegate) {
+        super(delegate);
+    }
+
+    public PComplex getPComplex(PythonNativeWrapperLibrary lib) {
+        return (PComplex) lib.getDelegate(this);
+    }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    boolean hasMembers() {
+        return true;
+    }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    Object getMembers(@SuppressWarnings("unused") boolean includeInternal) {
+        return new PythonAbstractObject.Keys(new Object[]{REAL, IMAG});
+    }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    boolean isMemberReadable(String key) {
+        return REAL.equals(key) || IMAG.equals(key);
+    }
+
+    @ExportMessage
+    Object readMember(String key,
+                    @CachedLibrary("this") PythonNativeWrapperLibrary lib) throws UnknownIdentifierException {
+        switch (key) {
+            case REAL:
+                return getPComplex(lib).getReal();
+            case IMAG:
+                return getPComplex(lib).getImag();
+        }
+        CompilerDirectives.transferToInterpreterAndInvalidate();
+        throw UnknownIdentifierException.create(key);
+    }
+
+    @ExportMessage
+    void toNative(
+                    @Cached ToNativeNode toNativeNode) {
+        toNativeNode.execute(this);
+    }
+
+    @ExportMessage
+    boolean isPointer(
+                    @Cached IsPointerNode pIsPointerNode) {
+        return pIsPointerNode.execute(this);
+    }
+
+    @ExportMessage
+    long asPointer(
+                    @CachedLibrary(limit = "1") InteropLibrary interopLib,
+                    @CachedLibrary("this") PythonNativeWrapperLibrary lib) throws UnsupportedMessageException {
+        Object nativePointer = lib.getNativePointer(this);
+        if (nativePointer instanceof Long) {
+            return (long) nativePointer;
+        }
+        return interopLib.asPointer(nativePointer);
+    }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    boolean hasNativeType() {
+        return true;
+    }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    Object getNativeType(
+                    @Cached GetLLVMType getLLVMType) {
+        return getLLVMType.execute(LLVMType.Py_complex);
+    }
+}