Use the stack size from the code object and the CO_MAXBLOCKS constant
from compile.h. Remove all eval stack overflow checks.
diff --git a/Python/ceval.c b/Python/ceval.c
index 816973f..dbfaf7d 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -364,8 +364,10 @@
#define BASIC_PUSH(v) (*stack_pointer++ = (v))
#define BASIC_POP() (*--stack_pointer)
+#if 0
#define CHECK_STACK(n) (STACK_LEVEL() + (n) < f->f_nvalues || \
(stack_pointer = extend_stack(f, STACK_LEVEL(), n)))
+#endif
#ifdef LLTRACE
#define PUSH(v) (BASIC_PUSH(v), lltrace && prtrace(TOP(), "push"))
@@ -403,8 +405,8 @@
globals, /*globals*/
locals, /*locals*/
owner, /*owner*/
- 50, /*nvalues*/
- 20); /*nblocks*/
+ co->co_stacksize, /*nvalues*/
+ CO_MAXBLOCKS); /*nblocks*/
if (f == NULL)
return NULL;
@@ -626,10 +628,12 @@
}
#endif
+#ifdef CHECK_STACK
if (!CHECK_STACK(3)) {
x = NULL;
break;
}
+#endif
/* Main switch on opcode */
@@ -1097,10 +1101,12 @@
why = WHY_EXCEPTION;
}
else {
+#ifdef CHECK_STACK
if (!CHECK_STACK(oparg)) {
x = NULL;
break;
}
+#endif
for (; --oparg >= 0; ) {
w = GETTUPLEITEM(v, oparg);
INCREF(w);
@@ -1122,10 +1128,12 @@
why = WHY_EXCEPTION;
}
else {
+#ifdef CHECK_STACK
if (!CHECK_STACK(oparg)) {
x = NULL;
break;
}
+#endif
for (; --oparg >= 0; ) {
w = getlistitem(v, oparg);
INCREF(w);