remove ReferenceLibrary from NativeReferenceCache

Author: timfel

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

@@ -69,7 +69,6 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.IntValueProfile;
-import com.oracle.truffle.llvm.spi.ReferenceLibrary;
 
 @ExportLibrary(InteropLibrary.class)
 public final class NativeReferenceCache implements TruffleObject {
@@ -118,15 +117,15 @@ static Object doNativeWrapper(Object pointerObject, @SuppressWarnings("unused")
             return pointerObject;
         }
 
-        @Specialization(guards = {"!isResolved(pointerObject)", "ref != null", "isSame(referenceLibrary, pointerObject, ref)"}, //
+        @Specialization(guards = {"!isResolved(pointerObject)", "ref != null", "isSame(interoplibrary, pointerObject, ref)"}, //
                         rewriteOn = {CannotCastException.class, InvalidCacheEntry.class}, //
                         assumptions = "singleContextAssumption()", //
                         limit = "1")
         static PythonAbstractNativeObject doCachedPointer(@SuppressWarnings("unused") Object pointerObject, @SuppressWarnings("unused") Object refCnt, boolean steal,
                         @Shared("context") @CachedContext(PythonLanguage.class) @SuppressWarnings("unused") PythonContext context,
                         @Shared("stealProfile") @Cached("createBinaryProfile()") ConditionProfile stealProfile,
                         @Cached("lookupNativeReference(context, pointerObject, refCnt)") NativeObjectReference ref,
-                        @CachedLibrary("ref.ptrObject") @SuppressWarnings("unused") ReferenceLibrary referenceLibrary) {
+                        @CachedLibrary(limit = "2") @SuppressWarnings("unused") InteropLibrary interoplibrary) {
             PythonAbstractNativeObject wrapper = ref.get();
             if (wrapper != null) {
                 // If this is stealing the reference, we need to fixup the managed reference count.
@@ -207,8 +206,8 @@ private static Object lookupNativeObjectReference(Object pointerObject, int idx,
             return pointerObject;
         }
 
-        static boolean isSame(ReferenceLibrary referenceLibrary, Object pointerObject, NativeObjectReference cachedObjectRef) {
-            return referenceLibrary.isSame(cachedObjectRef.ptrObject, pointerObject);
+        static boolean isSame(InteropLibrary interoplibrary, Object pointerObject, NativeObjectReference cachedObjectRef) {
+            return interoplibrary.isIdentical(cachedObjectRef.ptrObject, pointerObject, interoplibrary);
         }
 
         static NativeObjectReference lookupNativeReference(PythonContext context, Object pointerObject, Object refCnt) {