[GR-16858] Support Numpy 1.16.4

PullRequest: graalpython/575

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -327,9 +327,6 @@ extern PyObject* wrapped_null;
 
 /* internal functions to avoid unnecessary managed <-> native conversions */
 
-/* DICT */
-void* PyTruffle_Tuple_GetItem(void* jtuple, Py_ssize_t position);
-
 /* STR */
 PyObject* PyTruffle_Unicode_FromFormat(const char*, va_list, void**, int);
 

graalpython/com.oracle.graal.python.cext/src/tupleobject.c

@@ -130,6 +130,10 @@ int PyTruffle_Tuple_SetItem(PyObject* tuple, Py_ssize_t position, PyObject* item
     return 0;
 }
 
+PyObject* PyTruffle_Tuple_GetItem(PyObject* tuple, Py_ssize_t position) {
+    return native_to_java(PyTuple_GET_ITEM(tuple, position));
+}
+
 PyObject* PyTruffle_Tuple_Alloc(PyTypeObject* cls, Py_ssize_t nitems) {
 	/*
 	 * TODO(fa): For 'PyVarObjects' (i.e. 'nitems > 0') we increase the size by 'sizeof(void *)'

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -180,6 +180,7 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.debug.Debugger;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -1331,20 +1332,22 @@ Object minmaxSequenceWithKey(VirtualFrame frame, PythonObject arg1, @SuppressWar
         @Specialization(guards = "args.length != 0")
         Object minmaxBinary(VirtualFrame frame, Object arg1, Object[] args, @SuppressWarnings("unused") PNone keywordArg,
                         @Cached("createComparison()") BinaryComparisonNode compare,
-                        @Cached("createBinaryProfile()") ConditionProfile moreThanTwo) {
-            return minmaxBinaryWithKey(frame, arg1, args, null, compare, null, moreThanTwo);
+                        @Cached("createBinaryProfile()") ConditionProfile moreThanTwo,
+                        @Shared("castToBooleanNode") @Cached("createIfTrueNode()") CastToBooleanNode castToBooleanNode) {
+            return minmaxBinaryWithKey(frame, arg1, args, null, compare, null, moreThanTwo, castToBooleanNode);
         }
 
         @Specialization(guards = "args.length != 0")
         Object minmaxBinaryWithKey(VirtualFrame frame, Object arg1, Object[] args, PythonObject keywordArg,
                         @Cached("createComparison()") BinaryComparisonNode compare,
-                        @Cached("create()") CallNode keyCall,
-                        @Cached("createBinaryProfile()") ConditionProfile moreThanTwo) {
+                        @Cached CallNode keyCall,
+                        @Cached("createBinaryProfile()") ConditionProfile moreThanTwo,
+                        @Shared("castToBooleanNode") @Cached("createIfTrueNode()") CastToBooleanNode castToBooleanNode) {
             Object currentValue = arg1;
             Object currentKey = applyKeyFunction(frame, keywordArg, keyCall, currentValue);
             Object nextValue = args[0];
             Object nextKey = applyKeyFunction(frame, keywordArg, keyCall, nextValue);
-            if (compare.executeBool(frame, nextKey, currentKey)) {
+            if (castToBooleanNode.executeBoolean(frame, compare.executeWith(frame, nextKey, currentKey))) {
                 currentKey = nextKey;
                 currentValue = nextValue;
             }

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

@@ -83,6 +83,7 @@ public abstract class NativeCAPISymbols {
     public static final String FUN_GET_THREAD_STATE_TYPE_ID = "get_thread_state_typeid";
     public static final String FUN_ADD_NATIVE_SLOTS = "PyTruffle_Type_AddSlots";
     public static final String FUN_PY_TRUFFLE_TUPLE_SET_ITEM = "PyTruffle_Tuple_SetItem";
+    public static final String FUN_PY_TRUFFLE_TUPLE_GET_ITEM = "PyTruffle_Tuple_GetItem";
     public static final String FUN_PY_TRUFFLE_OBJECT_SIZE = "PyTruffle_Object_Size";
 
     @CompilationFinal(dimensions = 1) private static final String[] values;

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

@@ -88,7 +88,6 @@
 @ImportStatic(SpecialMethodNames.class)
 public class PyNumberMethodsWrapper extends PythonNativeWrapper {
 
-    // TODO extend list according to 'isValidMember'
     private static final String[] NUMBER_METHODS = new String[]{
                     NB_ADD,
                     NB_SUBTRACT,

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

@@ -69,6 +69,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -107,6 +108,29 @@ public int getElementAccessSize() {
         return elementAccessSize;
     }
 
+    @Override
+    public int hashCode() {
+        CompilerAsserts.neverPartOfCompilation();
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + getDelegate().hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        return getDelegate() == ((PySequenceArrayWrapper) obj).getDelegate();
+    }
+
     @ExportMessage
     final long getArraySize(
                     @Shared("callLenNode") @Cached LookupAndCallUnaryDynamicNode callLenNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java

@@ -403,7 +403,7 @@ public Object get(SuperObject self, Object obj, @SuppressWarnings("unused") Obje
     @Builtin(name = SpecialMethodNames.__GETATTRIBUTE__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class GetattributeNode extends PythonBinaryBuiltinNode {
-        @Child private ReadAttributeFromObjectNode readFromDict = ReadAttributeFromObjectNode.create();
+        @Child private ReadAttributeFromObjectNode readFromDict = ReadAttributeFromObjectNode.createForceType();
         @Child private LookupInheritedAttributeNode readGet = LookupInheritedAttributeNode.create(SpecialMethodNames.__GET__);
         @Child private GetObjectTypeNode getObjectType = GetObjectTypeNodeGen.create();
         @Child private GetTypeNode getType;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/PTuple.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/TupleBuiltins.java

@@ -370,17 +370,25 @@ public abstract static class GetItemNode extends PythonBinaryBuiltinNode {
         public abstract Object execute(PTuple tuple, Object index);
 
         @Specialization(guards = "!isPSlice(key)")
-        public Object doPTuple(PTuple tuple, Object key,
+        Object doPTuple(PTuple tuple, Object key,
                         @Cached("createGetItemNode()") SequenceStorageNodes.GetItemNode getItemNode) {
             return getItemNode.execute(tuple.getSequenceStorage(), key);
         }
 
         @Specialization
-        public Object doPTuple(PTuple tuple, PSlice key,
+        Object doPTuple(PTuple tuple, PSlice key,
                         @Cached("createGetItemNode()") SequenceStorageNodes.GetItemNode getItemNode) {
             return getItemNode.execute(tuple.getSequenceStorage(), key);
         }
 
+        @Specialization
+        Object doNative(PythonNativeObject tuple, long key,
+                        @Cached PCallCapiFunction callSetItem,
+                        @Cached CExtNodes.ToSulongNode toSulongNode,
+                        @Cached CExtNodes.AsPythonObjectNode asPythonObjectNode) {
+            return asPythonObjectNode.execute(callSetItem.call(NativeCAPISymbols.FUN_PY_TRUFFLE_TUPLE_GET_ITEM, toSulongNode.execute(tuple), key));
+        }
+
         protected static SequenceStorageNodes.GetItemNode createGetItemNode() {
             return SequenceStorageNodes.GetItemNode.create(NormalizeIndexNode.forTuple(), TYPE_ERROR_MESSAGE, (s, f) -> f.createTuple(s));
         }

graalpython/lib-graalpython/_collections.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
 # Copyright (c) 2017, The PyPy Project
 #
 #     The MIT License
@@ -627,3 +627,6 @@ def __missing__(self, key):
             raise KeyError((key,))
         self[key] = value = self.default_factory()
         return value
+    
+    def __repr__(self):
+        return "%s(%r, %s)" % (type(self).__name__, self.default_factory, dict.__repr__(self))