cleanup

Author: kumaraditya303

Objects/call.c

@@ -871,19 +871,22 @@ PyObject_CallMethodObjArgs(PyObject *obj, PyObject *name, ...)
         return null_error(tstate);
     }
 
-    PyObject *callable = NULL;
-    int is_method = _PyObject_GetMethod(obj, name, &callable);
-    if (callable == NULL) {
+    _PyCStackRef method;
+    _PyThreadState_PushCStackRef(tstate, &method);
+    int is_method = _PyObject_GetMethodStackRef(tstate, obj, name, &method.ref);
+    if (PyStackRef_IsNull(method.ref)) {
+        _PyThreadState_PopCStackRef(tstate, &method);
         return NULL;
     }
+    PyObject *callable = PyStackRef_AsPyObjectBorrow(method.ref);
     obj = is_method ? obj : NULL;
 
     va_list vargs;
     va_start(vargs, name);
     PyObject *result = object_vacall(tstate, obj, callable, vargs);
     va_end(vargs);
 
-    Py_DECREF(callable);
+    _PyThreadState_PopCStackRef(tstate, &method);
     return result;
 }
 
@@ -900,20 +903,23 @@ _PyObject_CallMethodIdObjArgs(PyObject *obj, _Py_Identifier *name, ...)
     if (!oname) {
         return NULL;
     }
-
-    PyObject *callable = NULL;
-    int is_method = _PyObject_GetMethod(obj, oname, &callable);
-    if (callable == NULL) {
+    _PyCStackRef method;
+    _PyThreadState_PushCStackRef(tstate, &method);
+    int is_method = _PyObject_GetMethodStackRef(tstate, obj, oname, &method.ref);
+    if (PyStackRef_IsNull(method.ref)) {
+        _PyThreadState_PopCStackRef(tstate, &method);
         return NULL;
     }
+    PyObject *callable = PyStackRef_AsPyObjectBorrow(method.ref);
+
     obj = is_method ? obj : NULL;
 
     va_list vargs;
     va_start(vargs, name);
     PyObject *result = object_vacall(tstate, obj, callable, vargs);
     va_end(vargs);
 
-    Py_DECREF(callable);
+    _PyThreadState_PopCStackRef(tstate, &method);
     return result;
 }
 

Objects/object.c

@@ -1670,7 +1670,6 @@ _PyObject_GetMethodStackRef(PyThreadState *ts, PyObject *obj,
 {
     int meth_found = 0;
 
-    int ret = 0;
     assert(PyStackRef_IsNull(*method));
 
     PyTypeObject *tp = Py_TYPE(obj);
@@ -1703,7 +1702,7 @@ _PyObject_GetMethodStackRef(PyThreadState *ts, PyObject *obj,
                 if (value != NULL) {
                     *method = PyStackRef_FromPyObjectSteal(value);
                 }
-                goto exit;
+                return 0;
             }
         }
     }
@@ -1713,7 +1712,7 @@ _PyObject_GetMethodStackRef(PyThreadState *ts, PyObject *obj,
         if (attr != NULL) {
            PyStackRef_CLEAR(*method);
            *method = PyStackRef_FromPyObjectSteal(attr);
-           goto exit;
+           return 0;
         }
         dict = NULL;
     }
@@ -1740,16 +1739,15 @@ _PyObject_GetMethodStackRef(PyThreadState *ts, PyObject *obj,
             if (value != NULL) {
                 *method = PyStackRef_FromPyObjectSteal(value);
             }
-            goto exit;
+            return 0;
         }
         // not found
         Py_DECREF(dict);
     }
 
     if (meth_found) {
-        ret = 1;
         assert(!PyStackRef_IsNull(*method));
-        goto exit;
+        return 1;
     }
 
     if (f != NULL) {
@@ -1758,22 +1756,21 @@ _PyObject_GetMethodStackRef(PyThreadState *ts, PyObject *obj,
         if (value) {
             *method = PyStackRef_FromPyObjectSteal(value);
         }
-        goto exit;
+        return 0;
     }
 
     if (descr != NULL) {
         assert(!PyStackRef_IsNull(*method));
-        goto exit;
+        return 0;
     }
 
     PyErr_Format(PyExc_AttributeError,
                  "'%.100s' object has no attribute '%U'",
                  tp->tp_name, name);
 
     _PyObject_SetAttributeErrorContext(obj, name);
-    PyStackRef_CLEAR(*method);
-exit:
-    return ret;
+    assert(PyStackRef_IsNull(*method));
+    return 0;
 }