[GR-9246] Various C API fixes for Managed Sulong.

fangerer · fangerer · commit 3434cec63d9b · 2018-09-20T06:17:35.000-07:00
PullRequest: graalpython/197
diff --git a/graalpython/com.oracle.graal.python.cext/src/longobject.c b/graalpython/com.oracle.graal.python.cext/src/longobject.c
@@ -70,7 +70,7 @@ long long PyLong_AsLongLongAndOverflow(PyObject *obj, int *overflow) {
     return result;
 }
 
-unsigned long long PyLong_AsUnsignedLonglong(PyObject *obj) {
+unsigned long long PyLong_AsUnsignedLongLong(PyObject *obj) {
     return as_unsigned_long_long(obj);
 }
 
diff --git a/graalpython/com.oracle.graal.python.cext/src/methodobject.c b/graalpython/com.oracle.graal.python.cext/src/methodobject.c
@@ -52,6 +52,6 @@ PyObject* PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module) {
                                                get_method_flags_cwrapper(ml->ml_flags),
                                                get_method_flags_wrapper(ml->ml_flags),
                                                self,
-                                               module,
+                                               native_to_java(module),
                                                polyglot_from_string((const char*)(ml->ml_doc ? ml->ml_doc : ""), SRC_CS)));
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CArrayWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CArrayWrapperMR.java
@@ -40,10 +40,17 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
+import com.oracle.graal.python.builtins.objects.cext.CArrayWrapperMRFactory.GetTypeIDNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CByteArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CStringWrapper;
+import com.oracle.graal.python.builtins.objects.cext.CExtNodes.CExtBaseNode;
+import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.dsl.ImportStatic;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.MessageResolution;
@@ -58,19 +65,24 @@ public class CArrayWrapperMR {
 
     @Resolve(message = "READ")
     abstract static class ReadNode extends Node {
-
         public char access(CStringWrapper object, int idx) {
             String s = object.getDelegate();
             if (idx >= 0 && idx < s.length()) {
                 return s.charAt(idx);
             } else if (idx == s.length()) {
                 return '\0';
             }
+            CompilerDirectives.transferToInterpreter();
             throw UnknownIdentifierException.raise(Integer.toString(idx));
         }
 
-        public byte access(CByteArrayWrapper object, long idx) {
-            return access(object, (int) idx);
+        public char access(CStringWrapper object, long idx) {
+            try {
+                return access(object, PInt.intValueExact(idx));
+            } catch (ArithmeticException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw UnknownIdentifierException.raise(Long.toString(idx));
+            }
         }
 
         public byte access(CByteArrayWrapper object, int idx) {
@@ -80,8 +92,51 @@ public byte access(CByteArrayWrapper object, int idx) {
             } else if (idx == arr.length) {
                 return (byte) 0;
             }
+            CompilerDirectives.transferToInterpreter();
             throw UnknownIdentifierException.raise(Integer.toString(idx));
         }
+
+        public byte access(CByteArrayWrapper object, long idx) {
+            try {
+                return access(object, PInt.intValueExact(idx));
+            } catch (ArithmeticException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw UnknownIdentifierException.raise(Long.toString(idx));
+            }
+        }
+    }
+
+    @SuppressWarnings("unknown-message")
+    @Resolve(message = "com.oracle.truffle.llvm.spi.GetDynamicType")
+    abstract static class GetDynamicTypeNode extends Node {
+        @Child private GetTypeIDNode getTypeId = GetTypeIDNodeGen.create();
+
+        public Object access(CStringWrapper object) {
+            return getTypeId.execute(object);
+        }
+    }
+
+    @ImportStatic(SpecialMethodNames.class)
+    abstract static class GetTypeIDNode extends CExtBaseNode {
+
+        @Child private PCallNativeNode callUnaryNode = PCallNativeNode.create();
+
+        @CompilationFinal private TruffleObject funGetByteArrayTypeID;
+
+        public abstract Object execute(Object delegate);
+
+        @Specialization
+        Object doTuple(CStringWrapper object) {
+            return callGetByteArrayTypeID(object.getDelegate().length());
+        }
+
+        private Object callGetByteArrayTypeID(long len) {
+            if (funGetByteArrayTypeID == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                funGetByteArrayTypeID = importCAPISymbol(NativeCAPISymbols.FUN_GET_BYTE_ARRAY_TYPE_ID);
+            }
+            return callUnaryNode.execute(funGetByteArrayTypeID, new Object[]{len});
+        }
     }
 
     @Resolve(message = "HAS_SIZE")
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
@@ -95,6 +95,7 @@ public final class NativeMemberNames {
     public static final String BUF_DELEGATE = "buf_delegate";
     public static final String BUF_READONLY = "readonly";
     public static final String NB_ADD = "nb_add";
+    public static final String NB_AND = "nb_and";
     public static final String NB_INDEX = "nb_index";
     public static final String NB_POW = "nb_power";
     public static final String NB_TRUE_DIVIDE = "nb_true_divide";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapperMR.java
@@ -41,22 +41,28 @@
 package com.oracle.graal.python.builtins.objects.cext;
 
 import static com.oracle.graal.python.builtins.objects.cext.NativeMemberNames.NB_ADD;
+import static com.oracle.graal.python.builtins.objects.cext.NativeMemberNames.NB_AND;
 import static com.oracle.graal.python.builtins.objects.cext.NativeMemberNames.NB_INDEX;
-import static com.oracle.graal.python.builtins.objects.cext.NativeMemberNames.NB_MULTIPLY;
 import static com.oracle.graal.python.builtins.objects.cext.NativeMemberNames.NB_INPLACE_MULTIPLY;
+import static com.oracle.graal.python.builtins.objects.cext.NativeMemberNames.NB_MULTIPLY;
 import static com.oracle.graal.python.builtins.objects.cext.NativeMemberNames.NB_POW;
 import static com.oracle.graal.python.builtins.objects.cext.NativeMemberNames.NB_TRUE_DIVIDE;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ADD__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__AND__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__IMUL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INDEX__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__POW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__MUL__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__IMUL__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__POW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__TRUEDIV__;
 
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToSulongNode;
+import com.oracle.graal.python.builtins.objects.cext.PyNumberMethodsWrapperMRFactory.ReadMethodNodeGen;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
+import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.MessageResolution;
 import com.oracle.truffle.api.interop.Resolve;
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
@@ -67,73 +73,65 @@ public class PyNumberMethodsWrapperMR {
 
     @Resolve(message = "READ")
     abstract static class ReadNode extends Node {
-        @Child private LookupAttributeInMRONode getAddAttributeNode;
-        @Child private LookupAttributeInMRONode getIndexAttributeNode;
-        @Child private LookupAttributeInMRONode getPowAttributeNode;
-        @Child private LookupAttributeInMRONode getMulAttributeNode;
-        @Child private LookupAttributeInMRONode getTrueDivAttributeNode;
+        @Child private ReadMethodNode readMethodNode = ReadMethodNodeGen.create();
         @Child private ToSulongNode toSulongNode;
 
         public Object access(PyNumberMethodsWrapper object, String key) {
             // translate key to attribute name
             PythonClass delegate = object.getDelegate();
-            Object result;
+            return getToSulongNode().execute(readMethodNode.execute(delegate, key));
+        }
+
+        private ToSulongNode getToSulongNode() {
+            if (toSulongNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                toSulongNode = insert(ToSulongNode.create());
+            }
+            return toSulongNode;
+        }
+    }
+
+    abstract static class ReadMethodNode extends PNodeWithContext {
+
+        public abstract Object execute(PythonClass clazz, String key);
+
+        @Specialization(limit = "99", guards = {"eq(cachedKey, key)"})
+        Object getMethod(PythonClass clazz, @SuppressWarnings("unused") String key,
+                        @Cached("key") @SuppressWarnings("unused") String cachedKey,
+                        @Cached("createLookupNode(cachedKey)") LookupAttributeInMRONode lookupNode) {
+            if (lookupNode != null) {
+                return lookupNode.execute(clazz);
+            }
+            // TODO extend list
+            CompilerDirectives.transferToInterpreter();
+            throw UnknownIdentifierException.raise(key);
+        }
+
+        protected LookupAttributeInMRONode createLookupNode(String key) {
             switch (key) {
                 case NB_ADD:
-                    if (getAddAttributeNode == null) {
-                        CompilerDirectives.transferToInterpreterAndInvalidate();
-                        getAddAttributeNode = insert(LookupAttributeInMRONode.create(__ADD__));
-                    }
-                    result = getAddAttributeNode.execute(delegate);
-                    break;
+                    return LookupAttributeInMRONode.create(__ADD__);
+                case NB_AND:
+                    return LookupAttributeInMRONode.create(__AND__);
                 case NB_INDEX:
-                    if (getIndexAttributeNode == null) {
-                        CompilerDirectives.transferToInterpreterAndInvalidate();
-                        getIndexAttributeNode = insert(LookupAttributeInMRONode.create(__INDEX__));
-                    }
-                    result = getIndexAttributeNode.execute(delegate);
-                    break;
+                    return LookupAttributeInMRONode.create(__INDEX__);
                 case NB_POW:
-                    if (getPowAttributeNode == null) {
-                        CompilerDirectives.transferToInterpreterAndInvalidate();
-                        getPowAttributeNode = insert(LookupAttributeInMRONode.create(__POW__));
-                    }
-                    result = getPowAttributeNode.execute(delegate);
-                    break;
+                    return LookupAttributeInMRONode.create(__POW__);
                 case NB_TRUE_DIVIDE:
-                    if (getTrueDivAttributeNode == null) {
-                        CompilerDirectives.transferToInterpreterAndInvalidate();
-                        getTrueDivAttributeNode = insert(LookupAttributeInMRONode.create(__TRUEDIV__));
-                    }
-                    result = getTrueDivAttributeNode.execute(delegate);
-                    break;
+                    return LookupAttributeInMRONode.create(__TRUEDIV__);
                 case NB_MULTIPLY:
-                    if (getMulAttributeNode == null) {
-                        CompilerDirectives.transferToInterpreterAndInvalidate();
-                        getMulAttributeNode = insert(LookupAttributeInMRONode.create(__MUL__));
-                    }
-                    result = getMulAttributeNode.execute(delegate);
-                    break;
+                    return LookupAttributeInMRONode.create(__MUL__);
                 case NB_INPLACE_MULTIPLY:
-                    if (getMulAttributeNode == null) {
-                        CompilerDirectives.transferToInterpreterAndInvalidate();
-                        getMulAttributeNode = insert(LookupAttributeInMRONode.create(__IMUL__));
-                    }
-                    result = getMulAttributeNode.execute(delegate);
-                    break;
+                    return LookupAttributeInMRONode.create(__IMUL__);
                 default:
                     // TODO extend list
                     throw UnknownIdentifierException.raise(key);
             }
-            return getToSulongNode().execute(result);
         }
 
-        private ToSulongNode getToSulongNode() {
-            if (toSulongNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                toSulongNode = insert(ToSulongNode.create());
-            }
-            return toSulongNode;
+        protected static boolean eq(String expected, String actual) {
+            return expected.equals(actual);
         }
     }
+
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java
@@ -44,6 +44,7 @@
 
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
+import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes.CExtBaseNode;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes.ToSulongNode;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PySequenceArrayWrapper;
@@ -86,6 +87,7 @@
 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.ValueProfile;
 
 @MessageResolution(receiverType = PySequenceArrayWrapper.class)
 public class PySequenceArrayWrapperMR {
@@ -162,17 +164,19 @@ Object doTuple(PList list, long idx,
          * {@code uint64_t} since we do not know how many bytes are requested.
          */
         @Specialization
-        long doBytesI64(PBytes bytes, long byteIdx,
+        long doBytesI64(PIBytesLike bytesLike, long byteIdx,
+                        @Cached("createClassProfile()") ValueProfile profile,
                         @Cached("create()") SequenceStorageNodes.LenNode lenNode,
                         @Cached("create()") SequenceStorageNodes.GetItemNode getItemNode) {
-            int len = lenNode.execute(bytes.getSequenceStorage());
+            PIBytesLike profiled = profile.profile(bytesLike);
+            int len = lenNode.execute(profiled.getSequenceStorage());
             // simulate sentinel value
             if (byteIdx == len) {
                 return 0L;
             }
             int i = (int) byteIdx;
             long result = 0;
-            SequenceStorage store = bytes.getSequenceStorage();
+            SequenceStorage store = profiled.getSequenceStorage();
             result |= getItemNode.executeInt(store, i);
             if (i + 1 < len)
                 result |= ((long) getItemNode.executeInt(store, i + 1) << 8L) & 0xFF00L;
diff --git a/graalpython/lib-graalpython/python_cext.py b/graalpython/lib-graalpython/python_cext.py
@@ -704,7 +704,7 @@ def AddFunction(primary, name, cfunc, cwrapper, wrapper, doc, isclass=False, iss
     owner = to_java(primary)
     if isinstance(owner, moduletype):
         # module case, we create the bound function-or-method
-        func = PyCFunction_NewEx(name, cfunc, cwrapper, wrapper, owner, owner, doc)
+        func = PyCFunction_NewEx(name, cfunc, cwrapper, wrapper, owner, owner.__name__, doc)
         object.__setattr__(owner, name, func)
     else:
         func = wrapper(CreateFunction(name, cfunc, cwrapper, owner))
@@ -728,7 +728,7 @@ def PyCFunction_NewEx(name, cfunc, cwrapper, wrapper, self, module, doc):
     PyTruffle_SetAttr(func, "__name__", name)
     PyTruffle_SetAttr(func, "__doc__", doc)
     method = PyTruffle_BuiltinMethod(self, func)
-    PyTruffle_SetAttr(method, "__module__", module.__name__)
+    PyTruffle_SetAttr(method, "__module__", to_java(module))
     return method
 
 
diff --git a/mx.graalpython/copyrights/overrides b/mx.graalpython/copyrights/overrides
@@ -130,7 +130,6 @@ graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/basic/
 graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/BuiltinFunctionTests.java,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/ImportTests.java,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/IteratorTests.java,zippy.copyright
-graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/RegularExpressionTests.java,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/SpecialMethodTests.java,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/DictTests.java,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/FrameTest.java,zippy.copyright

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ long long PyLong_AsLongLongAndOverflow(PyObject obj, int overflow) {`
`70`	`70`	`return result;`
`71`	`71`	`}`
`72`	`72`
`73`		`-unsigned long long PyLong_AsUnsignedLonglong(PyObject *obj) {`
	`73`	`+unsigned long long PyLong_AsUnsignedLongLong(PyObject *obj) {`
`74`	`74`	`return as_unsigned_long_long(obj);`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ PyObject* PyCFunction_NewEx(PyMethodDef ml, PyObject self, PyObject *module) {`
`52`	`52`	`get_method_flags_cwrapper(ml->ml_flags),`
`53`	`53`	`get_method_flags_wrapper(ml->ml_flags),`
`54`	`54`	`self,`
`55`		`- module,`
	`55`	`+ native_to_java(module),`
`56`	`56`	`polyglot_from_string((const char*)(ml->ml_doc ? ml->ml_doc : ""), SRC_CS)));`
`57`	`57`	`}`