diff options
| author | Jelle Zijlstra <jelle.zijlstra@gmail.com> | 2024-05-31 21:05:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 21:05:24 (GMT) |
| commit | 80a4e3899420faaa012c82b4e82cdb6675a6a944 (patch) | |
| tree | a9bde6c673e54d2c5f55397f89e2f2a0d323fcea /Python/executor_cases.c.h | |
| parent | 2237946af0981c46dc7d3886477e425ccfb37f28 (diff) | |
| download | cpython-80a4e3899420faaa012c82b4e82cdb6675a6a944.zip cpython-80a4e3899420faaa012c82b4e82cdb6675a6a944.tar.gz cpython-80a4e3899420faaa012c82b4e82cdb6675a6a944.tar.bz2 | |
gh-119821: Support non-dict globals in LOAD_FROM_DICT_OR_GLOBALS (#119822)
Support non-dict globals in LOAD_FROM_DICT_OR_GLOBALS
The implementation basically copies LOAD_GLOBAL. Possibly it could be deduplicated,
but that seems like it may get hairy since the two operations have different operands.
This is important to fix in 3.14 for PEP 649, but it's a bug in earlier versions too,
and we should backport to 3.13 and 3.12 if possible.
Diffstat (limited to 'Python/executor_cases.c.h')
| -rw-r--r-- | Python/executor_cases.c.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index e862364..0dfe490 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -1405,35 +1405,7 @@ break; } - case _LOAD_FROM_DICT_OR_GLOBALS: { - PyObject *mod_or_class_dict; - PyObject *v; - oparg = CURRENT_OPARG(); - mod_or_class_dict = stack_pointer[-1]; - PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); - if (PyMapping_GetOptionalItem(mod_or_class_dict, name, &v) < 0) { - JUMP_TO_ERROR(); - } - if (v == NULL) { - if (PyDict_GetItemRef(GLOBALS(), name, &v) < 0) { - JUMP_TO_ERROR(); - } - if (v == NULL) { - if (PyMapping_GetOptionalItem(BUILTINS(), name, &v) < 0) { - JUMP_TO_ERROR(); - } - if (v == NULL) { - _PyEval_FormatExcCheckArg( - tstate, PyExc_NameError, - NAME_ERROR_MSG, name); - JUMP_TO_ERROR(); - } - } - } - Py_DECREF(mod_or_class_dict); - stack_pointer[-1] = v; - break; - } + /* _LOAD_FROM_DICT_OR_GLOBALS is not a viable micro-op for tier 2 because it has both popping and not-popping errors */ /* _LOAD_NAME is not a viable micro-op for tier 2 because it has both popping and not-popping errors */ |