Skip to content

Commit a38bc94

Browse files
committed
Restrict tracked C symbol types to dynamic
1 parent c4cfc28 commit a38bc94

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

graalpython/com.oracle.graal.python.cext/CAPIFunctions.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,6 @@ PySet_Discard;int;PyObject*|PyObject*
606606
PySet_New;PyObject*;PyObject*
607607
PySet_Pop;PyObject*;PyObject*
608608
PySet_Size;Py_ssize_t;PyObject*
609-
PySignal_SetWakeupFd;int;int
610609
PySlice_AdjustIndices;Py_ssize_t;Py_ssize_t|Py_ssize_t*|Py_ssize_t*|Py_ssize_t
611610
PySlice_GetIndices;int;PyObject*|Py_ssize_t|Py_ssize_t*|Py_ssize_t*|Py_ssize_t*
612611
PySlice_GetIndicesEx;int;PyObject*|Py_ssize_t|Py_ssize_t*|Py_ssize_t*|Py_ssize_t*|Py_ssize_t*
@@ -815,7 +814,6 @@ PyUnicode_IsIdentifier;int;PyObject*
815814
PyUnicode_Join;PyObject*;PyObject*|PyObject*
816815
PyUnicode_New;PyObject*;Py_ssize_t|Py_UCS4
817816
PyUnicode_Partition;PyObject*;PyObject*|PyObject*
818-
PyUnicode_READ_CHAR;Py_UCS4;PyObject*|Py_ssize_t
819817
PyUnicode_RPartition;PyObject*;PyObject*|PyObject*
820818
PyUnicode_RSplit;PyObject*;PyObject*|PyObject*|Py_ssize_t
821819
PyUnicode_ReadChar;Py_UCS4;PyObject*|Py_ssize_t
@@ -914,10 +912,8 @@ Py_SetProgramName;void;const wchar_t*
914912
Py_SetPythonHome;void;const wchar_t*
915913
Py_SetRecursionLimit;void;int
916914
Py_SetStandardStreamEncoding;int;const char*|const char*
917-
Py_UNICODE_ISALNUM;int;Py_UCS4
918915
Py_UniversalNewlineFgets;char*;char*|int|FILE*|PyObject*
919916
Py_VaBuildValue;PyObject*;const char*|va_list
920-
Py_XDECREF;void;PyObject*
921917
Py_XNewRef;PyObject*;PyObject*
922918
_PyArg_BadArgument;void;const char*|const char*|const char*|PyObject*
923919
_PyArg_CheckPositional;int;const char*|Py_ssize_t|Py_ssize_t|Py_ssize_t
@@ -995,7 +991,6 @@ _PyErr_GetTopmostException;_PyErr_StackItem*;PyThreadState*
995991
_PyErr_ProgramDecodedTextObject;PyObject*;PyObject*|int|const char*
996992
_PyErr_SetFromPyStatus;PyObject*;PyStatus
997993
_PyErr_SetHandledException;void;PyThreadState*|PyObject*
998-
_PyErr_SetImportErrorWithNameFrom;PyObject*;PyObject*|PyObject*|PyObject*|PyObject*
999994
_PyErr_SetKeyError;void;PyObject*
1000995
_PyErr_WriteUnraisableMsg;void;const char*|PyObject*
1001996
_PyEval_EvalFrameDefault;PyObject*;PyThreadState*|struct _PyInterpreterFrame*|int

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,6 @@ public final class CApiFunction {
890890
@CApiBuiltin(name = "PyRun_SimpleStringFlags", ret = Int, args = {ConstCharPtrAsTruffleString, PY_COMPILER_FLAGS}, call = NotImplemented)
891891
@CApiBuiltin(name = "PyRun_String", ret = PyObject, args = {ConstCharPtrAsTruffleString, Int, PyObject, PyObject}, call = NotImplemented)
892892
@CApiBuiltin(name = "PySequence_In", ret = Int, args = {PyObject, PyObject}, call = NotImplemented)
893-
@CApiBuiltin(name = "PySignal_SetWakeupFd", ret = Int, args = {Int}, call = NotImplemented)
894893
@CApiBuiltin(name = "PySlice_GetIndices", ret = Int, args = {PyObject, Py_ssize_t, PY_SSIZE_T_PTR, PY_SSIZE_T_PTR, PY_SSIZE_T_PTR}, call = NotImplemented)
895894
@CApiBuiltin(name = "PySlice_GetIndicesEx", ret = Int, args = {PyObject, Py_ssize_t, PY_SSIZE_T_PTR, PY_SSIZE_T_PTR, PY_SSIZE_T_PTR, PY_SSIZE_T_PTR}, call = NotImplemented)
896895
@CApiBuiltin(name = "PyStatus_Error", ret = PYSTATUS, args = {ConstCharPtr}, call = CImpl)
@@ -1276,7 +1275,6 @@ public final class CApiFunction {
12761275
@CApiBuiltin(name = "PyType_GetTypeDataSize", ret = Py_ssize_t, args = {PyTypeObjectTransfer}, call = CImpl)
12771276
@CApiBuiltin(name = "PyType_Unwatch", ret = PrimitiveResult32, args = {PrimitiveResult32, PyObjectRawPointer}, call = NotImplemented)
12781277
@CApiBuiltin(name = "PyType_Watch", ret = PrimitiveResult32, args = {PrimitiveResult32, PyObjectRawPointer}, call = NotImplemented)
1279-
@CApiBuiltin(name = "PyUnicode_READ_CHAR", ret = PY_UCS4, args = {PyObjectRawPointer, Py_ssize_t}, call = CImpl)
12801278
@CApiBuiltin(name = "PyUnstable_Exc_PrepReraiseStar", ret = PyObjectRawPointer, args = {PyObjectRawPointer, PyObjectRawPointer}, call = NotImplemented)
12811279
@CApiBuiltin(name = "PyUnstable_GC_VisitObjects", ret = Void, args = {gcvisitobjects_t, Pointer}, call = CImpl)
12821280
@CApiBuiltin(name = "PyUnstable_InterpreterFrame_GetCode", ret = PyObjectRawPointer, args = {_PyInterpreterFrame}, call = NotImplemented)
@@ -1291,10 +1289,7 @@ public final class CApiFunction {
12911289
@CApiBuiltin(name = "PyUnstable_WritePerfMapEntry", ret = PrimitiveResult32, args = {CONST_VOID_PTR, UNSIGNED_INT, ConstCharPtr}, call = NotImplemented)
12921290
@CApiBuiltin(name = "PyVectorcall_NARGS", ret = Py_ssize_t, args = {SIZE_T}, call = CImpl)
12931291
@CApiBuiltin(name = "Py_NewInterpreterFromConfig", ret = PYSTATUS, args = {PyThreadStatePtr, ConstPyInterpreterConfig}, call = NotImplemented)
1294-
@CApiBuiltin(name = "Py_UNICODE_ISALNUM", ret = PrimitiveResult32, args = {PY_UCS4}, call = CImpl)
1295-
@CApiBuiltin(name = "Py_XDECREF", ret = Void, args = {PyObjectRawPointer}, call = CImpl)
12961292
@CApiBuiltin(name = "_PyErr_SetFromPyStatus", ret = PyObjectRawPointer, args = {PYSTATUS}, call = CImpl)
1297-
@CApiBuiltin(name = "_PyErr_SetImportErrorWithNameFrom", ret = PyObjectRawPointer, args = {PyObjectRawPointer, PyObjectRawPointer, PyObjectRawPointer, PyObjectRawPointer}, call = NotImplemented)
12981293
@CApiBuiltin(name = "_PyEval_MakePendingCalls", ret = PrimitiveResult32, args = {PyThreadState}, call = NotImplemented)
12991294
@CApiBuiltin(name = "_PyException_AddNote", ret = PrimitiveResult32, args = {PyObjectRawPointer, PyObjectRawPointer}, call = NotImplemented)
13001295
@CApiBuiltin(name = "_PyLong_FromDigits", ret = PyLongObject, args = {PrimitiveResult32, Py_ssize_t, DIGIT_PTR}, call = NotImplemented)

scripts/csignature.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
ast = parse_file(f.name, use_cpp=True, cpp_args=cpp_args)
8080

8181
lib_path = os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LDLIBRARY'))
82-
out = subprocess.check_output(['nm', '--defined-only', '--format=just-symbols', lib_path], text=True)
82+
out = subprocess.check_output(['nm', '--defined-only', '--dynamic', '--format=just-symbols', lib_path], text=True)
8383
exported_symbols = out.rstrip().splitlines()
8484

8585

0 commit comments

Comments
 (0)