GH-131498: Remove conditional stack effects (GH-131499)

* Adds some missing #includes
This commit is contained in:
Mark Shannon 2025-03-20 15:39:38 +00:00 committed by GitHub
parent 443c0cd17c
commit 7ebd71ee14
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 129 additions and 272 deletions

View file

@ -6982,7 +6982,7 @@
_PyStackRef class_st;
_PyStackRef self_st;
_PyStackRef attr;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _LOAD_SUPER_ATTR
{
@ -7078,10 +7078,12 @@
}
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[1];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
stack_pointer[0] = attr;
if (oparg & 1) stack_pointer[1] = null;
stack_pointer += 1 + (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -7840,7 +7842,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_ATTR == 9, "incorrect cache size");
_PyStackRef owner;
_PyStackRef attr;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _CHECK_ATTR_CLASS
{
@ -7876,9 +7878,11 @@
}
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[0];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
if (oparg & 1) stack_pointer[0] = null;
stack_pointer += (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -7897,7 +7901,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_ATTR == 9, "incorrect cache size");
_PyStackRef owner;
_PyStackRef attr;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _CHECK_ATTR_CLASS
{
@ -7943,9 +7947,11 @@
}
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[0];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
if (oparg & 1) stack_pointer[0] = null;
stack_pointer += (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -8022,7 +8028,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_ATTR == 9, "incorrect cache size");
_PyStackRef owner;
_PyStackRef attr;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
{
@ -8078,9 +8084,11 @@
/* Skip 5 cache entries */
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[0];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
if (oparg & 1) stack_pointer[0] = null;
stack_pointer += (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -8270,7 +8278,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_ATTR == 9, "incorrect cache size");
_PyStackRef owner;
_PyStackRef attr;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _LOAD_ATTR_MODULE
{
@ -8321,9 +8329,11 @@
/* Skip 5 cache entries */
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[0];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
if (oparg & 1) stack_pointer[0] = null;
stack_pointer += (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -8552,7 +8562,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_ATTR == 9, "incorrect cache size");
_PyStackRef owner;
_PyStackRef attr;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
{
@ -8599,9 +8609,11 @@
/* Skip 5 cache entries */
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[0];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
if (oparg & 1) stack_pointer[0] = null;
stack_pointer += (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -8620,7 +8632,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_ATTR == 9, "incorrect cache size");
_PyStackRef owner;
_PyStackRef attr;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
{
@ -8700,9 +8712,11 @@
/* Skip 5 cache entries */
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[0];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
if (oparg & 1) stack_pointer[0] = null;
stack_pointer += (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -9080,7 +9094,7 @@
_Py_CODEUNIT* const this_instr = next_instr - 5;
(void)this_instr;
_PyStackRef *res;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
// _SPECIALIZE_LOAD_GLOBAL
{
uint16_t counter = read_u16(&this_instr[1].cache);
@ -9114,9 +9128,11 @@
}
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[1];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
if (oparg & 1) stack_pointer[1] = null;
stack_pointer += 1 + (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -9134,7 +9150,7 @@
INSTRUCTION_STATS(LOAD_GLOBAL_BUILTIN);
static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size");
_PyStackRef res;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _GUARD_GLOBALS_VERSION
{
@ -9191,10 +9207,12 @@
}
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[1];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
stack_pointer[0] = res;
if (oparg & 1) stack_pointer[1] = null;
stack_pointer += 1 + (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -9212,7 +9230,7 @@
INSTRUCTION_STATS(LOAD_GLOBAL_MODULE);
static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size");
_PyStackRef res;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
/* Skip 1 cache entry */
// _NOP
{
@ -9256,10 +9274,12 @@
}
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[1];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
stack_pointer[0] = res;
if (oparg & 1) stack_pointer[1] = null;
stack_pointer += 1 + (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();
@ -9387,7 +9407,7 @@
_PyStackRef class_st;
_PyStackRef self_st;
_PyStackRef attr;
_PyStackRef null = PyStackRef_NULL;
_PyStackRef *null;
// _SPECIALIZE_LOAD_SUPER_ATTR
{
class_st = stack_pointer[-2];
@ -9499,10 +9519,12 @@
}
// _PUSH_NULL_CONDITIONAL
{
null = PyStackRef_NULL;
null = &stack_pointer[1];
if (oparg & 1) {
null[0] = PyStackRef_NULL;
}
}
stack_pointer[0] = attr;
if (oparg & 1) stack_pointer[1] = null;
stack_pointer += 1 + (oparg & 1);
assert(WITHIN_STACK_BOUNDS());
DISPATCH();