summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Python/executor_cases.c.h2
-rw-r--r--Python/generated_cases.c.h6
-rw-r--r--Tools/cases_generator/stacking.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index a7b5054..5e3c84b 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1513,7 +1513,7 @@
Py_DECREF(self);
if (attr == NULL) goto pop_3_error;
STACK_SHRINK(2);
- stack_pointer[-1 - (0 ? 1 : 0)] = attr;
+ stack_pointer[-1] = attr;
break;
}
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index ccf43c7..2661a39 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -2251,7 +2251,7 @@
Py_DECREF(self);
if (attr == NULL) goto pop_3_error;
STACK_SHRINK(2);
- stack_pointer[-1 - (0 ? 1 : 0)] = attr;
+ stack_pointer[-1] = attr;
next_instr += 1;
DISPATCH();
}
@@ -3574,7 +3574,7 @@
assert(descr != NULL);
Py_DECREF(owner);
attr = Py_NewRef(descr);
- stack_pointer[-1 - (0 ? 1 : 0)] = attr;
+ stack_pointer[-1] = attr;
next_instr += 9;
DISPATCH();
}
@@ -3594,7 +3594,7 @@
assert(descr != NULL);
Py_DECREF(owner);
attr = Py_NewRef(descr);
- stack_pointer[-1 - (0 ? 1 : 0)] = attr;
+ stack_pointer[-1] = attr;
next_instr += 9;
DISPATCH();
}
diff --git a/Tools/cases_generator/stacking.py b/Tools/cases_generator/stacking.py
index d457ce0..9bb7f46 100644
--- a/Tools/cases_generator/stacking.py
+++ b/Tools/cases_generator/stacking.py
@@ -61,14 +61,14 @@ class StackOffset:
for eff in self.deep:
if eff.size:
terms.append(("-", maybe_parenthesize(eff.size)))
- elif eff.cond and eff.cond != "1":
+ elif eff.cond and eff.cond not in ("0", "1"):
terms.append(("-", f"({parenthesize_cond(eff.cond)} ? 1 : 0)"))
elif eff.cond != "0":
num -= 1
for eff in self.high:
if eff.size:
terms.append(("+", maybe_parenthesize(eff.size)))
- elif eff.cond and eff.cond != "1":
+ elif eff.cond and eff.cond not in ("0", "1"):
terms.append(("+", f"({parenthesize_cond(eff.cond)} ? 1 : 0)"))
elif eff.cond != "0":
num += 1