Remove exported message PInt#hash, implement EconomicMapStorage#xor

Author: steve-s

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

@@ -587,6 +587,15 @@ static HashingStorage diffGeneric(EconomicMapStorage self, HashingStorage other,
         }
     }
 
+    @ExportMessage
+    public HashingStorage xor(HashingStorage other,
+                    @CachedLibrary("this") HashingStorageLibrary selfLib,
+                    @CachedLibrary(limit = "2") HashingStorageLibrary otherLib) {
+        HashingStorage a = selfLib.diff(this, other);
+        HashingStorage b = otherLib.diff(other, this);
+        return selfLib.union(a, b);
+    }
+
     @Override
     @ExportMessage
     public HashingStorageIterable<Object> keys() {

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

@@ -560,7 +560,7 @@ public HashingStorage union(HashingStorage other,
     }
 
     @ExportMessage
-    public HashingStorage diff(HashingStorage other,
+    public HashingStorage diffWithState(HashingStorage other, @SuppressWarnings("unused") ThreadState state,
                     @CachedLibrary("this") HashingStorageLibrary libSelf,
                     @Exclusive @Cached DiffInjectNode diffNode) {
         HashingStorage newStore = EconomicMapStorage.create();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java

@@ -55,6 +55,7 @@
 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.library.ExportMessage.Ignore;
 import com.oracle.truffle.api.object.Shape;
 
 @ExportLibrary(InteropLibrary.class)
@@ -563,16 +564,12 @@ public BigInteger add(PInt other) {
         return add(other.value);
     }
 
-    @ExportMessage
+    // We cannot export it as a message, because it can be overridden!
+    @Ignore
     public long hash() {
         return hashBigInteger(value);
     }
 
-    @ExportMessage
-    public long hashWithState(@SuppressWarnings("unused") ThreadState state) {
-        return hash();
-    }
-
     @TruffleBoundary
     public static long hashBigInteger(BigInteger i) {
         long h = i.remainder(BigInteger.valueOf(SysModuleBuiltins.HASH_MODULUS)).longValue();