- Added Binary multiplication specializations

- Added custom String subclass handling in HashingStorageNodes,
- Changed one ginstall dependency
- Added boolean value handling in string formatting variable %i

Author: Franziska Geiger

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

@@ -291,6 +291,20 @@ public Object mul(PBytes self, int times,
             return factory().createBytes(res);
         }
 
+        @Specialization
+        public Object mul(PBytes self, double times,
+                          @Cached("create()") SequenceStorageNodes.RepeatNode repeatNode) {
+            SequenceStorage res = repeatNode.execute(self.getSequenceStorage(), (int) times);
+            return factory().createBytes(res);
+        }
+
+        @Specialization
+        public Object mul(PBytes self, long times,
+                          @Cached("create()") SequenceStorageNodes.RepeatNode repeatNode) {
+            SequenceStorage res = repeatNode.execute(self.getSequenceStorage(), (int) 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) {

graalpython/lib-graalpython/modules/ginstall.py

@@ -84,7 +84,7 @@ def gast(**kwargs):
     def astor(**kwargs):
         install_from_pypi("astor==0.8.0", **kwargs)
 
-    def absl_py(**kwargs):
+    def absl-py(**kwargs):
         install_from_pypi("absl-py==0.7.1", **kwargs)
 
     def mock(**kwargs):