JUMP_IF_TRUE_OR_POP

iritkatriel · iritkatriel · commit 78e20c4c32e5 · 2023-02-01T15:51:50.000Z
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2017,24 +2017,23 @@ dummy_func(
             }
         }
 
-        // error: JUMP_IF_TRUE_OR_POP stack effect depends on jump flag
-        inst(JUMP_IF_TRUE_OR_POP) {
-            PyObject *cond = TOP();
+        inst(JUMP_IF_TRUE_OR_POP, (cond -- cond if (jump))) {
+            bool jump = false;
             int err;
             if (Py_IsFalse(cond)) {
-                STACK_SHRINK(1);
                 _Py_DECREF_NO_DEALLOC(cond);
             }
             else if (Py_IsTrue(cond)) {
                 JUMPBY(oparg);
+                jump = true;
             }
             else {
                 err = PyObject_IsTrue(cond);
                 if (err > 0) {
                     JUMPBY(oparg);
+                    jump = true;
                 }
                 else if (err == 0) {
-                    STACK_SHRINK(1);
                     Py_DECREF(cond);
                 }
                 else {
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
@@ -243,7 +243,7 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
         case JUMP_IF_FALSE_OR_POP:
             return 1;
         case JUMP_IF_TRUE_OR_POP:
-            return -1;
+            return 1;
         case JUMP_BACKWARD_NO_INTERRUPT:
             return 0;
         case GET_LEN:
@@ -589,7 +589,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
         case JUMP_IF_FALSE_OR_POP:
             return (jump ? 1 : 0);
         case JUMP_IF_TRUE_OR_POP:
-            return -1;
+            return (jump ? 1 : 0);
         case JUMP_BACKWARD_NO_INTERRUPT:
             return 0;
         case GET_LEN:

Original file line number	Diff line number	Diff line change
`@@ -2017,24 +2017,23 @@ dummy_func(`
`2017`	`2017`	`}`
`2018`	`2018`	`}`
`2019`	`2019`
`2020`		`- // error: JUMP_IF_TRUE_OR_POP stack effect depends on jump flag`
`2021`		`- inst(JUMP_IF_TRUE_OR_POP) {`
`2022`		`- PyObject *cond = TOP();`
	`2020`	`+ inst(JUMP_IF_TRUE_OR_POP, (cond -- cond if (jump))) {`
	`2021`	`+ bool jump = false;`
`2023`	`2022`	`int err;`
`2024`	`2023`	`if (Py_IsFalse(cond)) {`
`2025`		`- STACK_SHRINK(1);`
`2026`	`2024`	`_Py_DECREF_NO_DEALLOC(cond);`
`2027`	`2025`	`}`
`2028`	`2026`	`else if (Py_IsTrue(cond)) {`
`2029`	`2027`	`JUMPBY(oparg);`
	`2028`	`+ jump = true;`
`2030`	`2029`	`}`
`2031`	`2030`	`else {`
`2032`	`2031`	`err = PyObject_IsTrue(cond);`
`2033`	`2032`	`if (err > 0) {`
`2034`	`2033`	`JUMPBY(oparg);`
	`2034`	`+ jump = true;`
`2035`	`2035`	`}`
`2036`	`2036`	`else if (err == 0) {`
`2037`		`- STACK_SHRINK(1);`
`2038`	`2037`	`Py_DECREF(cond);`
`2039`	`2038`	`}`
`2040`	`2039`	`else {`