8000 gh-132097: allow AC to disable fastcall convention to avoid UBSan failures by picnixz · Pull Request #131605 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-132097: allow AC to disable fastcall convention to avoid UBSan failures #131605

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
merged 19 commits into from
Apr 18, 2025
Merged

gh-132097: allow AC to disable fastcall convention to avoid UBSan failures #131605

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ea6e46b
remove unused casts by clinic
picnixz Mar 20, 2025
4001c73
fixup
picnixz Mar 20, 2025
1480166
Revert "fixup"
picnixz Mar 20, 2025
a737ca5
fixup
picnixz Mar 20, 2025
6f20fc9
fixup
picnixz Mar 20, 2025
45f38a7
Merge remote-tracking branch 'upstream/main' into fix/ubsan/clinic-te…
picnixz Mar 23, 2025
1331a3e
move comments
picnixz Mar 23, 2025
df2d466
move comments
picnixz Mar 23, 2025
dfe5c9d
Merge remote-tracking branch 'upstream/main' into fix/ubsan/clinic-te…
picnixz Mar 24, 2025
d032ba0
revert cast removal
picnixz Mar 24, 2025
abd0f7c
make clinic
picnixz Mar 24, 2025
54a80c8
Merge remote-tracking branch 'upstream/main' into fix/ubsan/clinic-te…
picnixz Apr 3, 2025
8000
18022f3
Merge remote-tracking branch 'upstream/main' into fix/ubsan/clinic-te…
picnixz Apr 4, 2025
0b437c4
GH-131498: Cases generator: manage stacks automatically (GH-132074)
markshannon Apr 4, 2025
e115ce3
gh-99108: Implement HACL* HMAC (#130157)
picnixz Apr 4, 2025
5695216
Merge branch 'main' into fix/ubsan/clinic-test-111178
picnixz Apr 5, 2025
107983d
Merge remote-tracking branch 'upstream/main' into fix/ubsan/clinic-te…
picnixz Apr 5, 2025
65c64bc
check arguments given to the 'disable' directive
picnixz Apr 5, 2025
eec145e
Merge branch 'main' into fix/ubsan/clinic-test-111178
picnixz Apr 5, 2025
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
Apply and reload
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
@picnixz
picnixz committed Mar 20, 2025
commit 4001c734022088eba7a403dc01fe6645dd3276fe
71 changes: 32 additions & 39 deletions Modules/_testclinic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1444,26 +1444,24 @@ _testclinic_TestClass_defclass_posonly_varpos_impl(PyObject *self,


/*[clinic input]
@disable fastcall
@classmethod
_testclinic.TestClass.class_method as varpos_no_fastcall
_testclinic.TestClass.__new__ as varpos_no_fastcall

*args: tuple

[clinic start generated code]*/

static PyObject *
varpos_no_fastcall_impl(PyTypeObject *type, PyObject *args)
/*[clinic end generated code: output=04e94f2898bb2dde input=10c2251e9ac6baf3]*/
/*[clinic end generated code: output=04e94f2898bb2dde input=c5d3d30a6589f97f]*/
{
return Py_NewRef(args);
}


/*[clinic input]
@disable fastcall
@classmethod
_testclinic.TestClass.class_method as posonly_varpos_no_fastcall
_testclinic.TestClass.__new__ as posonly_varpos_no_fastcall

a: object
b: object
Expand All @@ -1475,16 +1473,15 @@ _testclinic.TestClass.class_method as posonly_varpos_no_fastcall
static PyObject *
posonly_varpos_no_fastcall_impl(PyTypeObject *type, PyObject *a, PyObject *b,
PyObject *args)
/*[clinic end generated code: output=b0a0425719f69f5a input=f7c75501a787c7af]*/
/*[clinic end generated code: output=b0a0425719f69f5a input=10f29f2c2c6bfdc4]*/
{
return pack_arguments_newref(3, a, b, args);
}


/*[clinic input]
@disable fastcall
@classmethod
_testclinic.TestClass.class_method as posonly_req_opt_varpos_no_fastcall
_testclinic.TestClass.__new__ as posonly_req_opt_varpos_no_fastcall

a: object
b: object = False
Expand All @@ -1496,16 +1493,15 @@ _testclinic.TestClass.class_method as posonly_req_opt_varpos_no_fastcall
static PyObject *
posonly_req_opt_varpos_no_fastcall_impl(PyTypeObject *type, PyObject *a,
PyObject *b, PyObject *args)
/*[clinic end generated code: output=3c44915b1a554e2d input=701bf93e7572e6b3]*/
/*[clinic end generated code: output=3c44915b1a554e2d input=d319302a8748147c]*/
{
return pack_arguments_newref(3, a, b, args);
}


/*[clinic input]
@disable fastcall
@classmethod
_testclinic.TestClass.class_method as posonly_poskw_varpos_no_fastcall
_testclinic.TestClass.__new__ as posonly_poskw_varpos_no_fastcall

a: object
/
Expand All @@ -1517,16 +1513,15 @@ _testclinic.TestClass.class_method as posonly_poskw_varpos_no_fastcall
static PyObject *
posonly_poskw_varpos_no_fastcall_impl(PyTypeObject *type, PyObject *a,
PyObject *b, PyObject *args)
/*[clinic end generated code: output=6ad74bed4bdc7f96 input=2bbbc74dc92ba7ba]*/
/*[clinic end generated code: output=6ad74bed4bdc7f96 input=1f8c113e749414a3]*/
{
return pack_arguments_newref(3, a, b, args);
}


/*[clinic input]
@disable fastcall
@classmethod
_testclinic.TestClass.class_method as varpos_array_no_fastcall
_testclinic.TestClass.__new__ as varpos_array_no_fastcall

*args: array

Expand All @@ -1535,16 +1530,15 @@ _testclinic.TestClass.class_method as varpos_array_no_fastcall
static PyObject *
varpos_array_no_fastcall_impl(PyTypeObject *type, PyObject * const *args,
Py_ssize_t args_length)
/*[clinic end generated code: output=f99d984346c60d42 input=de625878254ecac0]*/
/*[clinic end generated code: output=f99d984346c60d42 input=368d8eea6de48c12]*/
{
return _PyTuple_FromArray(args, args_length);
}


/*[clinic input]
@disable fastcall
@classmethod
_testclinic.TestClass.class_method as posonly_varpos_array_no_fastcall
_testclinic.TestClass.__new__ as posonly_varpos_array_no_fastcall

a: object
b: object
Expand All @@ -1557,16 +1551,15 @@ static PyObject *
posonly_varpos_array_no_fastcall_impl(PyTypeObject *type, PyObject *a,
PyObject *b, PyObject * const *args,
Py_ssize_t args_length)
/*[clinic end generated code: output=1eec4da1fb5b5978 input=15adeb514423f485]*/
/*[clinic end generated code: output=1eec4da1fb5b5978 input=7330c8d819a23548]*/
{
return pack_arguments_2pos_varpos(a, b, args, args_length);
}


/*[clinic input]
@disable fastcall
@classmethod
_testclinic.TestClass.class_method as posonly_req_opt_varpos_array_no_fastcall
_testclinic.TestClass.__new__ as posonly_req_opt_varpos_array_no_fastcall

a: object
b: object = False
Expand All @@ -1580,16 +1573,15 @@ posonly_req_opt_varpos_array_no_fastcall_impl(PyTypeObject *type,
PyObject *a, PyObject *b,
PyObject * const *args,
Py_ssize_t args_length)
/*[clinic end generated code: output=88041c2176135218 input=445ff173a49709d5]*/
/*[clinic end generated code: output=88041c2176135218 input=7f5fd34ee5f9e0bf]*/
{
return pack_arguments_2pos_varpos(a, b, args, args_length);
}


/*[clinic input]
@disable fastcall
@classmethod
_testclinic.TestClass.class_method as posonly_poskw_varpos_array_no_fastcall
_testclinic.TestClass.__new__ as posonly_poskw_varpos_array_no_fastcall

a: object
/
Expand All @@ -1603,7 +1595,7 @@ posonly_poskw_varpos_array_no_fastcall_impl(PyTypeObject *type, PyObject *a,
PyObject *b,
PyObject * const *args,
Py_ssize_t args_length)
/*[clinic end generated code: output=70eda18c3667681e input=c0ac0f6b990f553c]*/
/*[clinic end generated code: output=70eda18c3667681e input=2b0fcd7bd9bb865c]*/
{
return pack_arguments_2pos_varpos(a, b, args, args_length);
}
Expand All @@ -1614,27 +1606,28 @@ static struct PyMethodDef test_class_methods[] = {
_TESTCLINIC_TESTCLASS_DEFCLASS_VARPOS_METHODDEF
_TESTCLINIC_TESTCLASS_DEFCLASS_POSONLY_VARPOS_METHODDEF

{"varpos_no_fastcall", _PyCFunction_CAST(varpos_no_fastcall),
METH_VARARGS|METH_CLASS, ""},
{"posonly_varpos_no_fastcall", _PyCFunction_CAST(posonly_varpos_no_fastcall),
METH_VARARGS|METH_CLASS, ""},
{"posonly_req_opt_varpos_no_fastcall", _PyCFunction_CAST(posonly_req_opt_varpos_no_fastcall),
METH_VARARGS|METH_CLASS, ""},
{"posonly_poskw_varpos_no_fastcall", _PyCFunction_CAST(posonly_poskw_varpos_no_fastcall),
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
{"varpos_no_fastcall", varpos_no_fastcall,
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
{"posonly_varpos_no_fastcall", posonly_varpos_no_fastcall,
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
{"posonly_req_opt_varpos_no_fastcall", posonly_req_opt_varpos_no_fastcall,
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
{"posonly_poskw_varpos_no_fastcall",
_PyCFunction_CAST(posonly_poskw_varpos_no_fastcall),
METH_VARARGS|METH_KEYWORDS|METH_CLASS, PyDoc_STR("")},

{"varpos_array_no_fastcall",
_PyCFunction_CAST(varpos_array_no_fastcall),
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
varpos_array_no_fastcall,
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
{"posonly_varpos_array_no_fastcall",
_PyCFunction_CAST(posonly_varpos_array_no_fastcall),
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
posonly_varpos_array_no_fastcall,
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
{"posonly_req_opt_varpos_array_no_fastcall",
_PyCFunction_CAST(posonly_req_opt_varpos_array_no_fastcall),
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
posonly_req_opt_varpos_array_no_fastcall,
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
{"posonly_poskw_varpos_array_no_fastcall",
_PyCFunction_CAST(posonly_poskw_varpos_array_no_fastcall),
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
METH_VARARGS|METH_KEYWORDS|METH_CLASS, PyDoc_STR("")},

{NULL, NULL}
};
Expand Down
Loading
0