[GR-21141] dict with modifying __eq__ fix

PullRequest: graalpython/850

Author: qunaibit

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_dict.txt

@@ -13,6 +13,7 @@
 *DictTest.test_dictview_set_operations_on_keys
 *DictTest.test_empty_presized_dict_in_freelist
 *DictTest.test_eq
+*DictTest.test_equal_operator_modifying_operand
 *DictTest.test_errors_in_view_containment_check
 *DictTest.test_fromkeys_operator_modifying_dict_operand
 *DictTest.test_fromkeys_operator_modifying_set_operand

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

@@ -249,7 +249,7 @@ public int compareKeys(HashingStorage self, HashingStorage other) {
      */
     public int compareEntriesWithState(HashingStorage self, HashingStorage other, ThreadState state) {
         if (state == null) {
-            throw new AbstractMethodError("HashingStorageLibrary.compareKeysWithState");
+            throw new AbstractMethodError("HashingStorageLibrary.compareEntriesWithState");
         }
         return compareEntries(self, other);
     }
@@ -264,7 +264,19 @@ public int compareEntries(HashingStorage self, HashingStorage other) {
     /**
      * @return the intersection of the two storages, keeping the values from {@code other}.
      */
-    public abstract HashingStorage intersect(HashingStorage self, HashingStorage other);
+    public HashingStorage intersectWithState(HashingStorage self, HashingStorage other, ThreadState state) {
+        if (state == null) {
+            throw new AbstractMethodError("HashingStorageLibrary.intersectWithState");
+        }
+        return intersect(self, other);
+    }
+
+    /**
+     * @see #intersectWithState(HashingStorage, HashingStorage, ThreadState)
+     */
+    public HashingStorage intersect(HashingStorage self, HashingStorage other) {
+        return intersectWithState(self, other, null);
+    }
 
     /**
      * @return the xor of the two storages.
@@ -280,7 +292,19 @@ public int compareEntries(HashingStorage self, HashingStorage other) {
     /**
      * @return the a storage with all keys of {@code self} that are not also in {@code other}
      */
-    public abstract HashingStorage diff(HashingStorage self, HashingStorage other);
+    public HashingStorage diffWithState(HashingStorage self, HashingStorage other, ThreadState state) {
+        if (state == null) {
+            throw new AbstractMethodError("HashingStorageLibrary.diffWithState");
+        }
+        return diff(self, other);
+    }
+
+    /**
+     * @see #diffWithState(HashingStorage, HashingStorage, ThreadState)
+     */
+    public HashingStorage diff(HashingStorage self, HashingStorage other) {
+        return diffWithState(self, other, null);
+    }
 
     /**
      * This method can be used to iterate over the keys of a store. Due to the nature of Java