]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Simplify DISPATCH by hoisting eval_breaker ahead of time. (gh-12243)
authorEric Snow <ericsnowcurrently@gmail.com>
Sat, 9 Mar 2019 00:25:54 +0000 (17:25 -0700)
committerGitHub <noreply@github.com>
Sat, 9 Mar 2019 00:25:54 +0000 (17:25 -0700)
Python/ceval.c

index b311248c6a2073252de867c8d332cf73354da405..ab6a5e0f12182ff0b5bbc13c95fa7701063256ab 100644 (file)
@@ -602,6 +602,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
     PyObject **fastlocals, **freevars;
     PyObject *retval = NULL;            /* Return value */
     PyThreadState *tstate = _PyThreadState_GET();
+    _Py_atomic_int *eval_breaker = &_PyRuntime.ceval.eval_breaker;
     PyCodeObject *co;
 
     /* when tracing we set things up so that
@@ -687,7 +688,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
 
 #define DISPATCH() \
     { \
-        if (!_Py_atomic_load_relaxed(&_PyRuntime.ceval.eval_breaker)) { \
+        if (!_Py_atomic_load_relaxed(eval_breaker)) { \
                     FAST_DISPATCH(); \
         } \
         continue; \
@@ -989,7 +990,7 @@ main_loop:
            async I/O handler); see Py_AddPendingCall() and
            Py_MakePendingCalls() above. */
 
-        if (_Py_atomic_load_relaxed(&_PyRuntime.ceval.eval_breaker)) {
+        if (_Py_atomic_load_relaxed(eval_breaker)) {
             opcode = _Py_OPCODE(*next_instr);
             if (opcode == SETUP_FINALLY ||
                 opcode == SETUP_WITH ||