make set modifiable

Author: tomasstupka

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

@@ -33,7 +33,7 @@
 
 public abstract class PBaseSet extends PHashingCollection {
 
-    protected final HashingStorage set;
+    private HashingStorage set;
 
     public PBaseSet(Object clazz, DynamicObject storage) {
         super(clazz, storage);
@@ -58,4 +58,9 @@ public int size() {
     public HashingStorage getDictStorage() {
         return set;
     }
+
+    @Override
+    public void setDictStorage(HashingStorage storage) {
+        set = storage;
+    }
 }

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

@@ -26,7 +26,6 @@
 package com.oracle.graal.python.builtins.objects.set;
 
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.object.DynamicObject;
 
 public final class PSet extends PBaseSet {
@@ -38,13 +37,4 @@ public PSet(Object clazz, DynamicObject storage) {
     public PSet(Object clazz, DynamicObject storage, HashingStorage store) {
         super(clazz, storage, store);
     }
-
-    @Override
-    public void setDictStorage(HashingStorage newStorage) {
-        // ignore if storage stays unchanged
-        if (newStorage != getDictStorage()) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new RuntimeException("set has fixed storage");
-        }
-    }
 }

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

@@ -38,6 +38,8 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
+import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes.GetDictStorageNode;
+import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes.SetDictStorageNode;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -74,9 +76,13 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @GenerateNodeFactory
     public abstract static class ClearNode extends PythonUnaryBuiltinNode {
 
-        @Specialization
-        public Object clear(PSet self, @CachedLibrary(limit = "1") HashingStorageLibrary lib) {
-            lib.clear(self.getDictStorage());
+        @Specialization(limit = "1")
+        public Object clear(PSet self,
+                        @Cached GetDictStorageNode getStorage,
+                        @Cached SetDictStorageNode setStorage,
+                        @CachedLibrary("getStorage.execute(self)") HashingStorageLibrary lib) {
+            HashingStorage newStorage = lib.clear(getStorage.execute(self));
+            setStorage.execute(self, newStorage);
             return PNone.NONE;
         }
     }