mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-124787: Fix TypeAliasType and incorrect type_params (#124795)

Browse source 
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
This commit is contained in:
sobolevn 2024-10-11 17:39:18 +03:00 • committed by GitHub
parent b3aa1b5fe2
commit 2115d76acc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 134 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

99
Objects/typevarobject.c
View file

@ -1799,6 +1799,24 @@ _Py_make_typevartuple(PyThreadState *Py_UNUSED(ignored), PyObject *v)
return (PyObject *)typevartuple_alloc(v, NULL, NULL);
}
static PyObject *
get_type_param_default(PyThreadState *ts, PyObject *typeparam) {
// Does not modify refcount of existing objects.
if (Py_IS_TYPE(typeparam, ts->interp->cached_objects.typevar_type)) {
return typevar_default((typevarobject *)typeparam, NULL);
}
else if (Py_IS_TYPE(typeparam, ts->interp->cached_objects.paramspec_type)) {
return paramspec_default((paramspecobject *)typeparam, NULL);
}
else if (Py_IS_TYPE(typeparam, ts->interp->cached_objects.typevartuple_type)) {
return typevartuple_default((typevartupleobject *)typeparam, NULL);
}
else {
PyErr_Format(PyExc_TypeError, "Expected a type param, got %R", typeparam);
return NULL;
}
}
static void
typealias_dealloc(PyObject *self)
{
@ -1906,6 +1924,65 @@ static PyGetSetDef typealias_getset[] = {
{0}
};
static PyObject *
typealias_check_type_params(PyObject *type_params, int *err) {
// Can return type_params or NULL without exception set.
// Does not change the reference count of type_params,
// sets `*err` to 1 when error happens and sets an exception,
// otherwise `*err` is set to 0.
*err = 0;
if (type_params == NULL) {
return NULL;
}
assert(PyTuple_Check(type_params));
Py_ssize_t length = PyTuple_GET_SIZE(type_params);
if (!length) { // 0-length tuples are the same as `NULL`.
return NULL;
}
PyThreadState *ts = _PyThreadState_GET();
int default_seen = 0;
for (Py_ssize_t index = 0; index < length; index++) {
PyObject *type_param = PyTuple_GET_ITEM(type_params, index);
PyObject *dflt = get_type_param_default(ts, type_param);
if (dflt == NULL) {
*err = 1;
return NULL;
}
if (dflt == &_Py_NoDefaultStruct) {
if (default_seen) {
*err = 1;
PyErr_Format(PyExc_TypeError,
"non-default type parameter '%R' "
"follows default type parameter",
type_param);
return NULL;
}
} else {
default_seen = 1;
Py_DECREF(dflt);
}
}
return type_params;
}
static PyObject *
typelias_convert_type_params(PyObject *type_params)
{
if (
type_params == NULL
|| Py_IsNone(type_params)
|| (PyTuple_Check(type_params) && PyTuple_GET_SIZE(type_params) == 0)
) {
return NULL;
}
else {
return type_params;
}
}
static typealiasobject *
typealias_alloc(PyObject *name, PyObject *type_params, PyObject *compute_value,
PyObject *value, PyObject *module)
@ -1915,16 +1992,7 @@ typealias_alloc(PyObject *name, PyObject *type_params, PyObject *compute_value,
return NULL;
}
ta->name = Py_NewRef(name);
if (
type_params == NULL
|| Py_IsNone(type_params)
|| (PyTuple_Check(type_params) && PyTuple_GET_SIZE(type_params) == 0)
) {
ta->type_params = NULL;
}
else {
ta->type_params = Py_NewRef(type_params);
}
ta->type_params = Py_XNewRef(type_params);
ta->compute_value = Py_XNewRef(compute_value);
ta->value = Py_XNewRef(value);
ta->module = Py_XNewRef(module);
@ -2002,11 +2070,18 @@ typealias_new_impl(PyTypeObject *type, PyObject *name, PyObject *value,
PyErr_SetString(PyExc_TypeError, "type_params must be a tuple");
return NULL;
}
int err = 0;
PyObject *checked_params = typealias_check_type_params(type_params, &err);
if (err) {
return NULL;
}
PyObject *module = caller();
if (module == NULL) {
return NULL;
}
PyObject *ta = (PyObject *)typealias_alloc(name, type_params, NULL, value,
PyObject *ta = (PyObject *)typealias_alloc(name, checked_params, NULL, value,
module);
Py_DECREF(module);
return ta;
@ -2072,7 +2147,7 @@ _Py_make_typealias(PyThreadState* unused, PyObject *args)
assert(PyTuple_GET_SIZE(args) == 3);
PyObject *name = PyTuple_GET_ITEM(args, 0);
assert(PyUnicode_Check(name));
PyObject *type_params = PyTuple_GET_ITEM(args, 1);
PyObject *type_params = typelias_convert_type_params(PyTuple_GET_ITEM(args, 1));
PyObject *compute_value = PyTuple_GET_ITEM(args, 2);
assert(PyFunction_Check(compute_value));
return (PyObject *)typealias_alloc(name, type_params, compute_value, NULL, NULL);