[Python-checkins] Fix some incorrect indentation around the main switch (#98177)
gvanrossum
webhook-mailer at python.org
Tue Oct 11 19:46:09 EDT 2022
https://github.com/python/cpython/commit/f5d71073e61b69b3ab331736fd69dc6324405775
commit: f5d71073e61b69b3ab331736fd69dc6324405775
branch: main
author: Guido van Rossum <guido at python.org>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2022-10-11T16:45:53-07:00
summary:
Fix some incorrect indentation around the main switch (#98177)
The `}` marked with `/* End instructions */` is the end of the switch.
There is another pair of `{}` around the switch, which is vestigial
from ancient times when it was `for (;;) { switch (opcode) { ... } }`.
All `DISPATCH` macro calls should be inside that pair.
files:
M Python/ceval.c
diff --git a/Python/ceval.c b/Python/ceval.c
index ee1babaaf444..a112f8bebb5a 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1152,12 +1152,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
{
/* Start instructions */
-#if USE_COMPUTED_GOTOS
- {
-#else
+#if !USE_COMPUTED_GOTOS
dispatch_opcode:
- switch (opcode) {
+ switch (opcode)
#endif
+ {
/* BEWARE!
It is essential that any operation that fails must goto error
@@ -5102,23 +5101,23 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
/* Specialization misses */
miss:
- {
- STAT_INC(opcode, miss);
- opcode = _PyOpcode_Deopt[opcode];
- STAT_INC(opcode, miss);
- /* The counter is always the first cache entry: */
- _Py_CODEUNIT *counter = (_Py_CODEUNIT *)next_instr;
- *counter -= 1;
- if (*counter == 0) {
- int adaptive_opcode = _PyOpcode_Adaptive[opcode];
- assert(adaptive_opcode);
- _Py_SET_OPCODE(next_instr[-1], adaptive_opcode);
- STAT_INC(opcode, deopt);
- *counter = adaptive_counter_start();
- }
- next_instr--;
- DISPATCH_GOTO();
- }
+ {
+ STAT_INC(opcode, miss);
+ opcode = _PyOpcode_Deopt[opcode];
+ STAT_INC(opcode, miss);
+ /* The counter is always the first cache entry: */
+ _Py_CODEUNIT *counter = (_Py_CODEUNIT *)next_instr;
+ *counter -= 1;
+ if (*counter == 0) {
+ int adaptive_opcode = _PyOpcode_Adaptive[opcode];
+ assert(adaptive_opcode);
+ _Py_SET_OPCODE(next_instr[-1], adaptive_opcode);
+ STAT_INC(opcode, deopt);
+ *counter = adaptive_counter_start();
+ }
+ next_instr--;
+ DISPATCH_GOTO();
+ }
unbound_local_error:
{
More information about the Python-checkins
mailing list