[GR-38885] Add missing inplace set operations

PullRequest: graalpython/2279

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/test_set.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -519,3 +519,12 @@ def __repr__(self):
     assert v2 in l
     assert v1 != v2
     assert len(s) == 0
+
+def test_inplace_ops_mutate():
+    for op in ('-', '&', '|', '^'):
+        s1 = {1, 2}
+        s2 = {1, 3}
+        v = {'a': s1, 'b': s2}
+        exec(f"a {op}= b", v)
+        assert v['a'] is s1
+        assert s1 == eval(f"a {op} b", {'a': {1, 2}, 'b': {1, 3}})

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

@@ -27,7 +27,11 @@
 
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__AND__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__HASH__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__IAND__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__IOR__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__ISUB__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__IXOR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__OR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RAND__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ROR__;
@@ -183,6 +187,24 @@ Object doOr(Object self, Object other) {
         }
     }
 
+    @Builtin(name = __IOR__, minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class IOrNode extends PythonBinaryBuiltinNode {
+        @Specialization(guards = "canDoSetBinOp(other)", limit = "3")
+        Object doSet(VirtualFrame frame, PSet self, Object other,
+                        @Cached GetHashingStorageNode getHashingStorageNode,
+                        @CachedLibrary("self.getDictStorage()") HashingStorageLibrary lib) {
+            self.setDictStorage(lib.addAllToOther(self.getDictStorage(), getHashingStorageNode.execute(frame, other)));
+            return self;
+        }
+
+        @SuppressWarnings("unused")
+        @Fallback
+        Object doOr(Object self, Object other) {
+            return PNotImplemented.NOT_IMPLEMENTED;
+        }
+    }
+
     @Builtin(name = "union", minNumOfPositionalArgs = 1, takesVarArgs = true)
     @GenerateNodeFactory
     abstract static class UnionNode extends PythonBuiltinNode {
@@ -342,7 +364,7 @@ static PNone doSet(VirtualFrame frame, PSet self, Object other,
     @ImportStatic(PGuards.class)
     public abstract static class AndNode extends PythonBinaryBuiltinNode {
 
-        @Specialization(guards = "canDoSetBinOp(right)", limit = "1")
+        @Specialization(guards = "canDoSetBinOp(right)", limit = "3")
         PBaseSet doPBaseSet(VirtualFrame frame, PSet left, Object right,
                         @Cached ConditionProfile hasFrame,
                         @Cached GetHashingStorageNode getHashingStorageNode,
@@ -358,6 +380,27 @@ Object doAnd(Object self, Object other) {
         }
     }
 
+    @Builtin(name = __IAND__, minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class IAndNode extends PythonBinaryBuiltinNode {
+
+        @Specialization(guards = "canDoSetBinOp(right)", limit = "3")
+        PBaseSet doPBaseSet(VirtualFrame frame, PSet left, Object right,
+                        @Cached ConditionProfile hasFrame,
+                        @Cached GetHashingStorageNode getHashingStorageNode,
+                        @CachedLibrary("left.getDictStorage()") HashingStorageLibrary leftLib) {
+            HashingStorage storage = leftLib.intersectWithFrame(left.getDictStorage(), getHashingStorageNode.execute(frame, right), hasFrame, frame);
+            left.setDictStorage(storage);
+            return left;
+        }
+
+        @SuppressWarnings("unused")
+        @Fallback
+        Object doAnd(Object self, Object other) {
+            return PNotImplemented.NOT_IMPLEMENTED;
+        }
+    }
+
     @Builtin(name = "intersection", minNumOfPositionalArgs = 1, takesVarArgs = true)
     @GenerateNodeFactory
     public abstract static class IntersectNode extends PythonBuiltinNode {
@@ -472,6 +515,25 @@ Object doOr(Object self, Object other) {
         }
     }
 
+    @Builtin(name = __IXOR__, minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class IXorNode extends PythonBinaryBuiltinNode {
+
+        @Specialization(guards = "canDoSetBinOp(other)", limit = "3")
+        Object doSet(VirtualFrame frame, PSet self, Object other,
+                        @Cached GetHashingStorageNode getHashingStorageNode,
+                        @CachedLibrary("self.getDictStorage()") HashingStorageLibrary lib) {
+            self.setDictStorage(lib.xor(self.getDictStorage(), getHashingStorageNode.execute(frame, other)));
+            return self;
+        }
+
+        @SuppressWarnings("unused")
+        @Fallback
+        Object doOr(Object self, Object other) {
+            return PNotImplemented.NOT_IMPLEMENTED;
+        }
+    }
+
     @Builtin(name = "symmetric_difference", minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class SymmetricDifferenceNode extends PythonBuiltinNode {
@@ -535,7 +597,7 @@ static PNone doSet(VirtualFrame frame, PSet self, Object other,
     @GenerateNodeFactory
     @ImportStatic(PGuards.class)
     abstract static class SubNode extends PythonBinaryBuiltinNode {
-        @Specialization(guards = "canDoSetBinOp(right)", limit = "1")
+        @Specialization(guards = "canDoSetBinOp(right)", limit = "3")
         PBaseSet doPBaseSet(VirtualFrame frame, PSet left, Object right,
                         @Cached ConditionProfile hasFrame,
                         @Cached GetHashingStorageNode getHashingStorageNode,
@@ -551,6 +613,26 @@ Object doSub(Object self, Object other) {
         }
     }
 
+    @Builtin(name = __ISUB__, minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    abstract static class ISubNode extends PythonBinaryBuiltinNode {
+        @Specialization(guards = "canDoSetBinOp(right)", limit = "3")
+        PBaseSet doPBaseSet(VirtualFrame frame, PSet left, Object right,
+                        @Cached ConditionProfile hasFrame,
+                        @Cached GetHashingStorageNode getHashingStorageNode,
+                        @CachedLibrary("left.getDictStorage()") HashingStorageLibrary lib) {
+            HashingStorage storage = lib.diffWithFrame(left.getDictStorage(), getHashingStorageNode.execute(frame, right), hasFrame, frame);
+            left.setDictStorage(storage);
+            return left;
+        }
+
+        @SuppressWarnings("unused")
+        @Fallback
+        Object doSub(Object self, Object other) {
+            return PNotImplemented.NOT_IMPLEMENTED;
+        }
+    }
+
     @Builtin(name = "difference", minNumOfPositionalArgs = 1, takesVarArgs = true)
     @GenerateNodeFactory
     public abstract static class DifferenceNode extends PythonBuiltinNode {