[GR-74773] Make C API conversions explicit and simplify CApiBuiltinsProcessor. by graalvmbot · Pull Request #1237 · oracle/graalpython · GitHub
Skip to content

[GR-74773] Make C API conversions explicit and simplify CApiBuiltinsProcessor. #1237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graalvmbot merged 11 commits into from
Oct 21, 2026
Merged

[GR-74773] Make C API conversions explicit and simplify CApiBuiltinsProcessor. #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
979effc
Add explicit conversion parameters to CApiBuiltin
fangerer Oct 20, 2026
43b152c
Declare explicit conversions on C API builtins
fangerer Oct 20, 2026
add15e1
Read and validate C API builtin conversion declarations
fangerer Oct 20, 2026
b1b5edc
Generate C API builtin registry entries with conversion factories
fangerer Oct 20, 2026
a51dcdc
Remove conversion behavior from ArgDescriptor
fangerer Oct 20, 2026
94c3e9f
Move ArgDescriptor to the annotations package
fangerer Oct 20, 2026
ca8156a
Consolidate conversion-policy ArgDescriptor variants
fangerer Oct 20, 2026
fdb1f46
Fix copyright year
fangerer Oct 20, 2026
fa34a1e
Use ArgDescriptor directly in C API processor models
fangerer Oct 20, 2026
3523437
Use native type enums for C API processor decisions
fangerer Oct 20, 2026
fbd3d81
Define Java carriers on NativeSimpleType
fangerer Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
357 changes: 357 additions & 0 deletions ...racle.graal.python.annotations/src/com/oracle/graal/python/annotations/ArgDescriptor.java
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 22 additions & 8 deletions ...le.graal.python.annotations/src/com/oracle/graal/python/annotations/NativeSimpleType.java
View file
Open in desktop
313 changes: 136 additions & 177 deletions ...e.graal.python.processor/src/com/oracle/graal/python/processor/CApiBuiltinsProcessor.java
View file
Open in desktop

Large diffs are not rendered by default.

142 changes: 75 additions & 67 deletions ....python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextAbstractBuiltins.java
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 15 additions & 14 deletions ...aal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextArrayBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,15 @@
*/
package com.oracle.graal.python.builtins.modules.cext;

import static com.oracle.graal.python.annotations.ArgDescriptor.CHAR_PTR;
import static com.oracle.graal.python.annotations.ArgDescriptor.Int;
import static com.oracle.graal.python.annotations.ArgDescriptor.PY_BUFFER_PTR;
import static com.oracle.graal.python.annotations.ArgDescriptor.PyObject;
import static com.oracle.graal.python.annotations.ArgDescriptor.Py_ssize_t;
import static com.oracle.graal.python.annotations.ArgDescriptor.Void;
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.MemoryError;
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Direct;
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.CHAR_PTR;
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_BUFFER_PTR;
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObject;
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectRawPointer;
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Void;
import static com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess.writeIntField;
import static com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess.writeLongField;
import static com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess.writePtrField;
Expand All @@ -65,7 +63,9 @@
import com.oracle.graal.python.builtins.objects.array.PArray;
import com.oracle.graal.python.builtins.objects.buffer.BufferFlags;
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeToPythonInternalNode;
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeToPythonNode;
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeInternalNode;
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeNewRefNode;
import com.oracle.graal.python.builtins.objects.cext.structs.CFields;
import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess.WriteTruffleStringNode;
Expand All @@ -80,7 +80,8 @@

public final class PythonCextArrayBuiltins {

@CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, Py_ssize_t, Int}, call = Ignored)
@CApiBuiltin(ret = PyObject, args = {PyObject, Py_ssize_t, Int}, call = Ignored, retConversion = PythonToNativeNewRefNode.class, argConversions = {NativeToPythonNode.class, long.class,
int.class})
static long GraalPyPrivate_Array_New(long clsPtr, long size, int typeCode) {
Object cls = NativeToPythonInternalNode.executeUncached(clsPtr, false);
TruffleString typeCodeString = TruffleString.fromCodePointUncached(typeCode, TS_ENCODING);
Expand All @@ -94,23 +95,23 @@ static long GraalPyPrivate_Array_New(long clsPtr, long size, int typeCode) {
}
}

@CApiBuiltin(ret = Int, args = {PyObjectRawPointer}, call = Ignored)
@CApiBuiltin(ret = Int, args = {PyObject}, call = Ignored, retConversion = int.class, argConversions = {long.class})
static int GraalPyPrivate_Array_TypeCode(long arrayPtr) {
return expectArray(arrayPtr, "GraalPyArray_GetDescriptor").getFormatString().codePointAtIndexUncached(0, TS_ENCODING);
}

/**
* Graalpy-specific function implemented for Cython
*/
@CApiBuiltin(ret = Int, args = {PyObjectRawPointer, Py_ssize_t}, call = Direct)
@CApiBuiltin(ret = Int, args = {PyObject, Py_ssize_t}, call = Direct, retConversion = int.class, argConversions = {long.class, long.class})
static int GraalPyArray_Resize(long arrayPtr, long newSize) {
PArray array = expectArray(arrayPtr, "GraalPyArray_Resize");
ArrayNodes.EnsureCapacityNode.executeUncached(array, (int) newSize);
ArrayNodes.SetLengthNode.executeUncached(array, (int) newSize);
return 0;
}

@CApiBuiltin(ret = CHAR_PTR, args = {PyObjectRawPointer}, call = Direct)
@CApiBuiltin(ret = CHAR_PTR, args = {PyObject}, call = Direct, retConversion = long.class, argConversions = {long.class})
static long GraalPyArray_Data(long arrayPtr) {
PArray array = expectArray(arrayPtr, "GraalPyArray_Data");
if (array.getBytesLength() > 0) {
Expand All @@ -119,7 +120,7 @@ static long GraalPyArray_Data(long arrayPtr) {
return NULLPTR;
}

@CApiBuiltin(ret = Int, args = {PyObjectRawPointer, PY_BUFFER_PTR, Int}, call = Ignored)
@CApiBuiltin(ret = Int, args = {PyObject, PY_BUFFER_PTR, Int}, call = Ignored, retConversion = int.class, argConversions = {long.class, long.class, int.class})
static int GraalPyPrivate_Array_getbuffer(long arrayPtr, long pyBufferPtr, int flags) {
PArray array = expectArray(arrayPtr, "GraalPyPrivate_Array_getbuffer");
long bufPtr = ArrayNodes.EnsureNativeStorageNode.executeUncached(array).getPtr();
Expand Down Expand Up @@ -159,7 +160,7 @@ static int GraalPyPrivate_Array_getbuffer(long arrayPtr, long pyBufferPtr, int f
return 0;
}

@CApiBuiltin(ret = Void, args = {PyObjectRawPointer, PY_BUFFER_PTR}, call = Ignored)
@CApiBuiltin(ret = Void, args = {PyObject, PY_BUFFER_PTR}, call = Ignored, retConversion = void.class, argConversions = {long.class, long.class})
static void GraalPyPrivate_Array_releasebuffer(long arrayPtr, long pyBufferPtr) {
PArray array = expectArray(arrayPtr, "GraalPyPrivate_Array_releasebuffer");
array.getExports().decrementAndGet();
Expand Down
6 changes: 3 additions & 3 deletions ...raal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBoolBuiltins.java
View file
Open in desktop
Loading
Loading