LOAD_FAST: rearrange branches to favor the expected case, and get

rid of a redundant NULL-pointer check in the expected case.

diff --git a/Python/ceval.c b/Python/ceval.c
index c59f31c07ee01bc52b2efef43beef7390b66b525..202c868fc195c3c86c952e6ba148b03a8e06eedd 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1666,17 +1666,14 @@ eval_frame(PyFrameObject *f)
 
                case LOAD_FAST:
                        x = GETLOCAL(oparg);
-                       if (x == NULL) {
-                               format_exc_check_arg(
-                                       PyExc_UnboundLocalError,
-                                       UNBOUNDLOCAL_ERROR_MSG,
-                                       PyTuple_GetItem(co->co_varnames, oparg)
-                                       );
-                               break;
+                       if (x != NULL) {
+                               Py_INCREF(x);
+                               PUSH(x);
+                               continue;
                        }
-                       Py_INCREF(x);
-                       PUSH(x);
-                       if (x != NULL) continue;
+                       format_exc_check_arg(PyExc_UnboundLocalError,
+                               UNBOUNDLOCAL_ERROR_MSG,
+                               PyTuple_GetItem(co->co_varnames, oparg));
                        break;
 
                case STORE_FAST: