implement isIdentical in PythonAbstractNativeObject

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonAbstractNativeObject.java

@@ -91,6 +91,7 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.ValueProfile;
+import com.oracle.truffle.api.utilities.TriState;
 import com.oracle.truffle.llvm.spi.ReferenceLibrary;
 
 @ExportLibrary(PythonObjectLibrary.class)
@@ -228,9 +229,8 @@ public static Assumption getSingleContextAssumption() {
             return PythonLanguage.getCurrent().singleContextAssumption;
         }
 
-        @Specialization(guards = "object == cachedObject.get()", limit = "1", assumptions = "singleContextAssumption")
+        @Specialization(guards = "object == cachedObject.get()", limit = "1", assumptions = "getSingleContextAssumption()")
         static Object getNativeClassCachedIdentity(PythonAbstractNativeObject object,
-                        @Shared("assumption") @Cached(value = "getSingleContextAssumption()") Assumption singleContextAssumption,
                         @Exclusive @Cached("weak(object)") WeakReference<PythonAbstractNativeObject> cachedObject,
                         @Exclusive @Cached("getNativeClassUncached(object)") Object cachedClass) {
             // TODO: (tfel) is this really something we can do? It's so rare for this class to
@@ -240,12 +240,11 @@ static Object getNativeClassCachedIdentity(PythonAbstractNativeObject object,
             return cachedClass;
         }
 
-        @Specialization(guards = "isSame(referenceLibrary, cachedObject, object)", limit = "1", assumptions = "singleContextAssumption")
+        @Specialization(guards = "isSame(lib, cachedObject, object)", assumptions = "getSingleContextAssumption()")
         static Object getNativeClassCached(PythonAbstractNativeObject object,
-                        @Shared("assumption") @Cached(value = "getSingleContextAssumption()") Assumption singleContextAssumption,
                         @Exclusive @Cached("weak(object)") WeakReference<PythonAbstractNativeObject> cachedObject,
                         @Exclusive @Cached("getNativeClassUncached(object)") Object cachedClass,
-                        @CachedLibrary("object.object") @SuppressWarnings("unused") ReferenceLibrary referenceLibrary) {
+                        @CachedLibrary(limit = "3") @SuppressWarnings("unused") InteropLibrary lib) {
             // TODO same as for 'getNativeClassCachedIdentity'
             return cachedClass;
         }
@@ -274,10 +273,10 @@ static WeakReference<PythonAbstractNativeObject> weak(PythonAbstractNativeObject
             return new WeakReference<>(object);
         }
 
-        static boolean isSame(ReferenceLibrary referenceLibrary, WeakReference<PythonAbstractNativeObject> cachedObjectRef, PythonAbstractNativeObject object) {
+        static boolean isSame(InteropLibrary lib, WeakReference<PythonAbstractNativeObject> cachedObjectRef, PythonAbstractNativeObject object) {
             PythonAbstractNativeObject cachedObject = cachedObjectRef.get();
             if (cachedObject != null) {
-                return referenceLibrary.isSame(cachedObject.object, object.object);
+                return lib.isIdentical(cachedObject.object, object.object, lib);
             }
             return false;
         }
@@ -288,6 +287,23 @@ public static Object getNativeClassUncached(PythonAbstractNativeObject object) {
         }
     }
 
+    @ExportMessage
+    int identityHashCode(@CachedLibrary("this.object") InteropLibrary lib) throws UnsupportedMessageException {
+        return lib.identityHashCode(object);
+    }
+
+    @ExportMessage
+    boolean isIdentical(Object other, InteropLibrary otherInterop,
+                    @CachedLibrary("this.object") InteropLibrary lib) {
+        return lib.isIdentical(object, other, otherInterop);
+    }
+
+    @ExportMessage
+    TriState isIdenticalOrUndefined(Object other,
+                    @CachedLibrary(limit = "3") InteropLibrary lib) {
+        return TriState.valueOf(lib.isIdentical(object, other, lib));
+    }
+
     @ExportMessage
     static class IsSame {