Fix 3.12 super implementation

DinoV · facebook-github-bot · commit 164f351bc115 · 2025-03-28T14:11:04.000-07:00
Summary: Fixes a couple of issues which are causing `test_super` to fail on 3.12: 1) We don't actually respect the global super object at all! We are using the exported Cinder function to implement this on 3.10, but just calling the equivalent of `Ci_Super_Lookup` on 3.12. Because we need to have the `global_super != &PySuper_Type` logic on 3.12 this just brings it over and stops exporting it from Cinder 3.10. 3) We get `no_args_in_super_call` backwards as oparg is effectively the number of arguments. 2) Ports the fix in python/cpython#106977 to the implementation of super in both the JIT and Cinder 3.10. Reviewed By: alexmalyshev Differential Revision: D71638145 fbshipit-source-id: 0f5a189d8cea573034e578c921925ce2988c3bb1
diff --git a/Include/cinder/exports.h b/Include/cinder/exports.h
@@ -168,11 +168,6 @@ CiAPI_FUNC(PyFrameObject *)
     Cix_PyEval_MakeFrameVector(PyThreadState *tstate, PyFrameConstructor *con,
                                PyObject *locals, PyObject *const *args,
                                Py_ssize_t argcount, PyObject *kwnames);
-CiAPI_FUNC(PyObject *)
-    Cix_SuperLookupMethodOrAttr(PyThreadState *tstate, PyObject *global_super,
-                                PyTypeObject *type, PyObject *self,
-                                PyObject *name, int call_no_args,
-                                int *meth_found);
 CiAPI_FUNC(void) Cix_format_exc_check_arg(PyThreadState *, PyObject *,
                                           const char *, PyObject *);
 CiAPI_FUNC(PyObject *)
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1614,7 +1614,7 @@ super_lookup_method_or_attr(PyThreadState *tstate,
         }
         return result;
     }
-    if (type->tp_getattro != PyObject_GenericGetAttr) {
+    if (Py_TYPE(self)->tp_getattro != PyObject_GenericGetAttr) {
         meth_found = NULL;
     }
     return Ci_Super_Lookup(type, self, name, NULL, meth_found);
@@ -6469,19 +6469,6 @@ Cix_format_exc_check_arg(PyThreadState *tstate, PyObject *exc,
     format_exc_check_arg(tstate, exc, format_str, obj);
 }
 
-PyObject *
-Cix_SuperLookupMethodOrAttr(PyThreadState *tstate,
-                           PyObject *global_super,
-                           PyTypeObject *type,
-                           PyObject *self,
-                           PyObject *name,
-                           int call_no_args,
-                           int *meth_found)
-{
-    return super_lookup_method_or_attr(
-        tstate, global_super, type, self, name, call_no_args, meth_found);
-}
-
 int
 Cix_eval_frame_handle_pending(PyThreadState *tstate) {
     return eval_frame_handle_pending(tstate);
