mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 02:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

gh-94438: in frameobject's mark_stacks switch, the PUSH_EXC_INFO and POP_EXCEPT cases are no longer reachable (GH-94582)

Browse source
This commit is contained in:
Irit Katriel 2022-07-06 07:15:59 +01:00 • committed by GitHub
parent 40d81fd63b
commit 50b9a7762f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Objects/frameobject.c
View file

@ -256,10 +256,6 @@ mark_stacks(PyCodeObject *code_obj, int len)
stacks[i+1] = next_stack; stacks[i+1] = next_stack;
break; break;
} }
case POP_EXCEPT:
next_stack = pop_value(pop_value(pop_value(next_stack)));
stacks[i+1] = next_stack;
break;
case SEND: case SEND:
j = get_arg(code, i) + i + 1; j = get_arg(code, i) + i + 1;
assert(j < len); assert(j < len);
@ -304,10 +300,16 @@ mark_stacks(PyCodeObject *code_obj, int len)
stacks[i+1] = next_stack; stacks[i+1] = next_stack;
break; break;
case PUSH_EXC_INFO: case PUSH_EXC_INFO:
next_stack = push_value(next_stack, Except); case POP_EXCEPT:
next_stack = push_value(next_stack, Except); /* These instructions only appear in exception handlers, which
next_stack = push_value(next_stack, Except); * skip this switch ever since the move to zero-cost exceptions
stacks[i+1] = next_stack; * (their stack remains UNINITIALIZED because nothing sets it).
*
* Note that explain_incompatible_stack interprets an
* UNINITIALIZED stack as belonging to an exception handler.
*/
Py_UNREACHABLE();
break;
case RETURN_VALUE: case RETURN_VALUE:
case RAISE_VARARGS: case RAISE_VARARGS:
case RERAISE: case RERAISE: