Skip to content

Commit 6312508

Browse files
msimacekmsimacek
committed
Don't prefix upcall symbols for internal calls
1 parent 2305518 commit 6312508

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+310
-329
lines changed

‎graalpython/com.oracle.graal.python.cext/modules/_cpython_sre/sre.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3051,14 +3051,14 @@ expand_template(TemplateObject *self, MatchObject *match)
30513051
#if 0 // GraalPy change
30523052
result = _PyUnicode_JoinArray(&_Py_STR(empty), out, count);
30533053
#else // GraalPy change: different implementation
3054-
count = GraalPyTruffleList_TryGetItems(list, &out);
3054+
count = PyTruffleList_TryGetItems(list, &out);
30553055
result = _PyUnicode_JoinArray(PyUnicode_FromString(""), out, count);
30563056
#endif // GraalPy change
30573057
}
30583058
else {
30593059
// Py_SET_SIZE(list, count); // GraalPy change
3060-
// GraalPy change: replace '&_Py_SINGLETON(bytes_empty)' with 'GraalPyTruffle_Bytes_EmptyWithCapacity(0)'
3061-
result = _PyBytes_Join(GraalPyTruffle_Bytes_EmptyWithCapacity(0), list);
3060+
// GraalPy change: replace '&_Py_SINGLETON(bytes_empty)' with 'PyTruffle_Bytes_EmptyWithCapacity(0)'
3061+
result = _PyBytes_Join(PyTruffle_Bytes_EmptyWithCapacity(0), list);
30623062
}
30633063

30643064
cleanup:

‎graalpython/com.oracle.graal.python.cext/src/_warnings.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2024, Oracle and/or its affiliates.
1+
/* Copyright (c) 2024, 2025, Oracle and/or its affiliates.
22
* Copyright (C) 1996-2024 Python Software Foundation
33
*
44
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -635,7 +635,7 @@ warn_explicit(PyThreadState *tstate, PyObject *category, PyObject *message,
635635
PyObject *source)
636636
{
637637
// GraalPy change: different implementation
638-
return GraalPyTruffleErr_WarnExplicit(category, message, filename, lineno, module, registry);
638+
return PyTruffleErr_WarnExplicit(category, message, filename, lineno, module, registry);
639639
}
640640

641641
#if 0 // GraalPy change
@@ -1065,7 +1065,7 @@ warn_unicode(PyObject *category, PyObject *message,
10651065
category = PyExc_RuntimeWarning;
10661066

10671067
// GraalPy change
1068-
res = Graal_PyTruffleErr_Warn(message, category, stack_level, source);
1068+
res = _PyTruffleErr_Warn(message, category, stack_level, source);
10691069
if (res == NULL)
10701070
return -1;
10711071
Py_DECREF(res);

‎graalpython/com.oracle.graal.python.cext/src/abstract.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ PyObject_Size(PyObject *o)
6969

7070
// GraalPy change: upcall for managed objects
7171
if (points_to_py_handle_space(o)) {
72-
return GraalPyTruffleObject_Size(o);
72+
return PyTruffleObject_Size(o);
7373
}
7474

7575
PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence;
@@ -1066,7 +1066,7 @@ ternary_op(PyObject *v,
10661066
PyObject * \
10671067
func(PyObject *v, PyObject *w) { \
10681068
if (points_to_py_handle_space(v) && points_to_py_handle_space(w)) { \
1069-
return GraalPyTruffle##func(v, w); \
1069+
return PyTruffle##func(v, w); \
10701070
} \
10711071
return binary_op(v, w, NB_SLOT(op), op_name); \
10721072
}
@@ -1084,7 +1084,7 @@ PyNumber_Add(PyObject *v, PyObject *w)
10841084
{
10851085
// GraalPy change: upcall when both managed to save on doing multiple upcalls
10861086
if (points_to_py_handle_space(v) && points_to_py_handle_space(w)) {
1087-
return GraalPyTrufflePyNumber_Add(v, w);
1087+
return PyTrufflePyNumber_Add(v, w);
10881088
}
10891089
PyObject *result = BINARY_OP1(v, w, NB_SLOT(nb_add), "+");
10901090
if (result != Py_NotImplemented) {
@@ -1126,7 +1126,7 @@ PyNumber_Multiply(PyObject *v, PyObject *w)
11261126
{
11271127
// GraalPy change: upcall when both managed to save on doing multiple upcalls
11281128
if (points_to_py_handle_space(v) && points_to_py_handle_space(w)) {
1129-
return GraalPyTrufflePyNumber_Multiply(v, w);
1129+
return PyTrufflePyNumber_Multiply(v, w);
11301130
}
11311131
PyObject *result = BINARY_OP1(v, w, NB_SLOT(nb_multiply), "*");
11321132
if (result == Py_NotImplemented) {
@@ -1149,7 +1149,7 @@ PyNumber_MatrixMultiply(PyObject *v, PyObject *w)
11491149
{
11501150
// GraalPy change: upcall when both managed to save on doing multiple upcalls
11511151
if (points_to_py_handle_space(v) && points_to_py_handle_space(w)) {
1152-
return GraalPyTrufflePyNumber_MatrixMultiply(v, w);
1152+
return PyTrufflePyNumber_MatrixMultiply(v, w);
11531153
}
11541154
return binary_op(v, w, NB_SLOT(nb_matrix_multiply), "@");
11551155
}
@@ -1159,7 +1159,7 @@ PyNumber_FloorDivide(PyObject *v, PyObject *w)
11591159
{
11601160
// GraalPy change: upcall when both managed to save on doing multiple upcalls
11611161
if (points_to_py_handle_space(v) && points_to_py_handle_space(w)) {
1162-
return GraalPyTrufflePyNumber_FloorDivide(v, w);
1162+
return PyTrufflePyNumber_FloorDivide(v, w);
11631163
}
11641164
return binary_op(v, w, NB_SLOT(nb_floor_divide), "//");
11651165
}
@@ -1169,7 +1169,7 @@ PyNumber_TrueDivide(PyObject *v, PyObject *w)
11691169
{
11701170
// GraalPy change: upcall when both managed to save on doing multiple upcalls
11711171
if (points_to_py_handle_space(v) && points_to_py_handle_space(w)) {
1172-
return GraalPyTrufflePyNumber_TrueDivide(v, w);
1172+
return PyTrufflePyNumber_TrueDivide(v, w);
11731173
}
11741174
return binary_op(v, w, NB_SLOT(nb_true_divide), "/");
11751175
}
@@ -1179,7 +1179,7 @@ PyNumber_Remainder(PyObject *v, PyObject *w)
11791179
{
11801180
// GraalPy change: upcall when both managed to save on doing multiple upcalls
11811181
if (points_to_py_handle_space(v) && points_to_py_handle_space(w)) {
1182-
return GraalPyTrufflePyNumber_Remainder(v, w);
1182+
return PyTrufflePyNumber_Remainder(v, w);
11831183
}
11841184
return binary_op(v, w, NB_SLOT(nb_remainder), "%");
11851185
}
@@ -1189,7 +1189,7 @@ PyNumber_Power(PyObject *v, PyObject *w, PyObject *z)
11891189
{
11901190
// GraalPy change: upcall when both managed to save on doing multiple upcalls
11911191
if (points_to_py_handle_space(v) && points_to_py_handle_space(w)) {
1192-
return GraalPyTrufflePyNumber_Power(v, w, z);
1192+
return PyTrufflePyNumber_Power(v, w, z);
11931193
}
11941194
return ternary_op(v, w, z, NB_SLOT(nb_power), "** or pow()");
11951195
}
@@ -1283,7 +1283,7 @@ ternary_iop(PyObject *v, PyObject *w, PyObject *z, const int iop_slot, const int
12831283
PyObject * \
12841284
func(PyObject *v, PyObject *w) { \
12851285
if (points_to_py_handle_space(v)) { \
1286-
return GraalPyTruffle##func(v, w); \
1286+
return PyTruffle##func(v, w); \
12871287
} \
12881288
return binary_iop(v, w, NB_SLOT(iop), NB_SLOT(op), op_name); \
12891289
}
@@ -1304,7 +1304,7 @@ PyNumber_InPlaceAdd(PyObject *v, PyObject *w)
13041304
{
13051305
// GraalPy change: upcall when v is managed to avoid multiple upcalls
13061306
if (points_to_py_handle_space(v)) {
1307-
return GraalPyTrufflePyNumber_InPlaceAdd(v, w);
1307+
return PyTrufflePyNumber_InPlaceAdd(v, w);
13081308
}
13091309
PyObject *result = BINARY_IOP1(v, w, NB_SLOT(nb_inplace_add),
13101310
NB_SLOT(nb_add), "+=");
@@ -1331,7 +1331,7 @@ PyNumber_InPlaceMultiply(PyObject *v, PyObject *w)
13311331
{
13321332
// GraalPy change: upcall when v is managed to avoid multiple upcalls
13331333
if (points_to_py_handle_space(v)) {
1334-
return GraalPyTrufflePyNumber_InPlaceMultiply(v, w);
1334+
return PyTrufflePyNumber_InPlaceMultiply(v, w);
13351335
}
13361336
PyObject *result = BINARY_IOP1(v, w, NB_SLOT(nb_inplace_multiply),
13371337
NB_SLOT(nb_multiply), "*=");
@@ -1364,7 +1364,7 @@ PyNumber_InPlacePower(PyObject *v, PyObject *w, PyObject *z)
13641364
{
13651365
// GraalPy change: upcall when v is managed to avoid multiple upcalls
13661366
if (points_to_py_handle_space(v)) {
1367-
return GraalPyTrufflePyNumber_InPlacePower(v, w, z);
1367+
return PyTrufflePyNumber_InPlacePower(v, w, z);
13681368
}
13691369
return ternary_iop(v, w, z, NB_SLOT(nb_inplace_power),
13701370
NB_SLOT(nb_power), "**=");
@@ -1787,7 +1787,7 @@ PySequence_Size(PyObject *s)
17871787

17881788
// GraalPy change: upcall for managed
17891789
if (points_to_py_handle_space(s)) {
1790-
return GraalPyTruffleSequence_Size(s);
1790+
return PyTruffleSequence_Size(s);
17911791
}
17921792

17931793
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
@@ -1946,7 +1946,7 @@ PySequence_GetItem(PyObject *s, Py_ssize_t i)
19461946

19471947
// GraalPy change: upcall for managed
19481948
if (points_to_py_handle_space(s)) {
1949-
return GraalPyTruffleSequence_GetItem(s, i);
1949+
return PyTruffleSequence_GetItem(s, i);
19501950
}
19511951

19521952
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
@@ -2006,7 +2006,7 @@ PySequence_SetItem(PyObject *s, Py_ssize_t i, PyObject *o)
20062006

20072007
// GraalPy change: upcall for managed
20082008
if (points_to_py_handle_space(s)) {
2009-
return GraalPyTruffleSequence_SetItem(s, i, o);
2009+
return PyTruffleSequence_SetItem(s, i, o);
20102010
}
20112011

20122012
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
@@ -2044,7 +2044,7 @@ PySequence_DelItem(PyObject *s, Py_ssize_t i)
20442044

20452045
// GraalPy change: upcall for managed
20462046
if (points_to_py_handle_space(s)) {
2047-
return GraalPyTruffleSequence_DelItem(s, i);
2047+
return PyTruffleSequence_DelItem(s, i);
20482048
}
20492049

20502050
PySequenceMethods *m = Py_TYPE(s)->tp_as_sequence;
@@ -2240,7 +2240,7 @@ PySequence_Fast(PyObject *v, const char *m)
22402240
}
22412241

22422242
// GraalPy change: different implementation
2243-
return GraalPySequence_List(v);
2243+
return PySequence_List(v);
22442244
}
22452245

22462246
#if 0 // GraalPy change
@@ -2391,7 +2391,7 @@ PyMapping_Size(PyObject *o)
23912391

23922392
// GraalPy change: upcall for managed
23932393
if (points_to_py_handle_space(o)) {
2394-
return GraalPyTruffleMapping_Size(o);
2394+
return PyTruffleMapping_Size(o);
23952395
}
23962396

23972397
PyMappingMethods *m = Py_TYPE(o)->tp_as_mapping;
@@ -2422,7 +2422,7 @@ PyObject *
24222422
PyMapping_GetItemString(PyObject *o, const char *key)
24232423
{
24242424
// GraalPy change: different implementation
2425-
return GraalPyTruffleObject_GetItemString(o, key);
2425+
return PyTruffleObject_GetItemString(o, key);
24262426
}
24272427

24282428
int
@@ -2954,7 +2954,7 @@ PyIter_Send(PyObject *iter, PyObject *arg, PyObject **result)
29542954
return res;
29552955
}
29562956
// GraalPy change: different implementation
2957-
*result = GraalPyTruffleIter_Send(iter, arg);
2957+
*result = PyTruffleIter_Send(iter, arg);
29582958
if (*result != NULL) {
29592959
return PYGEN_NEXT;
29602960
}

‎graalpython/com.oracle.graal.python.cext/src/bytearrayobject.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)
128128
}
129129
// GraalPy change: different implementation
130130
if (bytes != NULL) {
131-
return GraalPyTruffleByteArray_FromStringAndSize(bytes, size);
131+
return PyTruffleByteArray_FromStringAndSize(bytes, size);
132132
}
133-
return GraalPyTruffle_ByteArray_EmptyWithCapacity(size);
133+
return PyTruffle_ByteArray_EmptyWithCapacity(size);
134134
}
135135

136136
Py_ssize_t

‎graalpython/com.oracle.graal.python.cext/src/bytesobject.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,19 @@ PyBytes_FromStringAndSize(const char *str, Py_ssize_t size)
134134
return NULL;
135135
}
136136
if (str != NULL) {
137-
return GraalPyTruffleBytes_FromStringAndSize(str, size);
137+
return PyTruffleBytes_FromStringAndSize(str, size);
138138
}
139-
return GraalPyTruffle_Bytes_EmptyWithCapacity(size);
139+
return PyTruffle_Bytes_EmptyWithCapacity(size);
140140
}
141141

142142
PyObject *
143143
PyBytes_FromString(const char *str)
144144
{
145145
// GraalPy change: different implementation
146146
if (str != NULL) {
147-
return GraalPyTruffleBytes_FromStringAndSize(str, strlen(str));
147+
return PyTruffleBytes_FromStringAndSize(str, strlen(str));
148148
}
149-
return GraalPyTruffle_Bytes_EmptyWithCapacity(0);
149+
return PyTruffle_Bytes_EmptyWithCapacity(0);
150150
}
151151

152152
PyObject *
@@ -293,7 +293,7 @@ PyBytes_FromFormatV(const char *format, va_list vargs)
293293
}
294294
PyTuple_SET_ITEM(args, i, entry);
295295
}
296-
PyObject* result = GraalPyTruffleBytes_FromFormat(format, args);
296+
PyObject* result = PyTruffleBytes_FromFormat(format, args);
297297
Py_DecRef(args);
298298
return result;
299299
}
@@ -1165,10 +1165,10 @@ PyBytes_AsStringAndSize(PyObject *obj,
11651165
return -1;
11661166
}
11671167
if (len != NULL) {
1168-
*len = GraalPyBytes_Size(obj);
1168+
*len = PyBytes_Size(obj);
11691169
return 0;
11701170
} else {
1171-
return GraalPyTruffle_Bytes_CheckEmbeddedNull(obj);
1171+
return PyTruffle_Bytes_CheckEmbeddedNull(obj);
11721172
}
11731173
}
11741174

@@ -2898,7 +2898,7 @@ void
28982898
PyBytes_Concat(PyObject **pv, PyObject *w)
28992899
{
29002900
// GraalPy change: different implementation
2901-
*pv = GraalPyTruffleBytes_Concat(*pv, w);
2901+
*pv = PyTruffleBytes_Concat(*pv, w);
29022902
}
29032903

29042904
void
@@ -2927,7 +2927,7 @@ int
29272927
_PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)
29282928
{
29292929
// GraalPy change: different implementation
2930-
return Graal_PyTruffleBytes_Resize(*pv, newsize);
2930+
return _PyTruffleBytes_Resize(*pv, newsize);
29312931
}
29322932

29332933

0 commit comments

Comments
 (0)