misc tweaks

python · tom-pytel · Jan 29, 2025 · Jan 29, 2025 · Jan 29, 2025 · Jan 29, 2025
commit e794467bec5133e538ef7e3b6fbd3b269a672d15
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -928,9 +928,11 @@ _Py_set_function_type_params(PyThreadState *ts, PyObject *func,
    assert(PyTuple_Check(type_params));
    PyFunctionObject *f = (PyFunctionObject *)func;
    Py_XSETREF(f->func_typeparams, Py_NewRef(type_params));
-    if (_Py_set_type_params_owner(ts, func) == NULL) {
+    PyObject *res = _Py_set_type_params_owner(ts, func);
+    if (res == NULL) {
        return NULL;
    }
+    Py_DECREF(res);
    return Py_NewRef(func);
 }


@@ -483,12 +483,7 @@ typeparam_reduce_anonymous(PyObject *self, PyObject *owner)
    if (module == NULL) {
        goto done;
    }
-    PyObject *attrsep = PyUnicode_FromString(".");
-    if (attrsep == NULL) {
-        goto done;
-    }
-    path = PyUnicode_Split(qualname, attrsep, -1);
-    Py_DECREF(attrsep);
+    path = PyUnicode_Split(qualname, _Py_LATIN1_CHR('.'), -1);
    if (path == NULL) {
        goto done;
    }
@@ -2541,7 +2536,8 @@ _Py_set_type_params_owner(PyThreadState *ts, PyObject *owner)
        goto done;
    }
    if (set_type_params_owner(ts, type_params, owner) == 0) {
-        ret = Py_None;
+        Py_INCREF(owner);
+        ret = owner;
    }
 done:
    Py_XDECREF(type_params);

@@ -1594,10 +1594,7 @@ codegen_class(compiler *c, stmt_ty s)
                                                             s->v.ClassDef.bases,
                                                             &_Py_STR(generic_base),
                                                             s->v.ClassDef.keywords));
-
-        ADDOP_I(c, loc, COPY, 1);
        ADDOP_I_IN_SCOPE(c, loc, CALL_INTRINSIC_1, INTRINSIC_SET_TYPE_PARAMS_OWNER);
-        ADDOP(c, loc, POP_TOP);

        PyCodeObject *co = _PyCompile_OptimizeAndAssemble(c, 0);