gh-145866: Convert _CALL_METHOD_DESCRIPTOR_NOARGS to leave its inputs on the stack to be cleaned up by _POP_TOP (GH-148227)

This commit is contained in:
Sacul 2026-04-08 23:21:37 +08:00 committed by GitHub
parent d2fa4b2b13
commit bb03c8bd02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 140 additions and 74 deletions

View file

@ -4314,9 +4314,13 @@
}
case _CALL_METHOD_DESCRIPTOR_NOARGS: {
JitOptRef *args;
JitOptRef self_or_null;
JitOptRef callable;
JitOptRef res;
JitOptRef c;
JitOptRef s;
args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
PyObject *callable_o = sym_get_const(ctx, callable);
@ -4327,19 +4331,38 @@
ADD_OP(_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE, oparg + 1, (uintptr_t)cfunc);
}
res = sym_new_not_null(ctx);
CHECK_STACK_BOUNDS(-1 - oparg);
c = callable;
if (sym_is_not_null(self_or_null)) {
args--;
s = args[0];
}
else if (sym_is_null(self_or_null)) {
s = args[0];
}
else {
s = sym_new_unknown(ctx);
}
CHECK_STACK_BOUNDS(1 - oparg);
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
stack_pointer[-1 - oparg] = c;
stack_pointer[-oparg] = s;
stack_pointer += 1 - oparg;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}
case _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE: {
JitOptRef res;
JitOptRef c;
JitOptRef s;
res = sym_new_not_null(ctx);
CHECK_STACK_BOUNDS(-oparg);
c = sym_new_not_null(ctx);
s = sym_new_not_null(ctx);
CHECK_STACK_BOUNDS(2 - oparg);
stack_pointer[-1 - oparg] = res;
stack_pointer += -oparg;
stack_pointer[-oparg] = c;
stack_pointer[1 - oparg] = s;
stack_pointer += 2 - oparg;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}