Use PCallCapiFunction.callUncached

msimacek · msimacek · commit 4b022146b721 · 2024-04-22T09:57:00.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MMapModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MMapModuleBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -135,7 +135,7 @@ public MMapModuleBuiltins() {
     public void postInitialize(Python3Core core) {
         super.postInitialize(core);
         core.getContext().registerCApiHook(() -> {
-            CExtNodes.PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_MMAP_INIT_BUFFERPROTOCOL, PythonToNativeNode.executeUncached(PythonBuiltinClassType.PMMap));
+            CExtNodes.PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_MMAP_INIT_BUFFERPROTOCOL, PythonToNativeNode.executeUncached(PythonBuiltinClassType.PMMap));
         });
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataBuiltins.java
@@ -108,7 +108,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @Override
     public void postInitialize(Python3Core core) {
         super.postInitialize(core);
-        core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCData)));
+        core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCData)));
     }
 
     @Builtin(name = "_b_base_", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 1, isGetter = true, doc = "the base object")
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCArrayBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCArrayBuiltins.java
@@ -119,7 +119,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @Override
     public void postInitialize(Python3Core core) {
         super.postInitialize(core);
-        core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCArray)));
+        core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCArray)));
     }
 
     @Builtin(name = J___NEW__, minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCFuncPtrBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCFuncPtrBuiltins.java
@@ -165,7 +165,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @Override
     public void postInitialize(Python3Core core) {
         super.postInitialize(core);
-        core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCFuncPtr)));
+        core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCFuncPtr)));
     }
 
     /*
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCPointerBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCPointerBuiltins.java
@@ -120,7 +120,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @Override
     public void postInitialize(Python3Core core) {
         super.postInitialize(core);
-        core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCPointer)));
+        core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCPointer)));
     }
 
     @GenerateInline
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/SimpleCDataBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/SimpleCDataBuiltins.java
@@ -106,7 +106,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @Override
     public void postInitialize(Python3Core core) {
         super.postInitialize(core);
-        core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(SimpleCData)));
+        core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(SimpleCData)));
     }
 
     static void Simple_set_value(VirtualFrame frame, Node inliningTarget, CDataObject self, Object value,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/StructureBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/StructureBuiltins.java
@@ -99,8 +99,8 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     public void postInitialize(Python3Core core) {
         super.postInitialize(core);
         core.getContext().registerCApiHook(() -> {
-            PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(Structure));
-            PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(Union));
+            PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(Structure));
+            PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(Union));
         });
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java
@@ -648,7 +648,7 @@ static boolean isNativeObjectOrLong(Object object) {
 
     @TruffleBoundary
     public static Object pointerAdd(Object pointer, long offset) {
-        return PCallCapiFunction.getUncached().call(FUN_PTR_ADD, pointer, offset);
+        return PCallCapiFunction.callUncached(FUN_PTR_ADD, pointer, offset);
     }
 
     // -----------------------------------------------------------------------------------------------------------------
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java
@@ -296,7 +296,7 @@ private void unsafeSetSuperClass(PythonAbstractClass... newBaseClasses) {
             if (base != null) {
                 if (PGuards.isNativeClass(base)) {
                     Object nativeBase = PythonToNativeNodeGen.getUncached().execute(base);
-                    PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_TRUFFLE_CHECK_TYPE_READY, nativeBase);
+                    PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_TRUFFLE_CHECK_TYPE_READY, nativeBase);
                 }
                 GetSubclassesNode.unsafeAddSubclass(base, this);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java
@@ -644,7 +644,7 @@ private static Object initializeType(Node inliningTarget, PythonNativeClass obj,
             CompilerDirectives.transferToInterpreter();
 
             // call 'PyType_Ready' on the type
-            int res = (int) PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_PY_TYPE_READY, PythonToNativeNodeGen.getUncached().execute(obj));
+            int res = (int) PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_PY_TYPE_READY, PythonToNativeNodeGen.getUncached().execute(obj));
             if (res < 0) {
                 PRaiseNode.raiseUncached(inliningTarget, PythonBuiltinClassType.SystemError, ErrorMessages.LAZY_INITIALIZATION_FAILED, GetNameNode.executeUncached(obj));
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/GetMethodsFlagsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/GetMethodsFlagsNode.java
@@ -80,7 +80,7 @@ protected static long pythonclasstype(PythonBuiltinClassType cls) {
 
     @TruffleBoundary
     private static long populateMethodsFlags(PythonAbstractNativeObject cls) {
-        Long flags = (Long) PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_GET_METHODS_FLAGS, cls.getPtr());
+        Long flags = (Long) PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_GET_METHODS_FLAGS, cls.getPtr());
         HiddenAttr.WriteNode.executeUncached(cls, METHODS_FLAGS, flags);
         return flags;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`
`@@ -135,7 +135,7 @@ public MMapModuleBuiltins() {`
`135`	`135`	`public void postInitialize(Python3Core core) {`
`136`	`136`	`super.postInitialize(core);`
`137`	`137`	`core.getContext().registerCApiHook(() -> {`
`138`		`- CExtNodes.PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_MMAP_INIT_BUFFERPROTOCOL, PythonToNativeNode.executeUncached(PythonBuiltinClassType.PMMap));`
	`138`	`+ CExtNodes.PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_MMAP_INIT_BUFFERPROTOCOL, PythonToNativeNode.executeUncached(PythonBuiltinClassType.PMMap));`
`139`	`139`	`});`
`140`	`140`	`}`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa`
`108`	`108`	`@Override`
`109`	`109`	`public void postInitialize(Python3Core core) {`
`110`	`110`	`super.postInitialize(core);`
`111`		`- core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCData)));`
	`111`	`+ core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCData)));`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`@Builtin(name = "_b_base_", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 1, isGetter = true, doc = "the base object")`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa`
`119`	`119`	`@Override`
`120`	`120`	`public void postInitialize(Python3Core core) {`
`121`	`121`	`super.postInitialize(core);`
`122`		`- core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCArray)));`
	`122`	`+ core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCArray)));`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Builtin(name = J___NEW__, minNumOfPositionalArgs = 1, takesVarArgs = true, takesVarKeywordArgs = true)`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa`
`165`	`165`	`@Override`
`166`	`166`	`public void postInitialize(Python3Core core) {`
`167`	`167`	`super.postInitialize(core);`
`168`		`- core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCFuncPtr)));`
	`168`	`+ core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCFuncPtr)));`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa`
`120`	`120`	`@Override`
`121`	`121`	`public void postInitialize(Python3Core core) {`
`122`	`122`	`super.postInitialize(core);`
`123`		`- core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCPointer)));`
	`123`	`+ core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(PyCPointer)));`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`@GenerateInline`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa`
`106`	`106`	`@Override`
`107`	`107`	`public void postInitialize(Python3Core core) {`
`108`	`108`	`super.postInitialize(core);`
`109`		`- core.getContext().registerCApiHook(() -> PCallCapiFunction.getUncached().call(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(SimpleCData)));`
	`109`	`+ core.getContext().registerCApiHook(() -> PCallCapiFunction.callUncached(FUN_PY_TRUFFLE_CDATA_INIT_BUFFER_PROTOCOL, PythonToNativeNode.executeUncached(SimpleCData)));`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`static void Simple_set_value(VirtualFrame frame, Node inliningTarget, CDataObject self, Object value,`
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ static boolean isNativeObjectOrLong(Object object) {`
`648`	`648`
`649`	`649`	`@TruffleBoundary`
`650`	`650`	`public static Object pointerAdd(Object pointer, long offset) {`
`651`		`- return PCallCapiFunction.getUncached().call(FUN_PTR_ADD, pointer, offset);`
	`651`	`+ return PCallCapiFunction.callUncached(FUN_PTR_ADD, pointer, offset);`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`// -----------------------------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ private void unsafeSetSuperClass(PythonAbstractClass... newBaseClasses) {`
`296`	`296`	`if (base != null) {`
`297`	`297`	`if (PGuards.isNativeClass(base)) {`
`298`	`298`	`Object nativeBase = PythonToNativeNodeGen.getUncached().execute(base);`
`299`		`- PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_TRUFFLE_CHECK_TYPE_READY, nativeBase);`
	`299`	`+ PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_TRUFFLE_CHECK_TYPE_READY, nativeBase);`
`300`	`300`	`}`
`301`	`301`	`GetSubclassesNode.unsafeAddSubclass(base, this);`
`302`	`302`	`}`
Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ private static Object initializeType(Node inliningTarget, PythonNativeClass obj,`
`644`	`644`	`CompilerDirectives.transferToInterpreter();`
`645`	`645`
`646`	`646`	`// call 'PyType_Ready' on the type`
`647`		`- int res = (int) PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_PY_TYPE_READY, PythonToNativeNodeGen.getUncached().execute(obj));`
	`647`	`+ int res = (int) PCallCapiFunction.callUncached(NativeCAPISymbol.FUN_PY_TYPE_READY, PythonToNativeNodeGen.getUncached().execute(obj));`
`648`	`648`	`if (res < 0) {`
`649`	`649`	`PRaiseNode.raiseUncached(inliningTarget, PythonBuiltinClassType.SystemError, ErrorMessages.LAZY_INITIALIZATION_FAILED, GetNameNode.executeUncached(obj));`
`650`	`650`	`}`