diff -r c4839c36a71f Python/ceval.c --- a/Python/ceval.c Sun Jun 26 17:47:46 2016 +0300 +++ b/Python/ceval.c Mon Jun 27 00:37:47 2016 +0300 @@ -1000,8 +1000,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int /* OpCode prediction macros Some opcodes tend to come in pairs thus making it possible to predict the second code when the first is run. For example, - COMPARE_OP is often followed by JUMP_IF_FALSE or JUMP_IF_TRUE. And, - those opcodes are often followed by a POP_TOP. + COMPARE_OP is often followed by POP_JUMP_IF_FALSE or POP_JUMP_IF_TRUE. + And, those opcodes are often followed by a POP_TOP. Verifying the prediction costs a single high-speed test of a register variable against a constant. If the pairing was good, then the @@ -1379,6 +1379,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int FAST_DISPATCH(); } + PREDICTED(LOAD_CONST); TARGET(LOAD_CONST) { PyObject *value = GETITEM(consts, oparg); Py_INCREF(value); @@ -1432,6 +1433,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int STACKADJ(2); SET_TOP(top); SET_SECOND(second); + PREDICT(BINARY_SUBSCR); FAST_DISPATCH(); } @@ -1590,6 +1592,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int DISPATCH(); } + PREDICTED(BINARY_SUBSCR); TARGET(BINARY_SUBSCR) { PyObject *sub = POP(); PyObject *container = TOP(); @@ -2008,6 +2011,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int } SET_TOP(awaitable); + PREDICT(LOAD_CONST); DISPATCH(); } @@ -2050,9 +2054,11 @@ PyEval_EvalFrameEx(PyFrameObject *f, int Py_DECREF(next_iter); PUSH(awaitable); + PREDICT(LOAD_CONST); DISPATCH(); } + PREDICTED(GET_AWAITABLE); TARGET(GET_AWAITABLE) { PyObject *iterable = TOP(); PyObject *iter = _PyCoro_GetAwaitableIter(iterable); @@ -2080,6 +2086,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int goto error; } + PREDICT(LOAD_CONST); DISPATCH(); } @@ -2135,6 +2142,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int DISPATCH(); } + PREDICTED(POP_BLOCK); TARGET(POP_BLOCK) { PyTryBlock *b = PyFrame_BlockPop(f); UNWIND_BLOCK(b); @@ -3015,6 +3023,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int if (iter == NULL) goto error; PREDICT(FOR_ITER); + PREDICT(CALL_FUNCTION); DISPATCH(); } @@ -3043,6 +3052,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int if (iter == NULL) goto error; } + PREDICT(LOAD_CONST); DISPATCH(); } @@ -3068,6 +3078,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int STACKADJ(-1); Py_DECREF(iter); JUMPBY(oparg); + PREDICT(POP_BLOCK); DISPATCH(); } @@ -3117,6 +3128,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int if (res == NULL) goto error; PUSH(res); + PREDICT(GET_AWAITABLE); DISPATCH(); } @@ -3265,6 +3277,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int DISPATCH(); } + PREDICTED(CALL_FUNCTION); TARGET(CALL_FUNCTION) { PyObject **sp, *res; PCALL(PCALL_ALL);