HashinStorage: pass the gil to calling the length message

Author: cosminbasca

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

@@ -804,7 +804,8 @@ public DictKey next() {
     public String toString() {
         CompilerAsserts.neverPartOfCompilation();
         StringBuilder builder = new StringBuilder();
-        builder.append("map(size=").append(length()).append(", {");
+        GilNode gil = GilNode.getUncached();
+        builder.append("map(size=").append(length(gil)).append(", {");
         String sep = "";
         MapCursor<DictKey, Object> cursor = map.getEntries();
         while (advance(cursor)) {

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

@@ -77,16 +77,9 @@ public PKeyword[] getStore() {
         return keywords;
     }
 
-    @Override
     @ExportMessage
     public int length() {
-        GilNode gil = GilNode.getUncached();
-        boolean mustRelease = gil.acquire();
-        try {
-            return keywords.length;
-        } finally {
-            gil.release(mustRelease);
-        }
+        return keywords.length;
     }
 
     @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)

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

@@ -216,7 +216,7 @@ HashingStorage setItemWithState(Object key, Object value, ThreadState state,
                     @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState, @Exclusive @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
-            HashingStorage result = generalize(lib);
+            HashingStorage result = generalize(lib, gil);
             if (gotState.profile(state != null)) {
                 return lib.setItemWithState(result, key, value, state);
             } else {
@@ -233,7 +233,7 @@ HashingStorage delItemWithState(Object key, ThreadState state,
                     @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState, @Exclusive @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
-            HashingStorage result = generalize(lib);
+            HashingStorage result = generalize(lib, gil);
             if (gotState.profile(state != null)) {
                 return lib.delItemWithState(result, key, state);
             } else {
@@ -244,8 +244,8 @@ HashingStorage delItemWithState(Object key, ThreadState state,
         }
     }
 
-    private HashingStorage generalize(HashingStorageLibrary lib) {
-        HashingStorage result = EconomicMapStorage.create(length());
+    private HashingStorage generalize(HashingStorageLibrary lib, GilNode gil) {
+        HashingStorage result = EconomicMapStorage.create(length(gil));
         result = lib.addAllToOther(this, result);
         return result;
     }