python
diff --git a/‎Include/internal/pycore_object.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_object.h
+1-1Lines changed: 1 addition & 1 deletion b/‎Include/internal/pycore_object.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_object.h
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Include/internal/pycore_opcode_metadata.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_opcode_metadata.h
+2-2Lines changed: 2 additions & 2 deletions b/‎Include/internal/pycore_opcode_metadata.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_opcode_metadata.h
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎Include/internal/pycore_uop_ids.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_uop_ids.h
+104-103Lines changed: 104 additions & 103 deletions b/‎Include/internal/pycore_uop_ids.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_uop_ids.h
+104-103Lines changed: 104 additions & 103 deletions
diff --git a/‎Include/internal/pycore_uop_metadata.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_uop_metadata.h
+6-2Lines changed: 6 additions & 2 deletions b/‎Include/internal/pycore_uop_metadata.h
Copy file name to clipboardExpand all lines: Include/internal/pycore_uop_metadata.h
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/‎Objects/typeobject.c
Copy file name to clipboardExpand all lines: Objects/typeobject.c
+24-19Lines changed: 24 additions & 19 deletions b/‎Objects/typeobject.c
Copy file name to clipboardExpand all lines: Objects/typeobject.c
+24-19Lines changed: 24 additions & 19 deletions
@@ -950,7 +950,7 @@ extern int _PyObject_IsInstanceDictEmpty(PyObject *);
 
 // Export for 'math' shared extension
 PyAPI_FUNC(PyObject*) _PyObject_LookupSpecial(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject*) _PyObject_LookupSpecialMethod(PyObject *self, PyObject *attr, PyObject **self_or_null);
+PyAPI_FUNC(int) _PyObject_LookupSpecialMethod(PyObject *attr, _PyStackRef *method_and_self);
 
 // Calls the method named `attr` on `self`, but does not set an exception if
 // the attribute does not exist.
 
@@ -2794,32 +2794,37 @@ _PyObject_LookupSpecial(PyObject *self, PyObject *attr)
     return res;
 }
 
-/* Steals a reference to self */
-PyObject *
-_PyObject_LookupSpecialMethod(PyObject *self, PyObject *attr, PyObject **self_or_null)
+// Lookup the method name `attr` on `self`. On entry, `method_and_self[0]`
+// is null and `method_and_self[1]` is `self`. On exit, `method_and_self[0]`
+// is the method object and `method_and_self[1]` is `self` if the method is
+// not bound.
+// Return 1 on success, -1 on error, and 0 if the method is missing.
+int
+_PyObject_LookupSpecialMethod(PyObject *attr, _PyStackRef *method_and_self)
 {
-    PyObject *res;
-
-    res = _PyType_LookupRef(Py_TYPE(self), attr);
-    if (res == NULL) {
-        Py_DECREF(self);
-        *self_or_null = NULL;
-        return NULL;
+    PyObject *self = PyStackRef_AsPyObjectBorrow(method_and_self[1]);
+    _PyType_LookupStackRefAndVersion(Py_TYPE(self), attr, &method_and_self[0]);
+    PyObject *method_o = PyStackRef_AsPyObjectBorrow(method_and_self[0]);
+    if (method_o == NULL) {
+        return 0;
     }
 
-    if (_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR)) {
+    if (_PyType_HasFeature(Py_TYPE(method_o), Py_TPFLAGS_METHOD_DESCRIPTOR)) {
         /* Avoid temporary PyMethodObject */
-        *self_or_null = self;
+        return 1;
     }
-    else {
-        descrgetfunc f = Py_TYPE(res)->tp_descr_get;
-        if (f != NULL) {
-            Py_SETREF(res, f(res, self, (PyObject *)(Py_TYPE(self))));
+
+    descrgetfunc f = Py_TYPE(method_o)->tp_descr_get;
+    if (f != NULL) {
+        PyObject *func = f(method_o, self, (PyObject *)(Py_TYPE(self)));
+        if (func == NULL) {
+            return -1;
         }
-        *self_or_null = NULL;
-        Py_DECREF(self);
+        PyStackRef_CLEAR(method_and_self[0]); // clear method
+        method_and_self[0] = PyStackRef_FromPyObjectSteal(func);
     }
-    return res;
+    PyStackRef_CLEAR(method_and_self[1]); // clear self
+    return 1;
 }
 
 static int