Skip to content

gh-148675: Optimize arraydescr structure: use char[3] #149455

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
encukou merged 1 commit into from
May 6, 2026
+7 −7
Merged

gh-148675: Optimize arraydescr structure: use char[3] #149455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions Modules/arraymodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static struct PyModuleDef arraymodule;
* functions aren't visible yet.
*/
struct arraydescr {
const char *typecode;
char typecode[3]; // big enough to store "Zd\0"
int itemsize;
PyObject * (*getitem)(struct arrayobject *, Py_ssize_t);
int (*setitem)(struct arrayobject *, Py_ssize_t, PyObject *);
Expand Down Expand Up @@ -784,7 +784,7 @@ static const struct arraydescr descriptors[] = {
{"d", sizeof(double), d_getitem, d_setitem, NULL, 0, 0},
{"Zf", 2*sizeof(float), cf_getitem, cf_setitem, NULL, 0, 0},
{"Zd", 2*sizeof(double), cd_getitem, cd_setitem, NULL, 0, 0},
{NULL, 0, 0, 0, 0, 0, 0} /* Sentinel */
{"", 0, 0, 0, 0, 0, 0} /* Sentinel */
};

/****************************************************************************
Expand Down Expand Up @@ -2298,12 +2298,12 @@ array__array_reconstructor_impl(PyObject *module, PyTypeObject *arraytype,
arraytype->tp_name, state->ArrayType->tp_name);
return NULL;
}
for (descr = descriptors; descr->typecode != NULL; descr++) {
for (descr = descriptors; descr->typecode[0] != 0; descr++) {
if (strcmp(descr->typecode, typecode) == 0) {
break;
}
}
if (descr->typecode == NULL) {
if (descr->typecode[0] == 0) {
PyErr_SetString(PyExc_ValueError,
"second argument must be a valid type code");
return NULL;
Expand Down Expand Up @@ -2500,7 +2500,7 @@ array__array_reconstructor_impl(PyObject *module, PyTypeObject *arraytype,
*
* XXX: Is it possible to write a unit test for this?
*/
for (descr = descriptors; descr->typecode != NULL; descr++) {
for (descr = descriptors; descr->typecode[0] != 0; descr++) {
if (descr->is_integer_type &&
(size_t)descr->itemsize == mf_descr.size &&
descr->is_signed == mf_descr.is_signed)
Expand Down Expand Up @@ -3047,7 +3047,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
*/
initial = NULL;
}
for (descr = descriptors; descr->typecode != NULL; descr++) {
for (descr = descriptors; descr->typecode[0] != 0; descr++) {
if (strcmp(descr->typecode, s) == 0) {
PyObject *a;
Py_ssize_t len;
Expand Down Expand Up @@ -3531,7 +3531,7 @@ array_modexec(PyObject *m)
if (typecodes == NULL) {
return -1;
}
for (descr = descriptors; descr->typecode != NULL; descr++) {
for (descr = descriptors; descr->typecode[0] != 0; descr++) {
PyObject *typecode = PyUnicode_DecodeASCII(descr->typecode, strlen(descr->typecode), NULL);
if (typecode == NULL) {
Py_DECREF(typecodes);
Expand Down
Loading