summaryrefslogtreecommitdiffstats
path: root/Python/generated_cases.c.h
diff options
context:
space:
mode:
Diffstat (limited to 'Python/generated_cases.c.h')
-rw-r--r--Python/generated_cases.c.h67
1 files changed, 27 insertions, 40 deletions
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 136b36c..e84599d 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -1675,65 +1675,51 @@
DISPATCH();
}
- TARGET(LOAD_NAME) {
- PyObject *locals;
+ TARGET(LOAD_FROM_DICT_OR_GLOBALS) {
PyObject *mod_or_class_dict;
PyObject *v;
- // _LOAD_LOCALS
- {
- locals = LOCALS();
- if (locals == NULL) {
- _PyErr_SetString(tstate, PyExc_SystemError,
- "no locals found");
- if (true) goto error;
- }
- Py_INCREF(locals);
+ mod_or_class_dict = stack_pointer[-1];
+ PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
+ if (PyMapping_GetOptionalItem(mod_or_class_dict, name, &v) < 0) {
+ goto error;
}
- // _LOAD_FROM_DICT_OR_GLOBALS
- mod_or_class_dict = locals;
- {
- PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
- if (PyMapping_GetOptionalItem(mod_or_class_dict, name, &v) < 0) {
- Py_DECREF(mod_or_class_dict);
+ if (v == NULL) {
+ v = PyDict_GetItemWithError(GLOBALS(), name);
+ if (v != NULL) {
+ Py_INCREF(v);
+ }
+ else if (_PyErr_Occurred(tstate)) {
goto error;
}
- Py_DECREF(mod_or_class_dict);
- if (v == NULL) {
- v = PyDict_GetItemWithError(GLOBALS(), name);
- if (v != NULL) {
- Py_INCREF(v);
- }
- else if (_PyErr_Occurred(tstate)) {
+ else {
+ if (PyMapping_GetOptionalItem(BUILTINS(), name, &v) < 0) {
goto error;
}
- else {
- if (PyMapping_GetOptionalItem(BUILTINS(), name, &v) < 0) {
- goto error;
- }
- if (v == NULL) {
- _PyEval_FormatExcCheckArg(
- tstate, PyExc_NameError,
- NAME_ERROR_MSG, name);
- goto error;
- }
+ if (v == NULL) {
+ _PyEval_FormatExcCheckArg(
+ tstate, PyExc_NameError,
+ NAME_ERROR_MSG, name);
+ goto error;
}
}
}
- STACK_GROW(1);
+ Py_DECREF(mod_or_class_dict);
stack_pointer[-1] = v;
DISPATCH();
}
- TARGET(LOAD_FROM_DICT_OR_GLOBALS) {
- PyObject *mod_or_class_dict;
+ TARGET(LOAD_NAME) {
PyObject *v;
- mod_or_class_dict = stack_pointer[-1];
+ PyObject *mod_or_class_dict = LOCALS();
+ if (mod_or_class_dict == NULL) {
+ _PyErr_SetString(tstate, PyExc_SystemError,
+ "no locals found");
+ if (true) goto error;
+ }
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
if (PyMapping_GetOptionalItem(mod_or_class_dict, name, &v) < 0) {
- Py_DECREF(mod_or_class_dict);
goto error;
}
- Py_DECREF(mod_or_class_dict);
if (v == NULL) {
v = PyDict_GetItemWithError(GLOBALS(), name);
if (v != NULL) {
@@ -1754,6 +1740,7 @@
}
}
}
+ STACK_GROW(1);
stack_pointer[-1] = v;
DISPATCH();
}