Remove SubRefCntNode

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java

@@ -120,7 +120,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiGuards;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AddRefCntNode;
-import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.SubRefCntNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CByteArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.LoadCExtException.ApiInitException;
@@ -1740,9 +1740,9 @@ static Object doGeneric(Object arg) {
 
             if (pointerObject != null) {
                 // that's what this function is for
-                SubRefCntNode.executeUncached(pointerObject, 1);
+                PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_DECREF, pointerObject);
                 // that for returning it
-                AddRefCntNode.executeUncached(pointerObject, 1);
+                PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_INCREF, pointerObject);
             }
             return arg;
         }

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

@@ -83,7 +83,6 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.CreateFunctionNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.FromCharPointerNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ResolvePointerNodeGen;
-import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.SubRefCntNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.DefaultCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.PExternalFunctionWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper.PythonAbstractObjectNativeWrapper;
@@ -1223,65 +1222,6 @@ static Object doNativeObject(Object object, long value,
         }
     }
 
-    @GenerateInline
-    @GenerateCached(false)
-    @GenerateUncached
-    @ImportStatic(CApiGuards.class)
-    public abstract static class SubRefCntNode extends PNodeWithContext {
-        private static final TruffleLogger LOGGER = CApiContext.getLogger(SubRefCntNode.class);
-
-        public static long executeUncached(Object object, long value) {
-            return SubRefCntNodeGen.getUncached().execute(null, object, value);
-        }
-
-        public final long dec(Node inliningTarget, Object object) {
-            return execute(inliningTarget, object, 1);
-        }
-
-        public abstract long execute(Node inliningTarget, Object object, long value);
-
-        @Specialization(guards = "value == 1")
-        static long doNativeWrapperDecByOne(PythonAbstractObjectNativeWrapper nativeWrapper, @SuppressWarnings("unused") long value) {
-            long refCount = nativeWrapper.decRef();
-            // TODO(fa): see comment in 'doNativeWrapper'
-            // checkRefCountZero(inliningTarget, nativeWrapper, freeNode, negativeProfile,
-            // refCount);
-            return refCount;
-        }
-
-        @Specialization
-        static long doNativeWrapper(Node inliningTarget, PythonAbstractObjectNativeWrapper nativeWrapper, long value,
-                        @Exclusive @Cached InlinedConditionProfile hasRefProfile) {
-            long updatedRefCount = nativeWrapper.getRefCount() - value;
-            nativeWrapper.setRefCount(inliningTarget, updatedRefCount, hasRefProfile);
-            /*
-             * TODO(fa): Investigate if call to 'checkRefCountZero' is beneficial or necessary.
-             * 
-             * I think it is not strictly necessary because 'setRefCount' will make the wrapper's
-             * reference weak and as soon as there is no more reference from managed, the object
-             * will be free'd. However, if the refcount is 0, we already know that it can be free'd
-             * and we could safe the overhead of going through the reference queue and such. OTOH, I
-             * think this will rarely happen and would need some special treatment in the reference
-             * queue processor.
-             */
-            // checkRefCountZero(inliningTarget, nativeWrapper, freeNode, negativeProfile,
-            // updatedRefCount);
-            return updatedRefCount;
-        }
-
-        /*-
-        private static void checkRefCountZero(Node inliningTarget, PythonAbstractObjectNativeWrapper nativeWrapper, PyTruffleObjectFree freeNode, InlinedBranchProfile negativeProfile, long refCount) {
-            if (refCount == 0) {
-                // 'freeNode' acts as a branch profile
-                freeNode.execute(inliningTarget, nativeWrapper);
-            } else if (refCount < 0) {
-                negativeProfile.enter(inliningTarget);
-                LOGGER.severe(() -> "native wrapper has negative ref count: " + nativeWrapper);
-            }
-        }
-        */
-    }
-
     @GenerateInline
     @GenerateCached(false)
     @GenerateUncached
@@ -2065,13 +2005,11 @@ abstract static class ReleaseNativeWrapperNode extends Node {
         public abstract void execute(Object pythonObject);
 
         @Specialization
-        static void doNativeWrapper(PythonAbstractObjectNativeWrapper nativeWrapper,
-                        @Bind("this") Node inliningTarget,
-                        @Cached SubRefCntNode subRefCntNode) {
-            // in the cached case, refCntNode acts as a branch profile
-            // if (subRefCntNode.dec(nativeWrapper) == 0) {
-            // traverseNativeWrapperNode.execute(inliningTarget, nativeWrapper.getDelegate());
-            // }
+        static void doNativeWrapper(@SuppressWarnings("unused") PythonAbstractObjectNativeWrapper nativeWrapper) {
+            /*
+             * TODO(fa): this is the place where we should decrease the wrapper's refcount by 1 and
+             * also make the ref weak
+             */
         }
 
         @Specialization(guards = "!isNativeWrapper(object)")

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

@@ -68,7 +68,6 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.CreateFunctionNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.CreateMethodNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.FromCharPointerNode;
-import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.SubRefCntNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.PExternalFunctionWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.AsNativePrimitiveNode;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.ConvertPIntToPrimitiveNode;
@@ -1948,20 +1947,6 @@ static void doConvert(Object[] dest, int destOffset,
         }
     }
 
-    /**
-     * The counter part of {@link HPyGetSetSetterToSulongNode}.
-     */
-    @GenerateInline(false)
-    public abstract static class HPyLegacyGetSetSetterDecrefNode extends HPyCloseArgHandlesNode {
-
-        @Specialization
-        static void doConvert(Object[] dest, int destOffset,
-                        @Bind("this") Node inliningTarget,
-                        @Cached SubRefCntNode subRefCntNode) {
-            subRefCntNode.dec(inliningTarget, dest[destOffset + 1]);
-        }
-    }
-
     /**
      * Converts {@code self} to an HPy handle and any other argument to {@code HPy_ssize_t}.
      */