Remove PyTruffleObjectFree node

Author: msimacek

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

@@ -496,7 +496,7 @@ private void freeSingletonNativeWrappers(HandleContext handleContext) {
             if (singletonNativeWrapper.ref != null) {
                 CApiTransitions.nativeStubLookupRemove(handleContext, singletonNativeWrapper.ref);
             }
-            PyTruffleObjectFree.releaseNativeWrapperUncached(singletonNativeWrapper);
+            CApiTransitions.releaseNativeWrapperUncached(singletonNativeWrapper);
         }
     }
 
@@ -560,7 +560,7 @@ private void freeSmallInts(HandleContext handleContext) {
             if (wrapper.ref != null) {
                 CApiTransitions.nativeStubLookupRemove(handleContext, wrapper.ref);
             }
-            PyTruffleObjectFree.releaseNativeWrapperUncached(wrapper);
+            CApiTransitions.releaseNativeWrapperUncached(wrapper);
         }
     }
 

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

@@ -574,6 +574,46 @@ private static void releaseNativeObjects(PythonContext context, NativeObjectRefe
         }
     }
 
+    @TruffleBoundary
+    public static void releaseNativeWrapperUncached(PythonNativeWrapper nativeWrapper) {
+        releaseNativeWrapper(nativeWrapper, FreeNode.getUncached());
+    }
+
+    /**
+     * Releases a native wrapper. This requires to remove the native wrapper from any lookup tables
+     * and to free potentially allocated native resources. If native wrappers receive
+     * {@code toNative}, either a <it>handle pointer</it> is allocated or some off-heap memory is
+     * allocated. This method takes care of that and will also free any off-heap memory.
+     */
+    public static void releaseNativeWrapper(PythonNativeWrapper nativeWrapper, FreeNode freeNode) {
+
+        // If wrapper already received toNative, release the handle or free the native memory.
+        if (nativeWrapper.isNative()) {
+            long nativePointer = nativeWrapper.getNativePointer();
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.fine(PythonUtils.formatJString("Freeing pointer: 0x%x (wrapper: %s ;; object: %s)", nativePointer, nativeWrapper, nativeWrapper.getDelegate()));
+            }
+            if (HandlePointerConverter.pointsToPyHandleSpace(nativePointer)) {
+                // In this case, we are up to free a native object stub.
+                assert tableEntryRemoved(PythonContext.get(freeNode).nativeContext, nativeWrapper);
+                nativePointer = HandlePointerConverter.pointerToStub(nativePointer);
+            } else {
+                nativeLookupRemove(PythonContext.get(freeNode).nativeContext, nativePointer);
+            }
+            freeNode.free(nativePointer);
+        }
+    }
+
+    private static boolean tableEntryRemoved(HandleContext context, PythonNativeWrapper nativeWrapper) {
+        PythonObjectReference ref = nativeWrapper.ref;
+        if (ref != null) {
+            int id = ref.getHandleTableIndex();
+            return id <= 0 || nativeStubLookupGet(context, nativeWrapper.getNativePointer(), id) == null;
+        }
+        // there cannot be a table entry if the wrapper does not have a PythonObjectReference
+        return true;
+    }
+
     public static void freeClassReplacements(HandleContext handleContext) {
         assert PythonContext.get(null).ownsGil();
         handleContext.nativeLookup.forEach((l, ref) -> {

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

@@ -225,6 +225,10 @@ static void freeManaged(Object pointer,
         public static FreeNode create() {
             return FreeNodeGen.create();
         }
+
+        public static FreeNode getUncached() {
+            return FreeNodeGen.getUncached();
+        }
     }
 
     public abstract static class ReadBaseNode extends Node implements CStructAccessNode {

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

@@ -109,8 +109,8 @@
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
-import com.oracle.graal.python.builtins.objects.cext.capi.PyTruffleObjectFree;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper.PythonAbstractObjectNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.HandleContext;
 import com.oracle.graal.python.builtins.objects.cext.common.NativePointer;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
@@ -483,12 +483,12 @@ public void dispose(PythonContext context, boolean canRunGuestCode) {
             if (dict != null) {
                 PythonAbstractObjectNativeWrapper dictNativeWrapper = dict.getNativeWrapper();
                 if (dictNativeWrapper != null && dictNativeWrapper.ref == null) {
-                    PyTruffleObjectFree.releaseNativeWrapperUncached(dictNativeWrapper);
+                    CApiTransitions.releaseNativeWrapperUncached(dictNativeWrapper);
                 }
             }
             dict = null;
             if (nativeWrapper != null && nativeWrapper.ref == null) {
-                PyTruffleObjectFree.releaseNativeWrapperUncached(nativeWrapper);
+                CApiTransitions.releaseNativeWrapperUncached(nativeWrapper);
                 nativeWrapper = null;
             }
             /*