fixed HashingStorageLibrary usage:

- using a receiver bound HashingStorageLibrary when setting items might cause 'Invalid library usage' assertion error
- limit should be > 1
- setitem might create a new storage, so when setting more items, the result from the previous setitem call should be used

Author: tomasstupka

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

@@ -683,7 +683,7 @@ private PSet readSet(int depth, HashingStorageLibrary lib) {
                 Object key = readObject(depth + 1, lib);
                 // note: we may pass a 'null' frame here because global state is ensured to be
                 // transfered
-                lib.setItem(newStorage, key, PNone.NO_VALUE);
+                newStorage = lib.setItem(newStorage, key, PNone.NO_VALUE);
             }
 
             return factory().createSet(newStorage);
@@ -699,7 +699,7 @@ private PFrozenSet readFrozenSet(int depth, HashingStorageLibrary lib) {
                 Object key = readObject(depth + 1, lib);
                 // note: we may pass a 'null' frame here because global state is ensured to be
                 // transfered
-                lib.setItem(newStorage, key, PNone.NO_VALUE);
+                newStorage = lib.setItem(newStorage, key, PNone.NO_VALUE);
             }
 
             return factory().createFrozenSet(newStorage);
@@ -785,7 +785,7 @@ private CreateCodeNode ensureCreateCodeNode() {
         @Specialization
         Object readObject(VirtualFrame frame, byte[] dataBytes, @SuppressWarnings("unused") int version,
                         @CachedContext(PythonLanguage.class) PythonContext context,
-                        @CachedLibrary(limit = "1") HashingStorageLibrary lib) {
+                        @CachedLibrary(limit = "3") HashingStorageLibrary lib) {
             reset();
             this.data = dataBytes;
             Object state = IndirectCallContext.enter(frame, context, this);

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

@@ -326,13 +326,13 @@ static HashingStorage toSameType(EconomicMapStorage self, EconomicMapStorage oth
         }
 
         @TruffleBoundary
-        @Specialization(limit = "2")
+        @Specialization
         static HashingStorage generic(EconomicMapStorage self, HashingStorage other,
-                        @CachedLibrary("other") HashingStorageLibrary lib) {
+                        @CachedLibrary(limit = "2") HashingStorageLibrary lib) {
             HashingStorage result = other;
             MapCursor<DictKey, Object> cursor = self.map.getEntries();
             while (cursor.advance()) {
-                result = lib.setItem(other, cursor.getKey().value, cursor.getValue());
+                result = lib.setItem(result, cursor.getKey().value, cursor.getValue());
             }
             return result;
         }

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

@@ -238,7 +238,7 @@ public static class AddAllToOther {
         @ExplodeLoop
         static HashingStorage cached(KeywordsStorage self, HashingStorage other,
                         @Exclusive @Cached("self.length()") int cachedLen,
-                        @CachedLibrary(limit = "1") HashingStorageLibrary lib) {
+                        @CachedLibrary(limit = "2") HashingStorageLibrary lib) {
             HashingStorage result = other;
             for (int i = 0; i < cachedLen; i++) {
                 PKeyword entry = self.keywords[i];

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

@@ -235,7 +235,7 @@ protected static FrameSlot[] getSlots(FrameDescriptor desc) {
         @Specialization(guards = {"desc == self.frame.getFrameDescriptor()"}, limit = "1", assumptions = "desc.getVersion()")
         @ExplodeLoop
         static HashingStorage cached(LocalsStorage self, HashingStorage other,
-                        @CachedLibrary("other") HashingStorageLibrary lib,
+                        @CachedLibrary(limit = "2") HashingStorageLibrary lib,
                         @Exclusive @SuppressWarnings("unused") @Cached("self.frame.getFrameDescriptor()") FrameDescriptor desc,
                         @Exclusive @Cached(value = "getSlots(desc)", dimensions = 1) FrameSlot[] slots) {
             HashingStorage result = other;
@@ -249,9 +249,9 @@ static HashingStorage cached(LocalsStorage self, HashingStorage other,
             return result;
         }
 
-        @Specialization(replaces = "cached", limit = "1")
+        @Specialization(replaces = "cached")
         static HashingStorage generic(LocalsStorage self, HashingStorage other,
-                        @CachedLibrary("other") HashingStorageLibrary lib) {
+                        @CachedLibrary(limit = "2") HashingStorageLibrary lib) {
             bailout();
             HashingStorage result = other;
             FrameSlot[] slots = getSlots(self.frame.getFrameDescriptor());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/FrozenSetBuiltins.java

@@ -150,7 +150,7 @@ PNotImplemented doGeneric(Object self, Object other) {
         }
     }
 
-    protected static HashingStorage getStringAsHashingStorage(VirtualFrame frame, String str, HashingStorageLibrary lib, ConditionProfile hasFrame) {
+    private static HashingStorage getStringAsHashingStorage(VirtualFrame frame, String str, HashingStorageLibrary lib, ConditionProfile hasFrame) {
         HashingStorage storage = EconomicMapStorage.create(PString.length(str));
         for (int i = 0; i < PString.length(str); i++) {
             String key = PString.valueOf(PString.charAt(str, i));
@@ -444,13 +444,13 @@ HashingStorage doHashingCollection(@SuppressWarnings("unused") VirtualFrame fram
             return lib.union(selfStorage, other.getDictStorage());
         }
 
-        @Specialization(limit = "1")
+        @Specialization
         HashingStorage doIterable(VirtualFrame frame, HashingStorage dictStorage, Object iterable,
                         @Cached("create()") GetIteratorNode getIteratorNode,
                         @Cached("create()") GetNextNode next,
                         @Cached("create()") IsBuiltinClassProfile errorProfile,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
-                        @CachedLibrary("dictStorage") HashingStorageLibrary lib) {
+                        @CachedLibrary(limit = "2") HashingStorageLibrary lib) {
             HashingStorage curStorage = dictStorage;
             Object iterator = getIteratorNode.executeWith(frame, iterable);
             while (true) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -730,7 +730,7 @@ public abstract static class MakeTransNode extends PythonTernaryBuiltinNode {
         PDict doString(@SuppressWarnings("unused") VirtualFrame frame, Object from, Object to, @SuppressWarnings("unused") Object z,
                         @Cached CastToJavaStringCheckedNode castFromNode,
                         @Cached CastToJavaStringCheckedNode castToNode,
-                        @CachedLibrary(limit = "1") HashingStorageLibrary lib) {
+                        @CachedLibrary(limit = "2") HashingStorageLibrary lib) {
 
             String toStr = castToNode.cast(to, "argument 2 must be str, not %p", to);
             String fromStr = castFromNode.cast(from, "first maketrans argument must be a string if there is a second argument");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/DictConcatNode.java

@@ -66,7 +66,7 @@ protected DictConcatNode(ExpressionNode... mappablesNodes) {
     @Specialization
     public Object concat(VirtualFrame frame,
                     @Cached("createBinaryProfile()") ConditionProfile hasFrame,
-                    @CachedLibrary(limit = "1") HashingStorageLibrary firstlib,
+                    @CachedLibrary(limit = "2") HashingStorageLibrary firstlib,
                     @CachedLibrary(limit = "1") HashingStorageLibrary otherlib) {
         PDict first = null;
         PDict other;