May 8, 2025 · May 3, 2025 · May 3, 2025 · May 3, 2025 · May 3, 2025 · May 3, 2025
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
            res = PyStackRef_FromPyObjectSteal(res_o);
        }

        op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused[oparg]-- callable, unused, unused[oparg])) {
        op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused, unused-- callable, unused, unused, unused)) {
            PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
            PyInterpreterState *interp = tstate->interp;
            DEOPT_IF(callable_o != interp->callable_cache.isinstance);
        }

        op(_CALL_ISINSTANCE, (callable, null,args[oparg] -- res)) {
        op(_CALL_ISINSTANCE, (callable, null,inst_, cls -- res)) {
            /* isinstance(o, o2) */
            assert(oparg == 2);
            STAT_INC(CALL, hit);
            PyObject *inst = PyStackRef_AsPyObjectBorrow(args[0]);
            PyObject *cls = PyStackRef_AsPyObjectBorrow(args[1]);
            int retval = PyObject_IsInstance(inst, cls);
            PyObject *inst_o = PyStackRef_AsPyObjectBorrow(inst_);
            PyObject *cls_o = PyStackRef_AsPyObjectBorrow(cls);
            int retval = PyObject_IsInstance(inst_o, cls_o);
            if (retval < 0) {
                ERROR_NO_POP();
            }
            (void)null; // Silence compiler warnings about unused variables
            PyStackRef_CLOSE(cls);
            PyStackRef_CLOSE(inst_);
            DEAD(null);
            PyStackRef_CLOSE(args[0]);
            PyStackRef_CLOSE(args[1]);
            PyStackRef_CLOSE(callable);
            res = retval ? PyStackRef_True : PyStackRef_False;
            assert((!PyStackRef_IsNull(res)) ^ (_PyErr_Occurred(tstate) != NULL));
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
        res = sym_new_type(ctx, &PyLong_Type);
    }

    op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused[oparg]-- callable, unused, unused[oparg])) {
    op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused, unused-- callable, unused, unused, unused)) {
        PyObject *isinstance = _PyInterpreterState_GET()->callable_cache.isinstance;
        if (sym_get_const(ctx, callable) == isinstance) {
            REPLACE_OP(this_instr, _NOP, 0, 0);
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4353,26 +4353,25 @@ dummy_func(
		res = PyStackRef_FromPyObjectSteal(res_o);
		}

		op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused[oparg]-- callable, unused, unused[oparg])) {
		op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused, unused-- callable, unused, unused, unused)) {
		PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
		PyInterpreterState *interp = tstate->interp;
		DEOPT_IF(callable_o != interp->callable_cache.isinstance);
		}

		op(_CALL_ISINSTANCE, (callable, null,args[oparg] -- res)) {
		op(_CALL_ISINSTANCE, (callable, null,inst_, cls -- res)) {
Copy link Member brandtbucherMay 6, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I don't love the trailing underscore. Not a huge deal, but maybe just rename to`instance` or`obj` or something ? Copy link MemberAuthor tomasr8May 8, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I renamed it to`instance` inbe50e24
		/* isinstance(o, o2) */
		assert(oparg == 2);
		STAT_INC(CALL, hit);
		PyObject *inst = PyStackRef_AsPyObjectBorrow(args[0]);
		PyObject *cls = PyStackRef_AsPyObjectBorrow(args[1]);
		int retval = PyObject_IsInstance(inst, cls);
		PyObject *inst_o = PyStackRef_AsPyObjectBorrow(inst_);
		PyObject *cls_o = PyStackRef_AsPyObjectBorrow(cls);
		int retval = PyObject_IsInstance(inst_o, cls_o);
		if (retval < 0) {
		ERROR_NO_POP();
		}
		(void)null; // Silence compiler warnings about unused variables
		PyStackRef_CLOSE(cls);
		PyStackRef_CLOSE(inst_);
Copy link MemberAuthor tomasr8May 3, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Interesting that with named stackrefs it won't let me do this: DEAD(null);PyStackRef_CLOSE(cls);PyStackRef_CLOSE(inst_); (the error is`SyntaxError: Input 'null' is not live, but 'inst_' is`) While with the previous`args` version this was fine: DEAD(null);PyStackRef_CLOSE(args[0]);PyStackRef_CLOSE(args[1]); I guess the cases generator can't reason about arrays? Another reason to use named stackrefs instead :) brandtbucher reacted with thumbs up emoji
		DEAD(null);
		PyStackRef_CLOSE(args[0]);
		PyStackRef_CLOSE(args[1]);
		PyStackRef_CLOSE(callable);
		res = retval ? PyStackRef_True : PyStackRef_False;
		assert((!PyStackRef_IsNull(res)) ^ (_PyErr_Occurred(tstate) != NULL));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1095,7 +1095,7 @@ dummy_func(void) {
		res = sym_new_type(ctx, &PyLong_Type);
		}

		op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused[oparg]-- callable, unused, unused[oparg])) {
		op(_GUARD_CALLABLE_ISINSTANCE, (callable, unused, unused, unused-- callable, unused, unused, unused)) {
		PyObject *isinstance = _PyInterpreterState_GET()->callable_cache.isinstance;
		if (sym_get_const(ctx, callable) == isinstance) {
		REPLACE_OP(this_instr, _NOP, 0, 0);
Expand Down