[GR-17472][GR-17471][GR-17470] Multiple little fixes to run Cython

PullRequest: graalpython/602

Author: Franziska Geiger

graalpython/com.oracle.graal.python.test/src/tests/test_dict.py

@@ -486,10 +486,23 @@ def as_utf8_string(self):
         return bytes_literal(self.utf8encode(), 'utf8')
 
 
-def test_wrapped_string_contains():
-    testString = EncodedString('something')
+def test_wrapped_string_contains1():
+    test_string = EncodedString('something')
     dict = {'something': (1, 0), 'nothing': (2, 0)}
     reached = False
-    if testString in dict:
+    if test_string in dict:
         reached = True
     assert reached
+
+def test_wrapped_string_contains2():
+    test_string = EncodedString('something')
+    dict = {'something', 'nothing'}
+    reached = False
+    if test_string in dict:
+        reached = True
+    assert reached
+
+def test_wrapped_string_get():
+    a = 'test'
+    dict = locals()
+    assert dict['a']

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java

@@ -65,6 +65,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.graal.python.nodes.util.CastToIndexNode;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
@@ -291,6 +292,14 @@ public Object mul(PBytes self, int times,
             return factory().createBytes(res);
         }
 
+        @Specialization
+        public Object mul(PBytes self, Object times,
+                        @Cached("create()") SequenceStorageNodes.RepeatNode repeatNode,
+                        @Cached("create()") CastToIndexNode castToInt) {
+            SequenceStorage res = repeatNode.execute(self.getSequenceStorage(), castToInt.execute(times));
+            return factory().createBytes(res);
+        }
+
         @SuppressWarnings("unused")
         @Fallback
         public Object mul(Object self, Object other) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java

@@ -516,12 +516,19 @@ protected boolean contains(EmptyStorage storage, Object key) {
 
         @Specialization(guards = "isHashable(frame, key)")
         protected boolean contains(@SuppressWarnings("unused") VirtualFrame frame, KeywordsStorage storage, Object key,
-                        @Cached("createClassProfile()") ValueProfile keyTypeProfile) {
+                        @Cached("createClassProfile()") ValueProfile keyTypeProfile,
+                        @Cached LookupInheritedAttributeNode.Dynamic lookupHash,
+                        @Cached LookupAttributeInMRONode.Dynamic lookupStringHash) {
             Object profileKey = keyTypeProfile.profile(key);
             if (profileKey instanceof String) {
                 return storage.hasKey(profileKey, DEFAULT_EQIVALENCE);
-            } else if (profileKey instanceof PString && wrappedString((PString) profileKey)) {
-                return storage.hasKey(((PString) profileKey).getValue(), DEFAULT_EQIVALENCE);
+            } else if (profileKey instanceof PString) {
+                if (wrappedString((PString) profileKey) || lookupHash.execute(key, __HASH__) == lookupStringHash.execute(PythonBuiltinClassType.PString, __HASH__)) {
+                    return storage.hasKey(((PString) profileKey).getValue(), DEFAULT_EQIVALENCE);
+                }
+                CompilerDirectives.transferToInterpreter();
+                // see GR-17389
+                throw new RuntimeException("String subclasses with custom hash in dict not implemented.");
             }
             return false;
         }
@@ -626,6 +633,11 @@ protected boolean contains(VirtualFrame frame, HashMapStorage storage, Object ke
             }
         }
 
+        @Specialization(guards = "isHashable(frame, key)")
+        protected boolean contains(@SuppressWarnings("unused") VirtualFrame frame, LocalsStorage storage, PString key) {
+            return storage.hasKey(key.getValue(), HashingStorage.DEFAULT_EQIVALENCE);
+        }
+
         @Specialization(guards = "isHashable(frame, key)")
         protected boolean contains(@SuppressWarnings("unused") VirtualFrame frame, LocalsStorage storage, Object key) {
             return storage.hasKey(key, HashingStorage.DEFAULT_EQIVALENCE);
@@ -870,7 +882,7 @@ protected HashingStorage doKeywordsGeneralize(VirtualFrame frame, KeywordsStorag
                 newStorage.addAll(storage, getEquivalence());
                 newStorage.setItem(key, value, getEquivalence());
             }
-            return storage;
+            return newStorage;
         }
 
         @Specialization(guards = "isHashable(frame, key)")
@@ -1185,6 +1197,19 @@ Object doLocalsString(LocalsStorage storage, PString key) {
             return storage.getItem(key.getValue(), DEFAULT_EQIVALENCE);
         }
 
+        @Specialization(guards = {"!isJavaString(key)", "isHashable(frame, key)"})
+        Object doLocalsObject(VirtualFrame frame, LocalsStorage storage, PString key,
+                        @Cached LookupInheritedAttributeNode.Dynamic lookupHash,
+                        @Cached LookupAttributeInMRONode.Dynamic lookupStringHash,
+                        @Cached GetItemNode recursiveNode) {
+            if (lookupHash.execute(key, __HASH__) == lookupStringHash.execute(PythonBuiltinClassType.PString, __HASH__)) {
+                return recursiveNode.execute(frame, storage, key.getValue());
+            }
+            CompilerDirectives.transferToInterpreter();
+            // see GR-17389
+            throw new RuntimeException("String subclasses with custom hash in dict not implemented.");
+        }
+
         @Specialization(guards = {"!isJavaString(key)", "isHashable(frame, key)"})
         @SuppressWarnings("unused")
         Object doLocalsObject(VirtualFrame frame, LocalsStorage storage, Object key) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/StringFormatter.java

@@ -123,6 +123,8 @@ private static Object asNumber(Object arg, CallNode callNode, BiFunction<Object,
         } else if (arg instanceof Double) {
             // A common case where it is safe to return arg.__int__()
             return ((Double) arg).intValue();
+        } else if (arg instanceof Boolean) {
+            return (Boolean) arg ? 1 : 0;
         } else if (arg instanceof PFloat) {
             return (int) ((PFloat) arg).getValue();
         } else if (arg instanceof PythonAbstractObject) {

mx.graalpython/mx_graalpython.py

@@ -31,7 +31,6 @@
 import shutil
 import sys
 import tempfile
-import time
 from argparse import ArgumentParser
 
 import mx
@@ -1041,13 +1040,13 @@ def python_build_watch(args):
     if sum([args.full, args.graalvm, args.no_java]) > 1:
         mx.abort("Only one of --full, --graalvm, --no-java can be specified")
     if args.full:
-        suffixes = [".c", ".h", ".class", ".jar", ".java"]
+        # suffixes = [".c", ".h", ".class", ".jar", ".java"]
         excludes = [".*\\.py$"]
     elif args.graalvm:
-        suffixes = [".c", ".h", ".class", ".jar", ".java", ".py"]
+        # suffixes = [".c", ".h", ".class", ".jar", ".java", ".py"]
         excludes = ["mx_.*\\.py$"]
     else:
-        suffixes = [".c", ".h", ".class", ".jar"]
+        # suffixes = [".c", ".h", ".class", ".jar"]
         excludes = [".*\\.py$", ".*\\.java$"]
 
     cmd = ["inotifywait", "-q", "-e", "close_write,moved_to", "-r", "--format=%f"]

mx.graalpython/mx_graalpython_benchmark.py

@@ -23,7 +23,6 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 from __future__ import print_function
 
-import argparse
 import os
 import re
 from abc import ABCMeta, abstractproperty, abstractmethod

mx.graalpython/suite.py

@@ -91,15 +91,14 @@
             ],
             "sha1": "7a5960b8062ddbf0c0e79f806e23785d55fec3c8",
         },
-        "XZ-1.8" : { 
-            "sha1" : "c4f7d054303948eb6a4066194253886c8af07128",
-            "maven" : { 
-            "groupId" : "org.tukaani",
-            "artifactId" : "xz",
-            "version" : "1.8",
-        },  
-    },
-
+        "XZ-1.8": {
+            "sha1": "c4f7d054303948eb6a4066194253886c8af07128",
+            "maven": {
+                "groupId": "org.tukaani",
+                "artifactId": "xz",
+                "version": "1.8",
+            },
+        },
 
     },
 
@@ -160,7 +159,6 @@
         },
     },
 
-
     "projects": {
         # GRAALPYTHON ANTLR
         "com.oracle.graal.python.parser.antlr": {
@@ -204,11 +202,11 @@
             ],
             "buildDependencies": ["com.oracle.graal.python.parser.antlr"],
             "jacoco": "include",
-            "javaCompliance" : "8+",
-            "checkstyleVersion" : "8.8",
+            "javaCompliance": "8+",
+            "checkstyleVersion": "8.8",
             "annotationProcessors": ["truffle:TRUFFLE_DSL_PROCESSOR"],
             "workingSets": "Truffle,Python",
-            "spotbugsIgnoresGenerated" : True,
+            "spotbugsIgnoresGenerated": True,
         },
 
         # GRAALPYTHON TEST
@@ -242,7 +240,6 @@
             "testProject": True,
         },
 
-
         "com.oracle.graal.python.cext": {
             "subDir": "graalpython",
             "native": True,