make sure we also close callable

Author: noamcohen97

Include/internal/pycore_opcode_metadata.h

@@ -4349,7 +4349,7 @@ dummy_func(
             DEOPT_IF(callable_o != interp->callable_cache.isinstance);
         }
 
-        op(_CALL_ISINSTANCE, (callable, null, instance, cls -- res, i, c)) {
+        op(_CALL_ISINSTANCE, (callable, null, instance, cls -- res, c1, i, c2)) {
             /* isinstance(o, o2) */
             STAT_INC(CALL, hit);
             PyObject *inst_o = PyStackRef_AsPyObjectBorrow(instance);
@@ -4359,8 +4359,9 @@ dummy_func(
                 ERROR_NO_POP();
             }
             INPUTS_DEAD();
+            c1 = callable;
             i = instance;
-            c = cls;
+            c2 = cls;
             res = retval ? PyStackRef_True : PyStackRef_False;
             assert((!PyStackRef_IsNull(res)) ^ (_PyErr_Occurred(tstate) != NULL));
         }
@@ -4372,6 +4373,7 @@ dummy_func(
             _GUARD_CALLABLE_ISINSTANCE +
             _CALL_ISINSTANCE +
             POP_TOP +
+            POP_TOP +
             POP_TOP;
 
         macro(CALL_LIST_APPEND) =
@@ -5360,17 +5362,17 @@ dummy_func(
             value = PyStackRef_FromPyObjectBorrow(ptr);
         }
 
-        tier2 op(_SWAP_CALL_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null, instance, cls -- value, i, c)) {
+        tier2 op(_SWAP_CALL_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null, instance, cls -- value, c1, i, c2)) {
             PyStackRef_CLOSE(cls);
             PyStackRef_CLOSE(instance);
             (void)null; // Silence compiler warnings about unused variables
-            (void)callable;
             DEAD(null);
-            DEAD(callable);
+            PyStackRef_CLOSE(callable);
             assert(_Py_IsImmortal(PyStackRef_AsPyObjectBorrow(callable)));
             value = PyStackRef_FromPyObjectBorrow(ptr);
+            c1 = callable;
             i = instance;
-            c = cls;
+            c2 = cls;
         }
 
         tier2 op(_LOAD_CONST_UNDER_INLINE, (ptr/4, old -- value, new)) {

Python/bytecodes.c

@@ -567,10 +567,11 @@ dummy_func(void) {
         value = PyJitRef_Borrow(sym_new_const(ctx, ptr));
     }
 
-    op(_SWAP_CALL_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, unused, unused, instance, cls -- value, i, c)) {
+    op(_SWAP_CALL_TWO_LOAD_CONST_INLINE_BORROW, (ptr/4, callable, null, instance, cls -- value, c1, i, c2)) {
         value = PyJitRef_Borrow(sym_new_const(ctx, ptr));
+        c1 = callable;
         i = instance;
-        c = cls;
+        c2 = cls;
     }
 
     op(_POP_TOP, (value -- )) {
@@ -1003,7 +1004,7 @@ dummy_func(void) {
         }
     }
 
-    op(_CALL_ISINSTANCE, (unused, unused, instance, cls -- res, unused, unused)) {
+    op(_CALL_ISINSTANCE, (unused, unused, instance, cls -- res, unused, unused, unused)) {
         // the result is always a bool, but sometimes we can
         // narrow it down to True or False
         res = sym_new_type(ctx, &PyBool_Type);