remove unnecessary lengthWithState from HashingStorageLibrary

Author: lukasstadler

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

@@ -59,7 +59,6 @@
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
-import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
@@ -400,11 +399,10 @@ void handlePList(VirtualFrame frame, PList l, int version, DataOutputStream buff
 
         @Specialization(limit = "1")
         void handlePDict(VirtualFrame frame, PDict d, int version, DataOutputStream buffer,
-                        @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                         @CachedLibrary("d.getDictStorage()") HashingStorageLibrary lib) {
             writeByte(TYPE_DICT, version, buffer);
             HashingStorage dictStorage = d.getDictStorage();
-            int len = lib.lengthWithFrame(dictStorage, hasFrame, frame);
+            int len = lib.length(dictStorage);
             writeInt(len, version, buffer);
             for (DictEntry entry : lib.entries(dictStorage)) {
                 getRecursiveNode().execute(frame, entry.key, version, buffer);
@@ -413,7 +411,7 @@ void handlePDict(VirtualFrame frame, PDict d, int version, DataOutputStream buff
         }
 
         @Specialization
-        void handlePCode(@SuppressWarnings("unused") VirtualFrame frame, PCode c, int version, DataOutputStream buffer) {
+        void handlePCode(PCode c, int version, DataOutputStream buffer) {
             writeByte(TYPE_CODE, version, buffer);
             writeString(getSourceCode(c), version, buffer);
             writeString(c.getFilename(), version, buffer);
@@ -431,16 +429,10 @@ private static String getSourceCode(PCode c) {
 
         @Specialization(limit = "1")
         void handlePSet(VirtualFrame frame, PSet s, int version, DataOutputStream buffer,
-                        @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                         @CachedLibrary("s.getDictStorage()") HashingStorageLibrary lib) {
             writeByte(TYPE_SET, version, buffer);
-            int len;
             HashingStorage dictStorage = s.getDictStorage();
-            if (hasFrame.profile(frame != null)) {
-                len = lib.lengthWithState(dictStorage, PArguments.getThreadState(frame));
-            } else {
-                len = lib.length(dictStorage);
-            }
+            int len = lib.length(dictStorage);
             writeInt(len, version, buffer);
             for (DictEntry entry : lib.entries(dictStorage)) {
                 getRecursiveNode().execute(frame, entry.key, version, buffer);
@@ -449,16 +441,10 @@ void handlePSet(VirtualFrame frame, PSet s, int version, DataOutputStream buffer
 
         @Specialization(limit = "1")
         void handlePForzenSet(VirtualFrame frame, PFrozenSet s, int version, DataOutputStream buffer,
-                        @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                         @CachedLibrary("s.getDictStorage()") HashingStorageLibrary lib) {
             writeByte(TYPE_FROZENSET, version, buffer);
-            int len;
             HashingStorage dictStorage = s.getDictStorage();
-            if (hasFrame.profile(frame != null)) {
-                len = lib.lengthWithState(dictStorage, PArguments.getThreadState(frame));
-            } else {
-                len = lib.length(dictStorage);
-            }
+            int len = lib.length(dictStorage);
             writeInt(len, version, buffer);
             for (DictEntry entry : lib.entries(dictStorage)) {
                 getRecursiveNode().execute(frame, entry.key, version, buffer);

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

@@ -326,13 +326,7 @@ static HashingStorage generalize(DynamicObjectStorage self, Object key, Object v
                 // To avoid calling the costly length message we use SIZE_THRESHOLD
                 newStore = new HashMapStorage(SIZE_THRESHOLD);
             } else {
-                int len;
-                if (gotState.profile(state != null)) {
-                    len = lib.lengthWithState(self, state);
-                } else {
-                    len = lib.length(self);
-                }
-                newStore = EconomicMapStorage.create(len);
+                newStore = EconomicMapStorage.create(lib.length(self));
             }
 
             newStore = lib.addAllToOther(self, newStore);

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

@@ -445,7 +445,7 @@ static boolean equalGeneric(EconomicMapStorage self, HashingStorage other, Threa
                         @CachedLibrary(limit = "2") HashingStorageLibrary otherlib,
                         @CachedLibrary(limit = "2") PythonObjectLibrary compareLib1,
                         @CachedLibrary(limit = "2") PythonObjectLibrary compareLib2) {
-            if (self.map.size() != otherlib.lengthWithState(other, state)) {
+            if (self.map.size() != otherlib.length(other)) {
                 return false;
             }
             MapCursor<DictKey, Object> cursor = self.map.getEntries();

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

@@ -330,19 +330,12 @@ public HashingStorage addAllToOther(HashingStorage other,
 
     @ExportMessage
     public boolean equalsWithState(HashingStorage other, ThreadState state,
-                    @CachedLibrary(limit = "2") HashingStorageLibrary lib,
-                    @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState) {
+                    @CachedLibrary(limit = "2") HashingStorageLibrary lib) {
         if (this == other) {
             return true;
         }
-        if (gotState.profile(state != null)) {
-            if (lib.lengthWithState(this, state) == lib.lengthWithState(other, state)) {
-                return lib.compareEntriesWithState(this, other, state) == 0;
-            }
-        } else {
-            if (lib.length(this) == lib.length(other)) {
-                return lib.compareEntries(this, other) == 0;
-            }
+        if (lib.length(this) == lib.length(other)) {
+            return lib.compareEntries(this, other) == 0;
         }
         return false;
 
@@ -417,19 +410,12 @@ HashingStorage[] doit(HashingStorage[] accumulator, Object key,
     @ExportMessage
     public int compareEntriesWithState(HashingStorage other, ThreadState state,
                     @CachedLibrary(limit = "2") HashingStorageLibrary lib,
-                    @Cached TestKeyValueEqual testNode,
-                    @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState) {
+                    @Cached TestKeyValueEqual testNode) {
         if (this == other) {
             return 0;
         }
-        int otherLen, selfLen;
-        if (gotState.profile(state != null)) {
-            otherLen = lib.lengthWithState(other, state);
-            selfLen = lib.lengthWithState(this, state);
-        } else {
-            otherLen = lib.length(other);
-            selfLen = lib.length(this);
-        }
+        int otherLen = lib.length(other);
+        int selfLen = lib.length(this);
         if (selfLen > otherLen) {
             return 1;
         }
@@ -506,8 +492,8 @@ public boolean isDisjointWithState(HashingStorage other, ThreadState state,
                     @Exclusive @Cached("createBinaryProfile()") ConditionProfile selfIsShorterProfile,
                     @Cached IsDisjointForEachNode isDisjointForEachNode) {
         try {
-            int selfLen = libSelf.lengthWithState(this, state);
-            int otherLen = libOther.lengthWithState(other, state);
+            int selfLen = libSelf.length(this);
+            int otherLen = libOther.length(other);
             if (selfIsShorterProfile.profile(selfLen < otherLen)) {
                 libSelf.forEach(this, isDisjointForEachNode, new IsDisjoinForEachAcc(other, libOther, state));
             } else {

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

@@ -76,34 +76,11 @@
  */
 @GenerateLibrary
 public abstract class HashingStorageLibrary extends Library {
-    /**
-     * @return the length of {@code self}
-     */
-    public int lengthWithState(HashingStorage self, ThreadState state) {
-        if (state == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new AbstractMethodError("HashingStorageLibrary.lengthWithState");
-        }
-        return length(self);
-    }
 
     /**
-     * @see #lengthWithState(HashingStorage, ThreadState)
-     */
-    public int length(HashingStorage self) {
-        return lengthWithState(self, null);
-    }
-
-    /**
-     * @see #lengthWithState(HashingStorage, ThreadState)
+     * @return the length of {@code self}
      */
-    public final int lengthWithFrame(HashingStorage self, ConditionProfile hasFrameProfile, VirtualFrame frame) {
-        if (hasFrameProfile.profile(frame != null)) {
-            return lengthWithState(self, PArguments.getThreadState(frame));
-        } else {
-            return length(self);
-        }
-    }
+    public abstract int length(HashingStorage self);
 
     /**
      * Implementers <i>must</i> call {@code __hash__} on the key if that could be visible, to comply
@@ -294,7 +271,7 @@ public final <T> T forEach(HashingStorage self, ForEachNode<T> node, T arg) {
 
     /**
      * Determines if the storage has elements with a potential side effect on access.
-     * 
+     *
      * @return {@code true} if the storage has elements with a potential side effect, otherwise
      *         {@code false}.
      */

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictValuesBuiltins.java

@@ -66,10 +66,9 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @GenerateNodeFactory
     public abstract static class LenNode extends PythonBuiltinNode {
         @Specialization(limit = "1")
-        static Object run(VirtualFrame frame, PDictView self,
-                        @Cached ConditionProfile hasFrameProfile,
+        static Object run(PDictView self,
                         @CachedLibrary("self.getWrappedDict().getDictStorage()") HashingStorageLibrary lib) {
-            return lib.lengthWithFrame(self.getWrappedDict().getDictStorage(), hasFrameProfile, frame);
+            return lib.length(self.getWrappedDict().getDictStorage());
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/PDict.java

@@ -115,15 +115,10 @@ static boolean hasBuiltinLen(PDict self, LookupInheritedAttributeNode.Dynamic lo
         }, limit = "1")
         static int doBuiltin(PDict self, ThreadState state,
                         @CachedLibrary("self.getDictStorage()") HashingStorageLibrary storageLib,
-                        @Shared("gotState") @Cached ConditionProfile gotState,
                         @SuppressWarnings("unused") @Cached IsBuiltinClassProfile profile,
                         @SuppressWarnings("unused") @Cached LookupInheritedAttributeNode.Dynamic lookupSelf,
                         @SuppressWarnings("unused") @Cached LookupAttributeInMRONode.Dynamic lookupDict) {
-            if (gotState.profile(state == null)) {
-                return storageLib.length(self.storage);
-            } else {
-                return storageLib.lengthWithState(self.storage, state);
-            }
+            return storageLib.length(self.storage);
         }
 
         @Specialization(replaces = "doBuiltin")

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

@@ -266,11 +266,9 @@ static boolean isSuperSetGeneric(VirtualFrame frame, PBaseSet self, Object other
     protected abstract static class BaseIsDisjointNode extends PythonBinaryBuiltinNode {
 
         @Specialization(guards = "self == other", limit = "2")
-        static boolean isDisjointSameObject(VirtualFrame frame, PBaseSet self, @SuppressWarnings("unused") PBaseSet other,
-                        @Cached("createBinaryProfile()") ConditionProfile hasFrame,
+        static boolean isDisjointSameObject(PBaseSet self, @SuppressWarnings("unused") PBaseSet other,
                         @CachedLibrary("self.getDictStorage()") HashingStorageLibrary lib) {
-            ThreadState state = PArguments.getThreadStateOrNull(frame, hasFrame);
-            return lib.lengthWithState(self.getDictStorage(), state) == 0;
+            return lib.length(self.getDictStorage()) == 0;
         }
 
         @Specialization(guards = {"self != other", "cannotBeOverridden(pLib.getLazyPythonClass(other))"}, limit = "2")
@@ -360,8 +358,8 @@ static boolean isLessThan(VirtualFrame frame, PBaseSet self, PBaseSet other,
                         @CachedLibrary(limit = "2") HashingStorageLibrary hlib,
                         @Cached ConditionProfile hasFrameProfile,
                         @Cached ConditionProfile sizeProfile) {
-            final int len1 = hlib.lengthWithFrame(self.getDictStorage(), hasFrameProfile, frame);
-            final int len2 = hlib.lengthWithFrame(other.getDictStorage(), hasFrameProfile, frame);
+            final int len1 = hlib.length(self.getDictStorage());
+            final int len2 = hlib.length(other.getDictStorage());
             if (sizeProfile.profile(len1 >= len2)) {
                 return false;
             }
@@ -384,8 +382,8 @@ static boolean isGreaterThan(VirtualFrame frame, PBaseSet self, PBaseSet other,
                         @CachedLibrary(limit = "2") HashingStorageLibrary hlib,
                         @Cached ConditionProfile hasFrameProfile,
                         @Cached ConditionProfile sizeProfile) {
-            final int len1 = hlib.lengthWithFrame(self.getDictStorage(), hasFrameProfile, frame);
-            final int len2 = hlib.lengthWithFrame(other.getDictStorage(), hasFrameProfile, frame);
+            final int len1 = hlib.length(self.getDictStorage());
+            final int len2 = hlib.length(other.getDictStorage());
             if (sizeProfile.profile(len1 <= len2)) {
                 return false;
             }

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

@@ -31,13 +31,10 @@
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.function.PArguments.ThreadState;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
-import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.object.Shape;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @ExportLibrary(PythonObjectLibrary.class)
 public abstract class PBaseSet extends PHashingCollection {
@@ -52,12 +49,7 @@ public PBaseSet(Object clazz, Shape instanceShape, HashingStorage set) {
 
     @ExportMessage(limit = "1")
     int lengthWithState(ThreadState state,
-                    @Exclusive @Cached ConditionProfile gotState,
                     @CachedLibrary("this.getDictStorage()") HashingStorageLibrary lib) {
-        if (gotState.profile(state != null)) {
-            return lib.lengthWithState(storage, state);
-        } else {
-            return lib.length(storage);
-        }
+        return lib.length(storage);
     }
 }