clean up after rebase

Author: qunaibit

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

@@ -2983,8 +2983,7 @@ Object call(VirtualFrame frame, LazyPythonClass cls, int argcount, int kwonlyarg
                         @CachedLibrary("codestring") PythonObjectLibrary codestringBufferLib,
                         @CachedLibrary("lnotab") PythonObjectLibrary lnotabBufferLib,
                         @Cached CodeNodes.CreateCodeNode createCodeNode,
-                        @Cached GetObjectArrayNode getObjectArrayNode,
-                        @CachedLibrary(limit = "1") HashingStorageLibrary lib) throws UnsupportedMessageException {
+                        @Cached GetObjectArrayNode getObjectArrayNode) throws UnsupportedMessageException {
             byte[] codeBytes = codestringBufferLib.getBufferBytes(codestring);
             byte[] lnotabBytes = lnotabBufferLib.getBufferBytes(lnotab);
 
@@ -2999,7 +2998,7 @@ Object call(VirtualFrame frame, LazyPythonClass cls, int argcount, int kwonlyarg
                             codeBytes, constantsArr, namesArr,
                             varnamesArr, freevarsArr, cellcarsArr,
                             getStringArg(filename), getStringArg(name), firstlineno,
-                            lnotabBytes, lib);
+                            lnotabBytes);
         }
 
         @Specialization(guards = {"codestringBufferLib.isBuffer(codestring)", "lnotabBufferLib.isBuffer(lnotab)"}, limit = "2", rewriteOn = UnsupportedMessageException.class)

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

@@ -655,14 +655,13 @@ private PCode readCode(int depth, HashingStorageLibrary lib) {
 
             return ensureCreateCodeNode().execute(null, PythonBuiltinClassType.PCode, argcount, kwonlyargcount,
                             nlocals, stacksize, flags, codestring, constants, names,
-                            varnames, freevars, cellvars, filename, name, firstlineno, lnotab, lib);
+                            varnames, freevars, cellvars, filename, name, firstlineno, lnotab);
         }
 
-        private PDict readDict(int depth) {
+        private PDict readDict(int depth, HashingStorageLibrary lib) {
             int len = readInt();
             HashingStorage store = PDict.createNewStorage(false, len);
             PDict dict = factory().createDict(store);
-            HashingStorageLibrary lib = HashingStorageLibrary.getUncached();
             for (int i = 0; i < len; i++) {
                 Object key = readObject(depth + 1, lib);
                 if (key == null) {
@@ -780,7 +779,7 @@ private Object readObject(int depth, HashingStorageLibrary lib) {
                     return factory().createTuple(items);
                 }
                 case TYPE_DICT:
-                    return readDict(depth);
+                    return readDict(depth, lib);
                 case TYPE_LIST:
                     return readList(depth, lib);
                 case TYPE_SET:

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java

@@ -43,8 +43,6 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.cell.PCell;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
@@ -98,13 +96,13 @@ public PCode execute(VirtualFrame frame, LazyPythonClass cls, int argcount, int
                         byte[] codestring, Object[] constants, Object[] names,
                         Object[] varnames, Object[] freevars, Object[] cellvars,
                         String filename, String name, int firstlineno,
-                        byte[] lnotab, HashingStorageLibrary lib) {
+                        byte[] lnotab) {
 
             PythonContext context = getContextRef().get();
             Object state = IndirectCallContext.enter(frame, context, this);
             try {
                 return createCode(cls, argcount, kwonlyargcount, nlocals, stacksize, flags, codestring,
-                                constants, names, varnames, freevars, cellvars, filename, name, firstlineno, lnotab, lib);
+                                constants, names, varnames, freevars, cellvars, filename, name, firstlineno, lnotab);
             } finally {
                 IndirectCallContext.exit(frame, context, state);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java

@@ -33,7 +33,6 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.code.CodeNodes;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.frame.PFrame.Reference;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
@@ -54,7 +53,6 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
@@ -135,16 +133,15 @@ Object get(@SuppressWarnings("unused") PFrame self) {
     public abstract static class GetCodeNode extends PythonBuiltinNode {
         @Specialization
         Object get(VirtualFrame frame, PFrame self,
-                        @Cached("create()") CodeNodes.CreateCodeNode createCodeNode,
-                        @CachedLibrary(limit = "1") HashingStorageLibrary lib) {
+                        @Cached("create()") CodeNodes.CreateCodeNode createCodeNode) {
             RootCallTarget ct = self.getTarget();
             if (ct != null) {
                 return factory().createCode(ct);
             }
             // TODO: frames: this just shouldn't happen anymore
             assert false : "should not be reached";
             return createCodeNode.execute(frame, PythonBuiltinClassType.PCode, -1, -1, -1, -1, -1, new byte[0], new Object[0], new Object[0], new Object[0], new Object[0], new Object[0], "<internal>",
-                            "<internal>", -1, new byte[0], lib);
+                            "<internal>", -1, new byte[0]);
         }
     }
 

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

@@ -251,14 +251,14 @@ PBaseSet doPBaseSet(VirtualFrame frame, PFrozenSet left, String right,
         }
 
         @Specialization(limit = "1")
-        PBaseSet doPBaseSet(VirtualFrame frame, PSet left, PBaseSet right,
+        PBaseSet doPBaseSet(@SuppressWarnings("unused") VirtualFrame frame, PSet left, PBaseSet right,
                         @CachedLibrary("left.getDictStorage()") HashingStorageLibrary leftLib) {
             HashingStorage intersectedStorage = union(leftLib, left.getDictStorage(), right.getDictStorage());
             return factory().createSet(intersectedStorage);
         }
 
         @Specialization(limit = "1")
-        PBaseSet doPBaseSet(VirtualFrame frame, PFrozenSet left, PBaseSet right,
+        PBaseSet doPBaseSet(@SuppressWarnings("unused") VirtualFrame frame, PFrozenSet left, PBaseSet right,
                         @CachedLibrary("left.getDictStorage()") HashingStorageLibrary leftLib) {
             HashingStorage intersectedStorage = union(leftLib, left.getDictStorage(), right.getDictStorage());
             return factory().createFrozenSet(intersectedStorage);
@@ -293,14 +293,14 @@ Object doOr(Object self, Object other) {
     abstract static class SubNode extends PythonBinaryBuiltinNode {
 
         @Specialization(limit = "1")
-        PBaseSet doPBaseSet(VirtualFrame frame, PSet left, PBaseSet right,
+        PBaseSet doPBaseSet(@SuppressWarnings("unused") VirtualFrame frame, PSet left, PBaseSet right,
                         @CachedLibrary("left.getDictStorage()") HashingStorageLibrary lib) {
             HashingStorage storage = lib.diff(left.getDictStorage(), right.getDictStorage());
             return factory().createSet(storage);
         }
 
         @Specialization(limit = "1")
-        PBaseSet doPBaseSet(VirtualFrame frame, PFrozenSet left, PBaseSet right,
+        PBaseSet doPBaseSet(@SuppressWarnings("unused") VirtualFrame frame, PFrozenSet left, PBaseSet right,
                         @CachedLibrary("left.getDictStorage()") HashingStorageLibrary lib) {
             HashingStorage storage = lib.diff(left.getDictStorage(), right.getDictStorage());
             return factory().createSet(storage);
@@ -384,7 +384,7 @@ abstract static class BinaryUnionNode extends PNodeWithContext {
         public abstract HashingStorage execute(VirtualFrame frame, HashingStorage left, Object right);
 
         @Specialization(limit = "1")
-        HashingStorage doHashingCollection(VirtualFrame frame, EconomicMapStorage selfStorage, PHashingCollection other,
+        HashingStorage doHashingCollection(@SuppressWarnings("unused") VirtualFrame frame, EconomicMapStorage selfStorage, PHashingCollection other,
                         @CachedLibrary("selfStorage") HashingStorageLibrary lib) {
             return lib.union(selfStorage, other.getDictStorage());
         }