Clean up our two remaining wrappers with full off-heap memory

Author: timfel

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

@@ -65,7 +65,7 @@
  * Wrapper object for {@code PMemoryView}.
  */
 public final class PyMemoryViewWrapper extends PythonAbstractObjectNativeWrapper {
-    private Object replacement;
+    private NativePointer replacement;
 
     public PyMemoryViewWrapper(PythonObject delegate) {
         super(delegate);
@@ -144,7 +144,7 @@ private static long allocate(PMemoryView object) {
         return mem;
     }
 
-    public Object getReplacement(InteropLibrary lib) {
+    public Object getReplacement() {
         if (replacement == null) {
             long ptr = allocate((PMemoryView) getDelegate());
             // TODO: need to convert to interop pointer for NFI for now

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

@@ -197,15 +197,15 @@ public String toString() {
         return PythonUtils.formatJString("PythonClassNativeWrapper(%s, isNative=%s)", getDelegate(), isNative());
     }
 
-    public Object getReplacement(InteropLibrary lib) {
+    public Object getReplacement() {
         if (CompilerDirectives.injectBranchProbability(CompilerDirectives.SLOWPATH_PROBABILITY, replacement == null)) {
-            initializeReplacement(lib);
+            initializeReplacement();
         }
         return replacement;
     }
 
     @TruffleBoundary
-    private void initializeReplacement(InteropLibrary lib) {
+    private void initializeReplacement() {
         /*
          * Note: it's important that we first allocate the empty 'PyTypeStruct' and register it to
          * the wrapper before we do the type's initialization. Otherwise, we will run into an

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

@@ -43,16 +43,21 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.PyMemoryViewWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonClassNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper;
-import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
 
+/**
+ * Native wrappers are usually materialized lazily when they receive
+ * {@link InteropLibrary#toNative(Object)}. A few native wrappers may emulate data structures where
+ * it is more efficient to have off-heap memory that just replaces the object on the native side
+ * (and is presumably somehow synced). These wrappers have specializations here so the users of this
+ * node can return them directly for native access.
+ */
 @GenerateUncached
 @GenerateInline
 @GenerateCached(false)
@@ -61,15 +66,13 @@ public abstract class GetReplacementNode extends Node {
     public abstract Object execute(Node inliningTarget, PythonNativeWrapper wrapper);
 
     @Specialization
-    static Object doReplacingWrapper(PyMemoryViewWrapper wrapper,
-                    @Shared @CachedLibrary(limit = "3") InteropLibrary lib) {
-        return wrapper.getReplacement(lib);
+    static Object doReplacingWrapper(PyMemoryViewWrapper wrapper) {
+        return wrapper.getReplacement();
     }
 
     @Specialization
-    static Object doReplacingWrapper(PythonClassNativeWrapper wrapper,
-                    @Shared @CachedLibrary(limit = "3") InteropLibrary lib) {
-        return wrapper.getReplacement(lib);
+    static Object doReplacingWrapper(PythonClassNativeWrapper wrapper) {
+        return wrapper.getReplacement();
     }
 
     @Fallback