diff options
| author | Mark Shannon <mark@hotpy.org> | 2023-06-07 16:04:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 16:04:53 (GMT) |
| commit | 064de0e3fca014e5225830a35766fb7867cbf403 (patch) | |
| tree | 72f73ca2a4788968816f03268cbfbde7741f34ab /Python | |
| parent | d63a7c3694d5c4484fcaa01c33590b1d4bc2559e (diff) | |
| download | cpython-064de0e3fca014e5225830a35766fb7867cbf403.zip cpython-064de0e3fca014e5225830a35766fb7867cbf403.tar.gz cpython-064de0e3fca014e5225830a35766fb7867cbf403.tar.bz2 | |
GH-104610: Remove the use of `PREDICT` macros. (GH-104651)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/bytecodes.c | 13 | ||||
| -rw-r--r-- | Python/ceval_macros.h | 15 | ||||
| -rw-r--r-- | Python/generated_cases.c.h | 1030 |
3 files changed, 507 insertions, 551 deletions
diff --git a/Python/bytecodes.c b/Python/bytecodes.c index bd40369..1dc8011 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -44,7 +44,6 @@ #define DEOPT_IF(cond, instname) ((void)0) #define ERROR_IF(cond, labelname) ((void)0) #define GO_TO_INSTRUCTION(instname) ((void)0) -#define PREDICT(opname) ((void)0) #define inst(name, ...) case name: #define op(name, ...) /* NAME is ignored */ @@ -562,14 +561,12 @@ dummy_func( inst(LIST_APPEND, (list, unused[oparg-1], v -- list, unused[oparg-1])) { ERROR_IF(_PyList_AppendTakeRef((PyListObject *)list, v) < 0, error); - PREDICT(JUMP_BACKWARD); } inst(SET_ADD, (set, unused[oparg-1], v -- set, unused[oparg-1])) { int err = PySet_Add(set, v); DECREF_INPUTS(); ERROR_IF(err, error); - PREDICT(JUMP_BACKWARD); } family(store_subscr, INLINE_CACHE_ENTRIES_STORE_SUBSCR) = { @@ -824,8 +821,6 @@ dummy_func( Py_DECREF(next_iter); } } - - PREDICT(LOAD_CONST); } inst(GET_AWAITABLE, (iterable -- iter)) { @@ -852,8 +847,6 @@ dummy_func( } ERROR_IF(iter == NULL, error); - - PREDICT(LOAD_CONST); } family(send, INLINE_CACHE_ENTRIES_SEND) = { @@ -1611,7 +1604,6 @@ dummy_func( ERROR_IF(true, error); } DECREF_INPUTS(); - PREDICT(CALL_FUNCTION_EX); } inst(MAP_ADD, (key, value --)) { @@ -1620,7 +1612,6 @@ dummy_func( /* dict[key] = value */ // Do not DECREF INPUTS because the function steals the references ERROR_IF(_PyDict_SetItem_Take2((PyDictObject *)dict, key, value) != 0, error); - PREDICT(JUMP_BACKWARD); } inst(INSTRUMENTED_LOAD_SUPER_ATTR, (unused/9, unused, unused, unused -- unused if (oparg & 1), unused)) { @@ -2248,13 +2239,11 @@ dummy_func( inst(MATCH_MAPPING, (subject -- subject, res)) { int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING; res = match ? Py_True : Py_False; - PREDICT(POP_JUMP_IF_FALSE); } inst(MATCH_SEQUENCE, (subject -- subject, res)) { int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE; res = match ? Py_True : Py_False; - PREDICT(POP_JUMP_IF_FALSE); } inst(MATCH_KEYS, (subject, keys -- subject, keys, values_or_none)) { @@ -2295,7 +2284,6 @@ dummy_func( } DECREF_INPUTS(); } - PREDICT(LOAD_CONST); } // Most members of this family are "secretly" super-instructions. @@ -2485,7 +2473,6 @@ dummy_func( Py_DECREF(exit); ERROR_IF(true, error); } - PREDICT(GET_AWAITABLE); } inst(BEFORE_WITH, (mgr -- exit, res)) { diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h index 86a48f6..44d6ee8 100644 --- a/Python/ceval_macros.h +++ b/Python/ceval_macros.h @@ -174,21 +174,6 @@ GETITEM(PyObject *v, Py_ssize_t i) { */ #define PREDICT_ID(op) PRED_##op - -#if USE_COMPUTED_GOTOS -#define PREDICT(op) if (0) goto PREDICT_ID(op) -#else -#define PREDICT(next_op) \ - do { \ - _Py_CODEUNIT word = *next_instr; \ - opcode = word.op.code; \ - if (opcode == next_op) { \ - oparg = word.op.arg; \ - INSTRUCTION_START(next_op); \ - goto PREDICT_ID(next_op); \ - } \ - } while(0) -#endif #define PREDICTED(op) PREDICT_ID(op): diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 31559ec..8f61ec3 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -8,7 +8,7 @@ } TARGET(RESUME) { - #line 138 "Python/bytecodes.c" + #line 137 "Python/bytecodes.c" assert(tstate->cframe == &cframe); assert(frame == cframe.current_frame); /* Possibly combine this with eval breaker */ @@ -25,7 +25,7 @@ } TARGET(INSTRUMENTED_RESUME) { - #line 152 "Python/bytecodes.c" + #line 151 "Python/bytecodes.c" /* Possible performance enhancement: * We need to check the eval breaker anyway, can we * combine the instrument verison check and the eval breaker test? @@ -57,7 +57,7 @@ TARGET(LOAD_CLOSURE) { PyObject *value; - #line 180 "Python/bytecodes.c" + #line 179 "Python/bytecodes.c" /* We keep LOAD_CLOSURE so that the bytecode stays more readable. */ value = GETLOCAL(oparg); if (value == NULL) goto unbound_local_error; @@ -70,7 +70,7 @@ TARGET(LOAD_FAST_CHECK) { PyObject *value; - #line 187 "Python/bytecodes.c" + #line 186 "Python/bytecodes.c" value = GETLOCAL(oparg); if (value == NULL) goto unbound_local_error; Py_INCREF(value); @@ -82,7 +82,7 @@ TARGET(LOAD_FAST) { PyObject *value; - #line 193 "Python/bytecodes.c" + #line 192 "Python/bytecodes.c" value = GETLOCAL(oparg); assert(value != NULL); Py_INCREF(value); @@ -94,7 +94,7 @@ TARGET(LOAD_FAST_AND_CLEAR) { PyObject *value; - #line 199 "Python/bytecodes.c" + #line 198 "Python/bytecodes.c" value = GETLOCAL(oparg); // do not use SETLOCAL here, it decrefs the old value GETLOCAL(oparg) = NULL; @@ -107,7 +107,7 @@ TARGET(LOAD_FAST_LOAD_FAST) { PyObject *value1; PyObject *value2; - #line 205 "Python/bytecodes.c" + #line 204 "Python/bytecodes.c" uint32_t oparg1 = oparg >> 4; uint32_t oparg2 = oparg & 15; value1 = GETLOCAL(oparg1); @@ -122,12 +122,11 @@ } TARGET(LOAD_CONST) { - PREDICTED(LOAD_CONST); PyObject *value; - #line 214 "Python/bytecodes.c" + #line 213 "Python/bytecodes.c" value = GETITEM(frame->f_code->co_consts, oparg); Py_INCREF(value); - #line 131 "Python/generated_cases.c.h" + #line 130 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = value; DISPATCH(); @@ -135,9 +134,9 @@ TARGET(STORE_FAST) { PyObject *value = stack_pointer[-1]; - #line 219 "Python/bytecodes.c" + #line 218 "Python/bytecodes.c" SETLOCAL(oparg, value); - #line 141 "Python/generated_cases.c.h" + #line 140 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } @@ -145,13 +144,13 @@ TARGET(STORE_FAST_LOAD_FAST) { PyObject *value1 = stack_pointer[-1]; PyObject *value2; - #line 223 "Python/bytecodes.c" + #line 222 "Python/bytecodes.c" uint32_t oparg1 = oparg >> 4; uint32_t oparg2 = oparg & 15; SETLOCAL(oparg1, value1); value2 = GETLOCAL(oparg2); Py_INCREF(value2); - #line 155 "Python/generated_cases.c.h" + #line 154 "Python/generated_cases.c.h" stack_pointer[-1] = value2; DISPATCH(); } @@ -159,12 +158,12 @@ TARGET(STORE_FAST_STORE_FAST) { PyObject *value1 = stack_pointer[-1]; PyObject *value2 = stack_pointer[-2]; - #line 231 "Python/bytecodes.c" + #line 230 "Python/bytecodes.c" uint32_t oparg1 = oparg >> 4; uint32_t oparg2 = oparg & 15; SETLOCAL(oparg1, value1); SETLOCAL(oparg2, value2); - #line 168 "Python/generated_cases.c.h" + #line 167 "Python/generated_cases.c.h" STACK_SHRINK(2); DISPATCH(); } @@ -174,20 +173,20 @@ PyObject *_tmp_2; { PyObject *value; - #line 193 "Python/bytecodes.c" + #line 192 "Python/bytecodes.c" value = GETLOCAL(oparg); assert(value != NULL); Py_INCREF(value); - #line 182 "Python/generated_cases.c.h" + #line 181 "Python/generated_cases.c.h" _tmp_2 = value; } oparg = (next_instr++)->op.arg; { PyObject *value; - #line 214 "Python/bytecodes.c" + #line 213 "Python/bytecodes.c" value = GETITEM(frame->f_code->co_consts, oparg); Py_INCREF(value); - #line 191 "Python/generated_cases.c.h" + #line 190 "Python/generated_cases.c.h" _tmp_1 = value; } STACK_GROW(2); @@ -201,20 +200,20 @@ PyObject *_tmp_2; { PyObject *value; - #line 214 "Python/bytecodes.c" + #line 213 "Python/bytecodes.c" value = GETITEM(frame->f_code->co_consts, oparg); Py_INCREF(value); - #line 208 "Python/generated_cases.c.h" + #line 207 "Python/generated_cases.c.h" _tmp_2 = value; } oparg = (next_instr++)->op.arg; { PyObject *value; - #line 193 "Python/bytecodes.c" + #line 192 "Python/bytecodes.c" value = GETLOCAL(oparg); assert(value != NULL); Py_INCREF(value); - #line 218 "Python/generated_cases.c.h" + #line 217 "Python/generated_cases.c.h" _tmp_1 = value; } STACK_GROW(2); @@ -225,8 +224,8 @@ TARGET(POP_TOP) { PyObject *value = stack_pointer[-1]; - #line 241 "Python/bytecodes.c" - #line 230 "Python/generated_cases.c.h" + #line 240 "Python/bytecodes.c" + #line 229 "Python/generated_cases.c.h" Py_DECREF(value); STACK_SHRINK(1); DISPATCH(); @@ -234,9 +233,9 @@ TARGET(PUSH_NULL) { PyObject *res; - #line 245 "Python/bytecodes.c" + #line 244 "Python/bytecodes.c" res = NULL; - #line 240 "Python/generated_cases.c.h" + #line 239 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = res; DISPATCH(); @@ -247,14 +246,14 @@ PyObject *_tmp_2 = stack_pointer[-2]; { PyObject *value = _tmp_1; - #line 241 "Python/bytecodes.c" - #line 252 "Python/generated_cases.c.h" + #line 240 "Python/bytecodes.c" + #line 251 "Python/generated_cases.c.h" Py_DECREF(value); } { PyObject *value = _tmp_2; - #line 241 "Python/bytecodes.c" - #line 258 "Python/generated_cases.c.h" + #line 240 "Python/bytecodes.c" + #line 257 "Python/generated_cases.c.h" Py_DECREF(value); } STACK_SHRINK(2); @@ -264,7 +263,7 @@ TARGET(INSTRUMENTED_END_FOR) { PyObject *value = stack_pointer[-1]; PyObject *receiver = stack_pointer[-2]; - #line 251 "Python/bytecodes.c" + #line 250 "Python/bytecodes.c" /* Need to create a fake StopIteration error here, * to conform to PEP 380 */ if (PyGen_Check(receiver)) { @@ -274,7 +273,7 @@ } PyErr_SetRaisedException(NULL); } - #line 278 "Python/generated_cases.c.h" + #line 277 "Python/generated_cases.c.h" Py_DECREF(receiver); Py_DECREF(value); STACK_SHRINK(2); @@ -284,9 +283,9 @@ TARGET(END_SEND) { PyObject *value = stack_pointer[-1]; PyObject *receiver = stack_pointer[-2]; - #line 264 "Python/bytecodes.c" + #line 263 "Python/bytecodes.c" Py_DECREF(receiver); - #line 290 "Python/generated_cases.c.h" + #line 289 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = value; DISPATCH(); @@ -295,7 +294,7 @@ TARGET(INSTRUMENTED_END_SEND) { PyObject *value = stack_pointer[-1]; PyObject *receiver = stack_pointer[-2]; - #line 268 "Python/bytecodes.c" + #line 267 "Python/bytecodes.c" if (PyGen_Check(receiver) || PyCoro_CheckExact(receiver)) { PyErr_SetObject(PyExc_StopIteration, value); if (monitor_stop_iteration(tstate, frame, next_instr-1)) { @@ -304,7 +303,7 @@ PyErr_SetRaisedException(NULL); } Py_DECREF(receiver); - #line 308 "Python/generated_cases.c.h" + #line 307 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = value; DISPATCH(); @@ -313,13 +312,13 @@ TARGET(UNARY_NEGATIVE) { PyObject *value = stack_pointer[-1]; PyObject *res; - #line 279 "Python/bytecodes.c" + #line 278 "Python/bytecodes.c" res = PyNumber_Negative(value); - #line 319 "Python/generated_cases.c.h" + #line 318 "Python/generated_cases.c.h" Py_DECREF(value); - #line 281 "Python/bytecodes.c" + #line 280 "Python/bytecodes.c" if (res == NULL) goto pop_1_error; - #line 323 "Python/generated_cases.c.h" + #line 322 "Python/generated_cases.c.h" stack_pointer[-1] = res; DISPATCH(); } @@ -327,11 +326,11 @@ TARGET(UNARY_NOT) { PyObject *value = stack_pointer[-1]; PyObject *res; - #line 285 "Python/bytecodes.c" + #line 284 "Python/bytecodes.c" int err = PyObject_IsTrue(value); - #line 333 "Python/generated_cases.c.h" + #line 332 "Python/generated_cases.c.h" Py_DECREF(value); - #line 287 "Python/bytecodes.c" + #line 286 "Python/bytecodes.c" if (err < 0) goto pop_1_error; if (err == 0) { res = Py_True; @@ -339,7 +338,7 @@ else { res = Py_False; } - #line 343 "Python/generated_cases.c.h" + #line 342 "Python/generated_cases.c.h" stack_pointer[-1] = res; DISPATCH(); } @@ -347,13 +346,13 @@ TARGET(UNARY_INVERT) { PyObject *value = stack_pointer[-1]; PyObject *res; - #line 297 "Python/bytecodes.c" + #line 296 "Python/bytecodes.c" res = PyNumber_Invert(value); - #line 353 "Python/generated_cases.c.h" + #line 352 "Python/generated_cases.c.h" Py_DECREF(value); - #line 299 "Python/bytecodes.c" + #line 298 "Python/bytecodes.c" if (res == NULL) goto pop_1_error; - #line 357 "Python/generated_cases.c.h" + #line 356 "Python/generated_cases.c.h" stack_pointer[-1] = res; DISPATCH(); } @@ -364,10 +363,10 @@ { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 315 "Python/bytecodes.c" + #line 314 "Python/bytecodes.c" DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP); DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP); - #line 371 "Python/generated_cases.c.h" + #line 370 "Python/generated_cases.c.h" _tmp_2 = left; _tmp_1 = right; } @@ -375,13 +374,13 @@ PyObject *right = _tmp_1; PyObject *left = _tmp_2; PyObject *res; - #line 320 "Python/bytecodes.c" + #line 319 "Python/bytecodes.c" STAT_INC(BINARY_OP, hit); res = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right); _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free); _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free); if (res == NULL) goto pop_2_error; - #line 385 "Python/generated_cases.c.h" + #line 384 "Python/generated_cases.c.h" _tmp_2 = res; } next_instr += 1; @@ -396,10 +395,10 @@ { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 315 "Python/bytecodes.c" + #line 314 "Python/bytecodes.c" DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP); DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP); - #line 403 "Python/generated_cases.c.h" + #line 402 "Python/generated_cases.c.h" _tmp_2 = left; _tmp_1 = right; } @@ -407,13 +406,13 @@ PyObject *right = _tmp_1; PyObject *left = _tmp_2; PyObject *res; - #line 328 "Python/bytecodes.c" + #line 327 "Python/bytecodes.c" STAT_INC(BINARY_OP, hit); res = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right); _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free); _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free); if (res == NULL) goto pop_2_error; - #line 417 "Python/generated_cases.c.h" + #line 416 "Python/generated_cases.c.h" _tmp_2 = res; } next_instr += 1; @@ -428,10 +427,10 @@ { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 315 "Python/bytecodes.c" + #line 314 "Python/bytecodes.c" DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP); DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP); - #line 435 "Python/generated_cases.c.h" + #line 434 "Python/generated_cases.c.h" _tmp_2 = left; _tmp_1 = right; } @@ -439,13 +438,13 @@ PyObject *right = _tmp_1; PyObject *left = _tmp_2; PyObject *res; - #line 336 "Python/bytecodes.c" + #line 335 "Python/bytecodes.c" STAT_INC(BINARY_OP, hit); res = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right); _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free); _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free); if (res == NULL) goto pop_2_error; - #line 449 "Python/generated_cases.c.h" + #line 448 "Python/generated_cases.c.h" _tmp_2 = res; } next_instr += 1; @@ -460,10 +459,10 @@ { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 351 "Python/bytecodes.c" + #line 350 "Python/bytecodes.c" DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP); DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP); - #line 467 "Python/generated_cases.c.h" + #line 466 "Python/generated_cases.c.h" _tmp_2 = left; _tmp_1 = right; } @@ -471,13 +470,13 @@ PyObject *right = _tmp_1; PyObject *left = _tmp_2; PyObject *res; - #line 356 "Python/bytecodes.c" + #line 355 "Python/bytecodes.c" STAT_INC(BINARY_OP, hit); double dres = ((PyFloatObject *)left)->ob_fval * ((PyFloatObject *)right)->ob_fval; DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res); - #line 481 "Python/generated_cases.c.h" + #line 480 "Python/generated_cases.c.h" _tmp_2 = res; } next_instr += 1; @@ -492,10 +491,10 @@ { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 351 "Python/bytecodes.c" + #line 350 "Python/bytecodes.c" DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP); DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP); - #line 499 "Python/generated_cases.c.h" + #line 498 "Python/generated_cases.c.h" _tmp_2 = left; _tmp_1 = right; } @@ -503,13 +502,13 @@ PyObject *right = _tmp_1; PyObject *left = _tmp_2; PyObject *res; - #line 364 "Python/bytecodes.c" + #line 363 "Python/bytecodes.c" STAT_INC(BINARY_OP, hit); double dres = ((PyFloatObject *)left)->ob_fval + ((PyFloatObject *)right)->ob_fval; DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res); - #line 513 "Python/generated_cases.c.h" + #line 512 "Python/generated_cases.c.h" _tmp_2 = res; } next_instr += 1; @@ -524,10 +523,10 @@ { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 351 "Python/bytecodes.c" + #line 350 "Python/bytecodes.c" DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP); DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP); - #line 531 "Python/generated_cases.c.h" + #line 530 "Python/generated_cases.c.h" _tmp_2 = left; _tmp_1 = right; } @@ -535,13 +534,13 @@ PyObject *right = _tmp_1; PyObject *left = _tmp_2; PyObject *res; - #line 372 "Python/bytecodes.c" + #line 371 "Python/bytecodes.c" STAT_INC(BINARY_OP, hit); double dres = ((PyFloatObject *)left)->ob_fval - ((PyFloatObject *)right)->ob_fval; DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res); - #line 545 "Python/generated_cases.c.h" + #line 544 "Python/generated_cases.c.h" _tmp_2 = res; } next_instr += 1; @@ -556,10 +555,10 @@ { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 387 "Python/bytecodes.c" + #line 386 "Python/bytecodes.c" DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP); DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP); - #line 563 "Python/generated_cases.c.h" + #line 562 "Python/generated_cases.c.h" _tmp_2 = left; _tmp_1 = right; } @@ -567,13 +566,13 @@ PyObject *right = _tmp_1; PyObject *left = _tmp_2; PyObject *res; - #line 392 "Python/bytecodes.c" + #line 391 "Python/bytecodes.c" STAT_INC(BINARY_OP, hit); res = PyUnicode_Concat(left, right); _Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc); _Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc); if (res == NULL) goto pop_2_error; - #line 577 "Python/generated_cases.c.h" + #line 576 "Python/generated_cases.c.h" _tmp_2 = res; } next_instr += 1; @@ -588,17 +587,17 @@ { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 387 "Python/bytecodes.c" + #line 386 "Python/bytecodes.c" DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP); DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP); - #line 595 "Python/generated_cases.c.h" + #line 594 "Python/generated_cases.c.h" _tmp_2 = left; _tmp_1 = right; } { PyObject *right = _tmp_1; PyObject *left = _tmp_2; - #line 409 "Python/bytecodes.c" + #line 408 "Python/bytecodes.c" _Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP]; assert(true_next.op.code == STORE_FAST); PyObject **target_local = &GETLOCAL(true_next.op.arg); @@ -622,7 +621,7 @@ if (*target_local == NULL) goto pop_2_error; // The STORE_FAST is already done. JUMPBY(INLINE_CACHE_ENTRIES_BINARY_OP + 1); - #line 626 "Python/generated_cases.c.h" + #line 625 "Python/generated_cases.c.h" } STACK_SHRINK(2); DISPATCH(); @@ -634,7 +633,7 @@ PyObject *sub = stack_pointer[-1]; PyObject *container = stack_pointer[-2]; PyObject *res; - #line 446 "Python/bytecodes.c" + #line 445 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION _PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr; if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { @@ -646,12 +645,12 @@ DECREMENT_ADAPTIVE_COUNTER(cache->counter); #endif /* ENABLE_SPECIALIZATION */ res = PyObject_GetItem(container, sub); - #line 650 "Python/generated_cases.c.h" + #line 649 "Python/generated_cases.c.h" Py_DECREF(container); Py_DECREF(sub); - #line 458 "Python/bytecodes.c" + #line 457 "Python/bytecodes.c" if (res == NULL) goto pop_2_error; - #line 655 "Python/generated_cases.c.h" + #line 654 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; next_instr += 1; @@ -663,7 +662,7 @@ PyObject *start = stack_pointer[-2]; PyObject *container = stack_pointer[-3]; PyObject *res; - #line 462 "Python/bytecodes.c" + #line 461 "Python/bytecodes.c" PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop); // Can't use ERROR_IF() here, because we haven't // DECREF'ed container yet, and we still own slice. @@ -676,7 +675,7 @@ } Py_DECREF(container); if (res == NULL) goto pop_3_error; - #line 680 "Python/generated_cases.c.h" + #line 679 "Python/generated_cases.c.h" STACK_SHRINK(2); stack_pointer[-1] = res; DISPATCH(); @@ -687,7 +686,7 @@ PyObject *start = stack_pointer[-2]; PyObject *container = stack_pointer[-3]; PyObject *v = stack_pointer[-4]; - #line 477 "Python/bytecodes.c" + #line 476 "Python/bytecodes.c" PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop); int err; if (slice == NULL) { @@ -700,7 +699,7 @@ Py_DECREF(v); Py_DECREF(container); if (err) goto pop_4_error; - #line 704 "Python/generated_cases.c.h" + #line 703 "Python/generated_cases.c.h" STACK_SHRINK(4); DISPATCH(); } @@ -709,7 +708,7 @@ PyObject *sub = stack_pointer[-1]; PyObject *list = stack_pointer[-2]; PyObject *res; - #line 492 "Python/bytecodes.c" + #line 491 "Python/bytecodes.c" DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR); DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR); @@ -723,7 +722,7 @@ Py_INCREF(res); _Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free); Py_DECREF(list); - #line 727 "Python/generated_cases.c.h" + #line 726 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; next_instr += 1; @@ -734,7 +733,7 @@ PyObject *sub = stack_pointer[-1]; PyObject *tuple = stack_pointer[-2]; PyObject *res; - #line 508 "Python/bytecodes.c" + #line 507 "Python/bytecodes.c" DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR); DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR); @@ -748,7 +747,7 @@ Py_INCREF(res); _Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free); Py_DECREF(tuple); - #line 752 "Python/generated_cases.c.h" + #line 751 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; next_instr += 1; @@ -759,7 +758,7 @@ PyObject *sub = stack_pointer[-1]; PyObject *dict = stack_pointer[-2]; PyObject *res; - #line 524 "Python/bytecodes.c" + #line 523 "Python/bytecodes.c" DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR); STAT_INC(BINARY_SUBSCR, hit); res = PyDict_GetItemWithError(dict, sub); @@ -767,14 +766,14 @@ if (!_PyErr_Occurred(tstate)) { _PyErr_SetKeyError(sub); } - #line 771 "Python/generated_cases.c.h" + #line 770 "Python/generated_cases.c.h" Py_DECREF(dict); Py_DECREF(sub); - #line 532 "Python/bytecodes.c" + #line 531 "Python/bytecodes.c" if (true) goto pop_2_error; } Py_INCREF(res); // Do this before DECREF'ing dict, sub - #line 778 "Python/generated_cases.c.h" + #line 777 "Python/generated_cases.c.h" Py_DECREF(dict); Py_DECREF(sub); STACK_SHRINK(1); @@ -786,7 +785,7 @@ TARGET(BINARY_SUBSCR_GETITEM) { PyObject *sub = stack_pointer[-1]; PyObject *container = stack_pointer[-2]; - #line 539 "Python/bytecodes.c" + #line 538 "Python/bytecodes.c" DEOPT_IF(tstate->interp->eval_frame, BINARY_SUBSCR); PyTypeObject *tp = Py_TYPE(container); DEOPT_IF(!PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE), BINARY_SUBSCR); @@ -809,32 +808,30 @@ JUMPBY(INLINE_CACHE_ENTRIES_BINARY_SUBSCR); frame->return_offset = 0; DISPATCH_INLINED(new_frame); - #line 813 "Python/generated_cases.c.h" + #line 812 "Python/generated_cases.c.h" } TARGET(LIST_APPEND) { PyObject *v = stack_pointer[-1]; PyObject *list = stack_pointer[-(2 + (oparg-1))]; - #line 564 "Python/bytecodes.c" + #line 563 "Python/bytecodes.c" if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error; - #line 821 "Python/generated_cases.c.h" + #line 820 "Python/generated_cases.c.h" STACK_SHRINK(1); - PREDICT(JUMP_BACKWARD); DISPATCH(); } TARGET(SET_ADD) { PyObject *v = stack_pointer[-1]; PyObject *set = stack_pointer[-(2 + (oparg-1))]; - #line 569 "Python/bytecodes.c" + #line 567 "Python/bytecodes.c" int err = PySet_Add(set, v); - #line 832 "Python/generated_cases.c.h" + #line 830 "Python/generated_cases.c.h" Py_DECREF(v); - #line 571 "Python/bytecodes.c" + #line 569 "Python/bytecodes.c" if (err) goto pop_1_error; - #line 836 "Python/generated_cases.c.h" + #line 834 "Python/generated_cases.c.h" STACK_SHRINK(1); - PREDICT(JUMP_BACKWARD); DISPATCH(); } @@ -845,7 +842,7 @@ PyObject *container = stack_pointer[-2]; PyObject *v = stack_pointer[-3]; uint16_t counter = read_u16(&next_instr[0].cache); - #line 582 "Python/bytecodes.c" + #line 579 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION if (ADAPTIVE_COUNTER_IS_ZERO(counter)) { next_instr--; @@ -860,13 +857,13 @@ #endif /* ENABLE_SPECIALIZATION */ /* container[sub] = v */ int err = PyObject_SetItem(container, sub, v); - #line 864 "Python/generated_cases.c.h" + #line 861 "Python/generated_cases.c.h" Py_DECREF(v); Py_DECREF(container); Py_DECREF(sub); - #line 597 "Python/bytecodes.c" + #line 594 "Python/bytecodes.c" if (err) goto pop_3_error; - #line 870 "Python/generated_cases.c.h" + #line 867 "Python/generated_cases.c.h" STACK_SHRINK(3); next_instr += 1; DISPATCH(); @@ -876,7 +873,7 @@ PyObject *sub = stack_pointer[-1]; PyObject *list = stack_pointer[-2]; PyObject *value = stack_pointer[-3]; - #line 601 "Python/bytecodes.c" + #line 598 "Python/bytecodes.c" DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR); DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR); @@ -893,7 +890,7 @@ Py_DECREF(old_value); _Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free); Py_DECREF(list); - #line 897 "Python/generated_cases.c.h" + #line 894 "Python/generated_cases.c.h" STACK_SHRINK(3); next_instr += 1; DISPATCH(); @@ -903,13 +900,13 @@ PyObject *sub = stack_pointer[-1]; PyObject *dict = stack_pointer[-2]; PyObject *value = stack_pointer[-3]; - #line 620 "Python/bytecodes.c" + #line 617 "Python/bytecodes.c" DEOPT_IF(!PyDict_CheckExact(dict), STORE_SUBSCR); STAT_INC(STORE_SUBSCR, hit); int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub, value); Py_DECREF(dict); if (err) goto pop_3_error; - #line 913 "Python/generated_cases.c.h" + #line 910 "Python/generated_cases.c.h" STACK_SHRINK(3); next_instr += 1; DISPATCH(); @@ -918,15 +915,15 @@ TARGET(DELETE_SUBSCR) { PyObject *sub = stack_pointer[-1]; PyObject *container = stack_pointer[-2]; - #line 628 "Python/bytecodes.c" + #line 625 "Python/bytecodes.c" /* del container[sub] */ int err = PyObject_DelItem(container, sub); - #line 925 "Python/generated_cases.c.h" + #line 922 "Python/generated_cases.c.h" Py_DECREF(container); Py_DECREF(sub); - #line 631 "Python/bytecodes.c" + #line 628 "Python/bytecodes.c" if (err) goto pop_2_error; - #line 930 "Python/generated_cases.c.h" + #line 927 "Python/generated_cases.c.h" STACK_SHRINK(2); DISPATCH(); } @@ -934,14 +931,14 @@ TARGET(CALL_INTRINSIC_1) { PyObject *value = stack_pointer[-1]; PyObject *res; - #line 635 "Python/bytecodes.c" + #line 632 "Python/bytecodes.c" assert(oparg <= MAX_INTRINSIC_1); res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value); - #line 941 "Python/generated_cases.c.h" + #line 938 "Python/generated_cases.c.h" Py_DECREF(value); - #line 638 "Python/bytecodes.c" + #line 635 "Python/bytecodes.c" if (res == NULL) goto pop_1_error; - #line 945 "Python/generated_cases.c.h" + #line 942 "Python/generated_cases.c.h" stack_pointer[-1] = res; DISPATCH(); } @@ -950,15 +947,15 @@ PyObject *value1 = stack_pointer[-1]; PyObject *value2 = stack_pointer[-2]; PyObject *res; - #line 642 "Python/bytecodes.c" + #line 639 "Python/bytecodes.c" assert(oparg <= MAX_INTRINSIC_2); res = _PyIntrinsics_BinaryFunctions[oparg](tstate, value2, value1); - #line 957 "Python/generated_cases.c.h" + #line 954 "Python/generated_cases.c.h" Py_DECREF(value2); Py_DECREF(value1); - #line 645 "Python/bytecodes.c" + #line 642 "Python/bytecodes.c" if (res == NULL) goto pop_2_error; - #line 962 "Python/generated_cases.c.h" + #line 959 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; DISPATCH(); @@ -966,7 +963,7 @@ TARGET(RAISE_VARARGS) { PyObject **args = (stack_pointer - oparg); - #line 649 "Python/bytecodes.c" + #line 646 "Python/bytecodes.c" PyObject *cause = NULL, *exc = NULL; switch (oparg) { case 2: @@ -984,12 +981,12 @@ break; } if (true) { STACK_SHRINK(oparg); goto error; } - #line 988 "Python/generated_cases.c.h" + #line 985 "Python/generated_cases.c.h" } TARGET(INTERPRETER_EXIT) { PyObject *retval = stack_pointer[-1]; - #line 669 "Python/bytecodes.c" + #line 666 "Python/bytecodes.c" assert(frame == &entry_frame); assert(_PyFrame_IsIncomplete(frame)); STACK_SHRINK(1); // Since we're not going to DISPATCH() @@ -1000,12 +997,12 @@ assert(!_PyErr_Occurred(tstate)); _Py_LeaveRecursiveCallTstate(tstate); return retval; - #line 1004 "Python/generated_cases.c.h" + #line 1001 "Python/generated_cases.c.h" } TARGET(RETURN_VALUE) { PyObject *retval = stack_pointer[-1]; - #line 682 "Python/bytecodes.c" + #line 679 "Python/bytecodes.c" STACK_SHRINK(1); assert(EMPTY()); _PyFrame_SetStackPointer(frame, stack_pointer); @@ -1018,12 +1015,12 @@ frame->prev_instr += frame->return_offset; _PyFrame_StackPush(frame, retval); goto resume_frame; - #line 1022 "Python/generated_cases.c.h" + #line 1019 "Python/generated_cases.c.h" } TARGET(INSTRUMENTED_RETURN_VALUE) { PyObject *retval = stack_pointer[-1]; - #line 697 "Python/bytecodes.c" + #line 694 "Python/bytecodes.c" int err = _Py_call_instrumentation_arg( tstate, PY_MONITORING_EVENT_PY_RETURN, frame, next_instr-1, retval); @@ -1040,11 +1037,11 @@ frame->prev_instr += frame->return_offset; _PyFrame_StackPush(frame, retval); goto resume_frame; - #line 1044 "Python/generated_cases.c.h" + #line 1041 "Python/generated_cases.c.h" } TARGET(RETURN_CONST) { - #line 716 "Python/bytecodes.c" + #line 713 "Python/bytecodes.c" PyObject *retval = GETITEM(frame->f_code->co_consts, oparg); Py_INCREF(retval); assert(EMPTY()); @@ -1058,11 +1055,11 @@ frame->prev_instr += frame->return_offset; _PyFrame_StackPush(frame, retval); goto resume_frame; - #line 1062 "Python/generated_cases.c.h" + #line 1059 "Python/generated_cases.c.h" } TARGET(INSTRUMENTED_RETURN_CONST) { - #line 732 "Python/bytecodes.c" + #line 729 "Python/bytecodes.c" PyObject *retval = GETITEM(frame->f_code->co_consts, oparg); int err = _Py_call_instrumentation_arg( tstate, PY_MONITORING_EVENT_PY_RETURN, @@ -1080,13 +1077,13 @@ frame->prev_instr += frame->return_offset; _PyFrame_StackPush(frame, retval); goto resume_frame; - #line 1084 "Python/generated_cases.c.h" + #line 1081 "Python/generated_cases.c.h" } TARGET(GET_AITER) { PyObject *obj = stack_pointer[-1]; PyObject *iter; - #line 752 "Python/bytecodes.c" + #line 749 "Python/bytecodes.c" unaryfunc getter = NULL; PyTypeObject *type = Py_TYPE(obj); @@ -1099,16 +1096,16 @@ "'async for' requires an object with " "__aiter__ method, got %.100s", type->tp_name); - #line 1103 "Python/generated_cases.c.h" + #line 1100 "Python/generated_cases.c.h" Py_DECREF(obj); - #line 765 "Python/bytecodes.c" + #line 762 "Python/bytecodes.c" if (true) goto pop_1_error; } iter = (*getter)(obj); - #line 1110 "Python/generated_cases.c.h" + #line 1107 "Python/generated_cases.c.h" Py_DECREF(obj); - #line 770 "Python/bytecodes.c" + #line 767 "Python/bytecodes.c" if (iter == NULL) goto pop_1_error; if (Py_TYPE(iter)->tp_as_async == NULL || @@ -1121,7 +1118,7 @@ Py_DECREF(iter); if (true) goto pop_1_error; } - #line 1125 "Python/generated_cases.c.h" + #line 1122 "Python/generated_cases.c.h" stack_pointer[-1] = iter; DISPATCH(); } @@ -1129,7 +1126,7 @@ TARGET(GET_ANEXT) { PyObject *aiter = stack_pointer[-1]; PyObject *awaitable; - #line 785 "Python/bytecodes.c" + #line 782 "Python/bytecodes.c" unaryfunc getter = NULL; PyObject *next_iter = NULL; PyTypeObject *type = Py_TYPE(aiter); @@ -1172,28 +1169,25 @@ Py_DECREF(next_iter); } } - - #line 1177 "Python/generated_cases.c.h" + #line 1173 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = awaitable; - PREDICT(LOAD_CONST); DISPATCH(); } TARGET(GET_AWAITABLE) { - PREDICTED(GET_AWAITABLE); PyObject *iterable = stack_pointer[-1]; PyObject *iter; - #line 832 "Python/bytecodes.c" + #line 827 "Python/bytecodes.c" iter = _PyCoro_GetAwaitableIter(iterable); if (iter == NULL) { format_awaitable_error(tstate, Py_TYPE(iterable), oparg); } - #line 1195 "Python/generated_cases.c.h" + #line 1189 "Python/generated_cases.c.h" Py_DECREF(iterable); - #line 839 "Python/bytecodes.c" + #line 834 "Python/bytecodes.c" if (iter != NULL && PyCoro_CheckExact(iter)) { PyObject *yf = _PyGen_yf((PyGenObject*)iter); @@ -1210,10 +1204,8 @@ } if (iter == NULL) goto pop_1_error; - - #line 1215 "Python/generated_cases.c.h" + #line 1208 "Python/generated_cases.c.h" stack_pointer[-1] = iter; - PREDICT(LOAD_CONST); DISPATCH(); } @@ -1223,7 +1215,7 @@ PyObject *v = stack_pointer[-1]; PyObject *receiver = stack_pointer[-2]; PyObject *retval; - #line 865 "Python/bytecodes.c" + #line 858 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION _PySendCache *cache = (_PySendCache *)next_instr; if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { @@ -1270,7 +1262,7 @@ } } Py_DECREF(v); - #line 1274 "Python/generated_cases.c.h" + #line 1266 "Python/generated_cases.c.h" stack_pointer[-1] = retval; next_instr += 1; DISPATCH(); @@ -1279,7 +1271,7 @@ TARGET(SEND_GEN) { PyObject *v = stack_pointer[-1]; PyObject *receiver = stack_pointer[-2]; - #line 914 "Python/bytecodes.c" + #line 907 "Python/bytecodes.c" DEOPT_IF(tstate->interp->eval_frame, SEND); PyGenObject *gen = (PyGenObject *)receiver; DEOPT_IF(Py_TYPE(gen) != &PyGen_Type && @@ -1295,12 +1287,12 @@ tstate->exc_info = &gen->gi_exc_state; JUMPBY(INLINE_CACHE_ENTRIES_SEND); DISPATCH_INLINED(gen_frame); - #line 1299 "Python/generated_cases.c.h" + #line 1291 "Python/generated_cases.c.h" } TARGET(INSTRUMENTED_YIELD_VALUE) { PyObject *retval = stack_pointer[-1]; - #line 932 "Python/bytecodes.c" + #line 925 "Python/bytecodes.c" assert(frame != &entry_frame); PyGenObject *gen = _PyFrame_GetGenerator(frame); gen->gi_frame_state = FRAME_SUSPENDED; @@ -1317,12 +1309,12 @@ gen_frame->previous = NULL; _PyFrame_StackPush(frame, retval); goto resume_frame; - #line 1321 "Python/generated_cases.c.h" + #line 1313 "Python/generated_cases.c.h" } TARGET(YIELD_VALUE) { PyObject *retval = stack_pointer[-1]; - #line 951 "Python/bytecodes.c" + #line 944 "Python/bytecodes.c" // NOTE: It's important that YIELD_VALUE never raises an exception! // The compiler treats any exception raised here as a failed close() // or throw() call. @@ -1338,15 +1330,15 @@ gen_frame->previous = NULL; _PyFrame_StackPush(frame, retval); goto resume_frame; - #line 1342 "Python/generated_cases.c.h" + #line 1334 "Python/generated_cases.c.h" } TARGET(POP_EXCEPT) { PyObject *exc_value = stack_pointer[-1]; - #line 969 "Python/bytecodes.c" + #line 962 "Python/bytecodes.c" _PyErr_StackItem *exc_info = tstate->exc_info; Py_XSETREF(exc_info->exc_value, exc_value); - #line 1350 "Python/generated_cases.c.h" + #line 1342 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } @@ -1354,7 +1346,7 @@ TARGET(RERAISE) { PyObject *exc = stack_pointer[-1]; PyObject **values = (stack_pointer - (1 + oparg)); - #line 974 "Python/bytecodes.c" + #line 967 "Python/bytecodes.c" assert(oparg >= 0 && oparg <= 2); if (oparg) { PyObject *lasti = values[0]; @@ -1372,26 +1364,26 @@ Py_INCREF(exc); _PyErr_SetRaisedException(tstate, exc); goto exception_unwind; - #line 1376 "Python/generated_cases.c.h" + #line 1368 "Python/generated_cases.c.h" } TARGET(END_ASYNC_FOR) { PyObject *exc = stack_pointer[-1]; PyObject *awaitable = stack_pointer[-2]; - #line 994 "Python/bytecodes.c" + #line 987 "Python/bytecodes.c" assert(exc && PyExceptionInstance_Check(exc)); if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) { - #line 1385 "Python/generated_cases.c.h" + #line 1377 "Python/generated_cases.c.h" Py_DECREF(awaitable); Py_DECREF(exc); - #line 997 "Python/bytecodes.c" + #line 990 "Python/bytecodes.c" } else { Py_INCREF(exc); _PyErr_SetRaisedException(tstate, exc); goto exception_unwind; } - #line 1395 "Python/generated_cases.c.h" + #line 1387 "Python/generated_cases.c.h" STACK_SHRINK(2); DISPATCH(); } @@ -1402,23 +1394,23 @@ PyObject *sub_iter = stack_pointer[-3]; PyObject *none; PyObject *value; - #line 1006 "Python/bytecodes.c" + #line 999 "Python/bytecodes.c" assert(throwflag); assert(exc_value && PyExceptionInstance_Check(exc_value)); if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) { value = Py_NewRef(((PyStopIterationObject *)exc_value)->value); - #line 1411 "Python/generated_cases.c.h" + #line 1403 "Python/generated_cases.c.h" Py_DECREF(sub_iter); Py_DECREF(last_sent_val); Py_DECREF(exc_value); - #line 1011 "Python/bytecodes.c" + #line 1004 "Python/bytecodes.c" none = Py_None; } else { _PyErr_SetRaisedException(tstate, Py_NewRef(exc_value)); goto exception_unwind; } - #line 1422 "Python/generated_cases.c.h" + #line 1414 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = value; stack_pointer[-2] = none; @@ -1427,9 +1419,9 @@ TARGET(LOAD_ASSERTION_ERROR) { PyObject *value; - #line 1020 "Python/bytecodes.c" + #line 1013 "Python/bytecodes.c" value = Py_NewRef(PyExc_AssertionError); - #line 1433 "Python/generated_cases.c.h" + #line 1425 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = value; DISPATCH(); @@ -1437,7 +1429,7 @@ TARGET(LOAD_BUILD_CLASS) { PyObject *bc; - #line 1024 "Python/bytecodes.c" + #line 1017 "Python/bytecodes.c" if (PyDict_CheckExact(BUILTINS())) { bc = _PyDict_GetItemWithError(BUILTINS(), &_Py_ID(__build_class__)); @@ -1459,7 +1451,7 @@ if (true) goto error; } } - #line 1463 "Python/generated_cases.c.h" + #line 1455 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = bc; DISPATCH(); @@ -1467,33 +1459,33 @@ TARGET(STORE_NAME) { PyObject *v = stack_pointer[-1]; - #line 1049 "Python/bytecodes.c" + #line 1042 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); PyObject *ns = LOCALS(); int err; if (ns == NULL) { _PyErr_Format(tstate, PyExc_SystemError, "no locals found when storing %R", name); - #line 1478 "Python/generated_cases.c.h" + #line 1470 "Python/generated_cases.c.h" Py_DECREF(v); - #line 1056 "Python/bytecodes.c" + #line 1049 "Python/bytecodes.c" if (true) goto pop_1_error; } if (PyDict_CheckExact(ns)) err = PyDict_SetItem(ns, name, v); else err = PyObject_SetItem(ns, name, v); - #line 1487 "Python/generated_cases.c.h" + #line 1479 "Python/generated_cases.c.h" Py_DECREF(v); - #line 1063 "Python/bytecodes.c" + #line 1056 "Python/bytecodes.c" if (err) goto pop_1_error; - #line 1491 "Python/generated_cases.c.h" + #line 1483 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } TARGET(DELETE_NAME) { - #line 1067 "Python/bytecodes.c" + #line 1060 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); PyObject *ns = LOCALS(); int err; @@ -1510,7 +1502,7 @@ name); goto error; } - #line 1514 "Python/generated_cases.c.h" + #line 1506 "Python/generated_cases.c.h" DISPATCH(); } @@ -1518,7 +1510,7 @@ PREDICTED(UNPACK_SEQUENCE); static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size"); PyObject *seq = stack_pointer[-1]; - #line 1093 "Python/bytecodes.c" + #line 1086 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION _PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr; if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { @@ -1531,11 +1523,11 @@ #endif /* ENABLE_SPECIALIZATION */ PyObject **top = stack_pointer + oparg - 1; int res = unpack_iterable(tstate, seq, oparg, -1, top); - #line 1535 "Python/generated_cases.c.h" + #line 1527 "Python/generated_cases.c.h" Py_DECREF(seq); - #line 1106 "Python/bytecodes.c" + #line 1099 "Python/bytecodes.c" if (res == 0) goto pop_1_error; - #line 1539 "Python/generated_cases.c.h" + #line 1531 "Python/generated_cases.c.h" STACK_SHRINK(1); STACK_GROW(oparg); next_instr += 1; @@ -1545,14 +1537,14 @@ TARGET(UNPACK_SEQUENCE_TWO_TUPLE) { PyObject *seq = stack_pointer[-1]; PyObject **values = stack_pointer - (1); - #line 1110 "Python/bytecodes.c" + #line 1103 "Python/bytecodes.c" DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE); DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE); assert(oparg == 2); STAT_INC(UNPACK_SEQUENCE, hit); values[0] = Py_NewRef(PyTuple_GET_ITEM(seq, 1)); values[1] = Py_NewRef(PyTuple_GET_ITEM(seq, 0)); - #line 1556 "Python/generated_cases.c.h" + #line 1548 "Python/generated_cases.c.h" Py_DECREF(seq); STACK_SHRINK(1); STACK_GROW(oparg); @@ -1563,7 +1555,7 @@ TARGET(UNPACK_SEQUENCE_TUPLE) { PyObject *seq = stack_pointer[-1]; PyObject **values = stack_pointer - (1); - #line 1120 "Python/bytecodes.c" + #line 1113 "Python/bytecodes.c" DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE); DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE); STAT_INC(UNPACK_SEQUENCE, hit); @@ -1571,7 +1563,7 @@ for (int i = oparg; --i >= 0; ) { *values++ = Py_NewRef(items[i]); } - #line 1575 "Python/generated_cases.c.h" + #line 1567 "Python/generated_cases.c.h" Py_DECREF(seq); STACK_SHRINK(1); STACK_GROW(oparg); @@ -1582,7 +1574,7 @@ TARGET(UNPACK_SEQUENCE_LIST) { PyObject *seq = stack_pointer[-1]; PyObject **values = stack_pointer - (1); - #line 1131 "Python/bytecodes.c" + #line 1124 "Python/bytecodes.c" DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE); DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE); STAT_INC(UNPACK_SEQUENCE, hit); @@ -1590,7 +1582,7 @@ for (int i = oparg; --i >= 0; ) { *values++ = Py_NewRef(items[i]); } - #line 1594 "Python/generated_cases.c.h" + #line 1586 "Python/generated_cases.c.h" Py_DECREF(seq); STACK_SHRINK(1); STACK_GROW(oparg); @@ -1600,15 +1592,15 @@ TARGET(UNPACK_EX) { PyObject *seq = stack_pointer[-1]; - #line 1142 "Python/bytecodes.c" + #line 1135 "Python/bytecodes.c" int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8); PyObject **top = stack_pointer + totalargs - 1; int res = unpack_iterable(tstate, seq, oparg & 0xFF, oparg >> 8, top); - #line 1608 "Python/generated_cases.c.h" + #line 1600 "Python/generated_cases.c.h" Py_DECREF(seq); - #line 1146 "Python/bytecodes.c" + #line 1139 "Python/bytecodes.c" if (res == 0) goto pop_1_error; - #line 1612 "Python/generated_cases.c.h" + #line 1604 "Python/generated_cases.c.h" STACK_GROW((oparg & 0xFF) + (oparg >> 8)); DISPATCH(); } @@ -1619,7 +1611,7 @@ PyObject *owner = stack_pointer[-1]; PyObject *v = stack_pointer[-2]; uint16_t counter = read_u16(&next_instr[0].cache); - #line 1157 "Python/bytecodes.c" + #line 1150 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION if (ADAPTIVE_COUNTER_IS_ZERO(counter)) { PyObject *name = GETITEM(frame->f_code->co_names, oparg); @@ -1635,12 +1627,12 @@ #endif /* ENABLE_SPECIALIZATION */ PyObject *name = GETITEM(frame->f_code->co_names, oparg); int err = PyObject_SetAttr(owner, name, v); - #line 1639 "Python/generated_cases.c.h" + #line 1631 "Python/generated_cases.c.h" Py_DECREF(v); Py_DECREF(owner); - #line 1173 "Python/bytecodes.c" + #line 1166 "Python/bytecodes.c" if (err) goto pop_2_error; - #line 1644 "Python/generated_cases.c.h" + #line 1636 "Python/generated_cases.c.h" STACK_SHRINK(2); next_instr += 4; DISPATCH(); @@ -1648,34 +1640,34 @@ TARGET(DELETE_ATTR) { PyObject *owner = stack_pointer[-1]; - #line 1177 "Python/bytecodes.c" + #line 1170 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); int err = PyObject_SetAttr(owner, name, (PyObject *)NULL); - #line 1655 "Python/generated_cases.c.h" + #line 1647 "Python/generated_cases.c.h" Py_DECREF(owner); - #line 1180 "Python/bytecodes.c" + #line 1173 "Python/bytecodes.c" if (err) goto pop_1_error; - #line 1659 "Python/generated_cases.c.h" + #line 1651 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } TARGET(STORE_GLOBAL) { PyObject *v = stack_pointer[-1]; - #line 1184 "Python/bytecodes.c" + #line 1177 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); int err = PyDict_SetItem(GLOBALS(), name, v); - #line 1669 "Python/generated_cases.c.h" + #line 1661 "Python/generated_cases.c.h" Py_DECREF(v); - #line 1187 "Python/bytecodes.c" + #line 1180 "Python/bytecodes.c" if (err) goto pop_1_error; - #line 1673 "Python/generated_cases.c.h" + #line 1665 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } TARGET(DELETE_GLOBAL) { - #line 1191 "Python/bytecodes.c" + #line 1184 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); int err; err = PyDict_DelItem(GLOBALS(), name); @@ -1687,7 +1679,7 @@ } goto error; } - #line 1691 "Python/generated_cases.c.h" + #line 1683 "Python/generated_cases.c.h" DISPATCH(); } @@ -1695,7 +1687,7 @@ PyObject *_tmp_1; { PyObject *locals; - #line 1205 "Python/bytecodes.c" + #line 1198 "Python/bytecodes.c" locals = LOCALS(); if (locals == NULL) { _PyErr_SetString(tstate, PyExc_SystemError, @@ -1703,7 +1695,7 @@ if (true) goto error; } Py_INCREF(locals); - #line 1707 "Python/generated_cases.c.h" + #line 1699 "Python/generated_cases.c.h" _tmp_1 = locals; } STACK_GROW(1); @@ -1715,7 +1707,7 @@ PyObject *_tmp_1; { PyObject *locals; - #line 1205 "Python/bytecodes.c" + #line 1198 "Python/bytecodes.c" locals = LOCALS(); if (locals == NULL) { _PyErr_SetString(tstate, PyExc_SystemError, @@ -1723,13 +1715,13 @@ if (true) goto error; } Py_INCREF(locals); - #line 1727 "Python/generated_cases.c.h" + #line 1719 "Python/generated_cases.c.h" _tmp_1 = locals; } { PyObject *mod_or_class_dict = _tmp_1; PyObject *v; - #line 1217 "Python/bytecodes.c" + #line 1210 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); if (PyDict_CheckExact(mod_or_class_dict)) { v = PyDict_GetItemWithError(mod_or_class_dict, name); @@ -1786,7 +1778,7 @@ } } } - #line 1790 "Python/generated_cases.c.h" + #line 1782 "Python/generated_cases.c.h" _tmp_1 = v; } STACK_GROW(1); @@ -1799,7 +1791,7 @@ { PyObject *mod_or_class_dict = _tmp_1; PyObject *v; - #line 1217 "Python/bytecodes.c" + #line 1210 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); if (PyDict_CheckExact(mod_or_class_dict)) { v = PyDict_GetItemWithError(mod_or_class_dict, name); @@ -1856,7 +1848,7 @@ } } } - #line 1860 "Python/generated_cases.c.h" + #line 1852 "Python/generated_cases.c.h" _tmp_1 = v; } stack_pointer[-1] = _tmp_1; @@ -1868,7 +1860,7 @@ static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size"); PyObject *null = NULL; PyObject *v; - #line 1286 "Python/bytecodes.c" + #line 1279 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION _PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr; if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { @@ -1920,7 +1912,7 @@ } } null = NULL; - #line 1924 "Python/generated_cases.c.h" + #line 1916 "Python/generated_cases.c.h" STACK_GROW(1); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = v; @@ -1934,7 +1926,7 @@ PyObject *res; uint16_t index = read_u16(&next_instr[1].cache); uint16_t version = read_u16(&next_instr[2].cache); - #line 1340 "Python/bytecodes.c" + #line 1333 "Python/bytecodes.c" DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL); PyDictObject *dict = (PyDictObject *)GLOBALS(); DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL); @@ -1945,7 +1937,7 @@ Py_INCREF(res); STAT_INC(LOAD_GLOBAL, hit); null = NULL; - #line 1949 "Python/generated_cases.c.h" + #line 1941 "Python/generated_cases.c.h" STACK_GROW(1); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -1960,7 +1952,7 @@ uint16_t index = read_u16(&next_instr[1].cache); uint16_t mod_version = read_u16(&next_instr[2].cache); uint16_t bltn_version = read_u16(&next_instr[3].cache); - #line 1353 "Python/bytecodes.c" + #line 1346 "Python/bytecodes.c" DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL); DEOPT_IF(!PyDict_CheckExact(BUILTINS()), LOAD_GLOBAL); PyDictObject *mdict = (PyDictObject *)GLOBALS(); @@ -1975,7 +1967,7 @@ Py_INCREF(res); STAT_INC(LOAD_GLOBAL, hit); null = NULL; - #line 1979 "Python/generated_cases.c.h" + #line 1971 "Python/generated_cases.c.h" STACK_GROW(1); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -1985,16 +1977,16 @@ } TARGET(DELETE_FAST) { - #line 1370 "Python/bytecodes.c" + #line 1363 "Python/bytecodes.c" PyObject *v = GETLOCAL(oparg); if (v == NULL) goto unbound_local_error; SETLOCAL(oparg, NULL); - #line 1993 "Python/generated_cases.c.h" + #line 1985 "Python/generated_cases.c.h" DISPATCH(); } TARGET(MAKE_CELL) { - #line 1376 "Python/bytecodes.c" + #line 1369 "Python/bytecodes.c" // "initial" is probably NULL but not if it's an arg (or set // via PyFrame_LocalsToFast() before MAKE_CELL has run). PyObject *initial = GETLOCAL(oparg); @@ -2003,12 +1995,12 @@ goto resume_with_error; } SETLOCAL(oparg, cell); - #line 2007 "Python/generated_cases.c.h" + #line 1999 "Python/generated_cases.c.h" DISPATCH(); } TARGET(DELETE_DEREF) { - #line 1387 "Python/bytecodes.c" + #line 1380 "Python/bytecodes.c" PyObject *cell = GETLOCAL(oparg); PyObject *oldobj = PyCell_GET(cell); // Can't use ERROR_IF here. @@ -2019,14 +2011,14 @@ } PyCell_SET(cell, NULL); Py_DECREF(oldobj); - #line 2023 "Python/generated_cases.c.h" + #line 2015 "Python/generated_cases.c.h" DISPATCH(); } TARGET(LOAD_FROM_DICT_OR_DEREF) { PyObject *class_dict = stack_pointer[-1]; PyObject *value; - #line 1400 "Python/bytecodes.c" + #line 1393 "Python/bytecodes.c" PyObject *name; assert(class_dict); assert(oparg >= 0 && oparg < frame->f_code->co_nlocalsplus); @@ -2061,14 +2053,14 @@ } Py_INCREF(value); } - #line 2065 "Python/generated_cases.c.h" + #line 2057 "Python/generated_cases.c.h" stack_pointer[-1] = value; DISPATCH(); } TARGET(LOAD_DEREF) { PyObject *value; - #line 1437 "Python/bytecodes.c" + #line 1430 "Python/bytecodes.c" PyObject *cell = GETLOCAL(oparg); value = PyCell_GET(cell); if (value == NULL) { @@ -2076,7 +2068,7 @@ if (true) goto error; } Py_INCREF(value); - #line 2080 "Python/generated_cases.c.h" + #line 2072 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = value; DISPATCH(); @@ -2084,18 +2076,18 @@ TARGET(STORE_DEREF) { PyObject *v = stack_pointer[-1]; - #line 1447 "Python/bytecodes.c" + #line 1440 "Python/bytecodes.c" PyObject *cell = GETLOCAL(oparg); PyObject *oldobj = PyCell_GET(cell); PyCell_SET(cell, v); Py_XDECREF(oldobj); - #line 2093 "Python/generated_cases.c.h" + #line 2085 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } TARGET(COPY_FREE_VARS) { - #line 1454 "Python/bytecodes.c" + #line 1447 "Python/bytecodes.c" /* Copy closure variables to free variables */ PyCodeObject *co = frame->f_code; assert(PyFunction_Check(frame->f_funcobj)); @@ -2106,22 +2098,22 @@ PyObject *o = PyTuple_GET_ITEM(closure, i); frame->localsplus[offset + i] = Py_NewRef(o); } - #line 2110 "Python/generated_cases.c.h" + #line 2102 "Python/generated_cases.c.h" DISPATCH(); } TARGET(BUILD_STRING) { PyObject **pieces = (stack_pointer - oparg); PyObject *str; - #line 1467 "Python/bytecodes.c" + #line 1460 "Python/bytecodes.c" str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg); - #line 2119 "Python/generated_cases.c.h" + #line 2111 "Python/generated_cases.c.h" for (int _i = oparg; --_i >= 0;) { Py_DECREF(pieces[_i]); } - #line 1469 "Python/bytecodes.c" + #line 1462 "Python/bytecodes.c" if (str == NULL) { STACK_SHRINK(oparg); goto error; } - #line 2125 "Python/generated_cases.c.h" + #line 2117 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_GROW(1); stack_pointer[-1] = str; @@ -2131,10 +2123,10 @@ TARGET(BUILD_TUPLE) { PyObject **values = (stack_pointer - oparg); PyObject *tup; - #line 1473 "Python/bytecodes.c" + #line 1466 "Python/bytecodes.c" tup = _PyTuple_FromArraySteal(values, oparg); if (tup == NULL) { STACK_SHRINK(oparg); goto error; } - #line 2138 "Python/generated_cases.c.h" + #line 2130 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_GROW(1); stack_pointer[-1] = tup; @@ -2144,10 +2136,10 @@ TARGET(BUILD_LIST) { PyObject **values = (stack_pointer - oparg); PyObject *list; - #line 1478 "Python/bytecodes.c" + #line 1471 "Python/bytecodes.c" list = _PyList_FromArraySteal(values, oparg); if (list == NULL) { STACK_SHRINK(oparg); goto error; } - #line 2151 "Python/generated_cases.c.h" + #line 2143 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_GROW(1); stack_pointer[-1] = list; @@ -2157,7 +2149,7 @@ TARGET(LIST_EXTEND) { PyObject *iterable = stack_pointer[-1]; PyObject *list = stack_pointer[-(2 + (oparg-1))]; - #line 1483 "Python/bytecodes.c" + #line 1476 "Python/bytecodes.c" PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable); if (none_val == NULL) { if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) && @@ -2168,13 +2160,13 @@ "Value after * must be an iterable, not %.200s", Py_TYPE(iterable)->tp_name); } - #line 2172 "Python/generated_cases.c.h" + #line 2164 "Python/generated_cases.c.h" Py_DECREF(iterable); - #line 1494 "Python/bytecodes.c" + #line 1487 "Python/bytecodes.c" if (true) goto pop_1_error; } assert(Py_IsNone(none_val)); - #line 2178 "Python/generated_cases.c.h" + #line 2170 "Python/generated_cases.c.h" Py_DECREF(iterable); STACK_SHRINK(1); DISPATCH(); @@ -2183,13 +2175,13 @@ TARGET(SET_UPDATE) { PyObject *iterable = stack_pointer[-1]; PyObject *set = stack_pointer[-(2 + (oparg-1))]; - #line 1501 "Python/bytecodes.c" + #line 1494 "Python/bytecodes.c" int err = _PySet_Update(set, iterable); - #line 2189 "Python/generated_cases.c.h" + #line 2181 "Python/generated_cases.c.h" Py_DECREF(iterable); - #line 1503 "Python/bytecodes.c" + #line 1496 "Python/bytecodes.c" if (err < 0) goto pop_1_error; - #line 2193 "Python/generated_cases.c.h" + #line 2185 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } @@ -2197,7 +2189,7 @@ TARGET(BUILD_SET) { PyObject **values = (stack_pointer - oparg); PyObject *set; - #line 1507 "Python/bytecodes.c" + #line 1500 "Python/bytecodes.c" set = PySet_New(NULL); if (set == NULL) goto error; @@ -2212,7 +2204,7 @@ Py_DECREF(set); if (true) { STACK_SHRINK(oparg); goto error; } } - #line 2216 "Python/generated_cases.c.h" + #line 2208 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_GROW(1); stack_pointer[-1] = set; @@ -2222,7 +2214,7 @@ TARGET(BUILD_MAP) { PyObject **values = (stack_pointer - oparg*2); PyObject *map; - #line 1524 "Python/bytecodes.c" + #line 1517 "Python/bytecodes.c" map = _PyDict_FromItems( values, 2, values+1, 2, @@ -2230,13 +2222,13 @@ if (map == NULL) goto error; - #line 2234 "Python/generated_cases.c.h" + #line 2226 "Python/generated_cases.c.h" for (int _i = oparg*2; --_i >= 0;) { Py_DECREF(values[_i]); } - #line 1532 "Python/bytecodes.c" + #line 1525 "Python/bytecodes.c" if (map == NULL) { STACK_SHRINK(oparg*2); goto error; } - #line 2240 "Python/generated_cases.c.h" + #line 2232 "Python/generated_cases.c.h" STACK_SHRINK(oparg*2); STACK_GROW(1); stack_pointer[-1] = map; @@ -2244,7 +2236,7 @@ } TARGET(SETUP_ANNOTATIONS) { - #line 1536 "Python/bytecodes.c" + #line 1529 "Python/bytecodes.c" int err; PyObject *ann_dict; if (LOCALS() == NULL) { @@ -2284,7 +2276,7 @@ Py_DECREF(ann_dict); } } - #line 2288 "Python/generated_cases.c.h" + #line 2280 "Python/generated_cases.c.h" DISPATCH(); } @@ -2292,7 +2284,7 @@ PyObject *keys = stack_pointer[-1]; PyObject **values = (stack_pointer - (1 + oparg)); PyObject *map; - #line 1578 "Python/bytecodes.c" + #line 1571 "Python/bytecodes.c" if (!PyTuple_CheckExact(keys) || PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) { _PyErr_SetString(tstate, PyExc_SystemError, @@ -2302,14 +2294,14 @@ map = _PyDict_FromItems( &PyTuple_GET_ITEM(keys, 0), 1, values, 1, oparg); - #line 2306 "Python/generated_cases.c.h" + #line 2298 "Python/generated_cases.c.h" for (int _i = oparg; --_i >= 0;) { Py_DECREF(values[_i]); } Py_DECREF(keys); - #line 1588 "Python/bytecodes.c" + #line 1581 "Python/bytecodes.c" if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; } - #line 2313 "Python/generated_cases.c.h" + #line 2305 "Python/generated_cases.c.h" STACK_SHRINK(oparg); stack_pointer[-1] = map; DISPATCH(); @@ -2317,7 +2309,7 @@ TARGET(DICT_UPDATE) { PyObject *update = stack_pointer[-1]; - #line 1592 "Python/bytecodes.c" + #line 1585 "Python/bytecodes.c" PyObject *dict = PEEK(oparg + 1); // update is still on the stack if (PyDict_Update(dict, update) < 0) { if (_PyErr_ExceptionMatches(tstate, PyExc_AttributeError)) { @@ -2325,12 +2317,12 @@ "'%.200s' object is not a mapping", Py_TYPE(update)->tp_name); } - #line 2329 "Python/generated_cases.c.h" + #line 2321 "Python/generated_cases.c.h" Py_DECREF(update); - #line 1600 "Python/bytecodes.c" + #line 1593 "Python/bytecodes.c" if (true) goto pop_1_error; } - #line 2334 "Python/generated_cases.c.h" + #line 2326 "Python/generated_cases.c.h" Py_DECREF(update); STACK_SHRINK(1); DISPATCH(); @@ -2338,46 +2330,44 @@ TARGET(DICT_MERGE) { PyObject *update = stack_pointer[-1]; - #line 1606 "Python/bytecodes.c" + #line 1599 "Python/bytecodes.c" PyObject *dict = PEEK(oparg + 1); // update is still on the stack if (_PyDict_MergeEx(dict, update, 2) < 0) { format_kwargs_error(tstate, PEEK(3 + oparg), update); - #line 2347 "Python/generated_cases.c.h" + #line 2339 "Python/generated_cases.c.h" Py_DECREF(update); - #line 1611 "Python/bytecodes.c" + #line 1604 "Python/bytecodes.c" if (true) goto pop_1_error; } - #line 2352 "Python/generated_cases.c.h" + #line 2344 "Python/generated_cases.c.h" Py_DECREF(update); STACK_SHRINK(1); - PREDICT(CALL_FUNCTION_EX); DISPATCH(); } TARGET(MAP_ADD) { PyObject *value = stack_pointer[-1]; PyObject *key = stack_pointer[-2]; - #line 1618 "Python/bytecodes.c" + #line 1610 "Python/bytecodes.c" PyObject *dict = PEEK(oparg + 2); // key, value are still on the stack assert(PyDict_CheckExact(dict)); /* dict[key] = value */ // Do not DECREF INPUTS because the function steals the references if (_PyDict_SetItem_Take2((PyDictObject *)dict, key, value) != 0) goto pop_2_error; - #line 2368 "Python/generated_cases.c.h" + #line 2359 "Python/generated_cases.c.h" STACK_SHRINK(2); - PREDICT(JUMP_BACKWARD); DISPATCH(); } TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) { - #line 1627 "Python/bytecodes.c" + #line 1618 "Python/bytecodes.c" _PySuperAttrCache *cache = (_PySuperAttrCache *)next_instr; // cancel out the decrement that will happen in LOAD_SUPER_ATTR; we // don't want to specialize instrumented instructions INCREMENT_ADAPTIVE_COUNTER(cache->counter); GO_TO_INSTRUCTION(LOAD_SUPER_ATTR); - #line 2381 "Python/generated_cases.c.h" + #line 2371 "Python/generated_cases.c.h" } TARGET(LOAD_SUPER_ATTR) { @@ -2388,7 +2378,7 @@ PyObject *global_super = stack_pointer[-3]; PyObject *res2 = NULL; PyObject *res; - #line 1641 "Python/bytecodes.c" + #line 1632 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2); int load_method = oparg & 1; #if ENABLE_SPECIALIZATION @@ -2430,16 +2420,16 @@ } } } - #line 2434 "Python/generated_cases.c.h" + #line 2424 "Python/generated_cases.c.h" Py_DECREF(global_super); Py_DECREF(class); Py_DECREF(self); - #line 1683 "Python/bytecodes.c" + #line 1674 "Python/bytecodes.c" if (super == NULL) goto pop_3_error; res = PyObject_GetAttr(super, name); Py_DECREF(super); if (res == NULL) goto pop_3_error; - #line 2443 "Python/generated_cases.c.h" + #line 2433 "Python/generated_cases.c.h" STACK_SHRINK(2); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -2454,20 +2444,20 @@ PyObject *global_super = stack_pointer[-3]; PyObject *res2 = NULL; PyObject *res; - #line 1690 "Python/bytecodes.c" + #line 1681 "Python/bytecodes.c" assert(!(oparg & 1)); DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR); DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR); STAT_INC(LOAD_SUPER_ATTR, hit); PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2); res = _PySuper_Lookup((PyTypeObject *)class, self, name, NULL); - #line 2465 "Python/generated_cases.c.h" + #line 2455 "Python/generated_cases.c.h" Py_DECREF(global_super); Py_DECREF(class); Py_DECREF(self); - #line 1697 "Python/bytecodes.c" + #line 1688 "Python/bytecodes.c" if (res == NULL) goto pop_3_error; - #line 2471 "Python/generated_cases.c.h" + #line 2461 "Python/generated_cases.c.h" STACK_SHRINK(2); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -2482,7 +2472,7 @@ PyObject *global_super = stack_pointer[-3]; PyObject *res2; PyObject *res; - #line 1701 "Python/bytecodes.c" + #line 1692 "Python/bytecodes.c" assert(oparg & 1); DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR); DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR); @@ -2505,7 +2495,7 @@ res = res2; res2 = NULL; } - #line 2509 "Python/generated_cases.c.h" + #line 2499 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; stack_pointer[-2] = res2; @@ -2519,7 +2509,7 @@ PyObject *owner = stack_pointer[-1]; PyObject *res2 = NULL; PyObject *res; - #line 1740 "Python/bytecodes.c" + #line 1731 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION _PyAttrCache *cache = (_PyAttrCache *)next_instr; if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { @@ -2553,9 +2543,9 @@ NULL | meth | arg1 | ... | argN */ - #line 2557 "Python/generated_cases.c.h" + #line 2547 "Python/generated_cases.c.h" Py_DECREF(owner); - #line 1774 "Python/bytecodes.c" + #line 1765 "Python/bytecodes.c" if (meth == NULL) goto pop_1_error; res2 = NULL; res = meth; @@ -2564,12 +2554,12 @@ else { /* Classic, pushes one value. */ res = PyObject_GetAttr(owner, name); - #line 2568 "Python/generated_cases.c.h" + #line 2558 "Python/generated_cases.c.h" Py_DECREF(owner); - #line 1783 "Python/bytecodes.c" + #line 1774 "Python/bytecodes.c" if (res == NULL) goto pop_1_error; } - #line 2573 "Python/generated_cases.c.h" + #line 2563 "Python/generated_cases.c.h" STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; } @@ -2583,7 +2573,7 @@ PyObject *res; uint32_t type_version = read_u32(&next_instr[1].cache); uint16_t index = read_u16(&next_instr[3].cache); - #line 1788 "Python/bytecodes.c" + #line 1779 "Python/bytecodes.c" PyTypeObject *tp = Py_TYPE(owner); assert(type_version != 0); DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR); @@ -2596,7 +2586,7 @@ STAT_INC(LOAD_ATTR, hit); Py_INCREF(res); res2 = NULL; - #line 2600 "Python/generated_cases.c.h" + #line 2590 "Python/generated_cases.c.h" Py_DECREF(owner); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -2611,7 +2601,7 @@ PyObject *res; uint32_t type_version = read_u32(&next_instr[1].cache); uint16_t index = read_u16(&next_instr[3].cache); - #line 1804 "Python/bytecodes.c" + #line 1795 "Python/bytecodes.c" DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR); PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict; assert(dict != NULL); @@ -2624,7 +2614,7 @@ STAT_INC(LOAD_ATTR, hit); Py_INCREF(res); res2 = NULL; - #line 2628 "Python/generated_cases.c.h" + #line 2618 "Python/generated_cases.c.h" Py_DECREF(owner); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -2639,7 +2629,7 @@ PyObject *res; uint32_t type_version = read_u32(&next_instr[1].cache); uint16_t index = read_u16(&next_instr[3].cache); - #line 1820 "Python/bytecodes.c" + #line 1811 "Python/bytecodes.c" PyTypeObject *tp = Py_TYPE(owner); assert(type_version != 0); DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR); @@ -2666,7 +2656,7 @@ STAT_INC(LOAD_ATTR, hit); Py_INCREF(res); res2 = NULL; - #line 2670 "Python/generated_cases.c.h" + #line 2660 "Python/generated_cases.c.h" Py_DECREF(owner); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -2681,7 +2671,7 @@ PyObject *res; uint32_t type_version = read_u32(&next_instr[1].cache); uint16_t index = read_u16(&next_instr[3].cache); - #line 1850 "Python/bytecodes.c" + #line 1841 "Python/bytecodes.c" PyTypeObject *tp = Py_TYPE(owner); assert(type_version != 0); DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR); @@ -2691,7 +2681,7 @@ STAT_INC(LOAD_ATTR, hit); Py_INCREF(res); res2 = NULL; - #line 2695 "Python/generated_cases.c.h" + #line 2685 "Python/generated_cases.c.h" Py_DECREF(owner); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -2706,7 +2696,7 @@ PyObject *res; uint32_t type_version = read_u32(&next_instr[1].cache); PyObject *descr = read_obj(&next_instr[5].cache); - #line 1863 "Python/bytecodes.c" + #line 1854 "Python/bytecodes.c" DEOPT_IF(!PyType_Check(cls), LOAD_ATTR); DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version, @@ -2718,7 +2708,7 @@ res = descr; assert(res != NULL); Py_INCREF(res); - #line 2722 "Python/generated_cases.c.h" + #line 2712 "Python/generated_cases.c.h" Py_DECREF(cls); STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; @@ -2732,7 +2722,7 @@ uint32_t type_version = read_u32(&next_instr[1].cache); uint32_t func_version = read_u32(&next_instr[3].cache); PyObject *fget = read_obj(&next_instr[5].cache); - #line 1878 "Python/bytecodes.c" + #line 1869 "Python/bytecodes.c" DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR); PyTypeObject *cls = Py_TYPE(owner); @@ -2756,7 +2746,7 @@ JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR); frame->return_offset = 0; DISPATCH_INLINED(new_frame); - #line 2760 "Python/generated_cases.c.h" + #line 2750 "Python/generated_cases.c.h" } TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) { @@ -2764,7 +2754,7 @@ uint32_t type_version = read_u32(&next_instr[1].cache); uint32_t func_version = read_u32(&next_instr[3].cache); PyObject *getattribute = read_obj(&next_instr[5].cache); - #line 1904 "Python/bytecodes.c" + #line 1895 "Python/bytecodes.c" DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR); PyTypeObject *cls = Py_TYPE(owner); DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR); @@ -2790,7 +2780,7 @@ JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR); frame->return_offset = 0; DISPATCH_INLINED(new_frame); - #line 2794 "Python/generated_cases.c.h" + #line 2784 "Python/generated_cases.c.h" } TARGET(STORE_ATTR_INSTANCE_VALUE) { @@ -2798,7 +2788,7 @@ PyObject *value = stack_pointer[-2]; uint32_t type_version = read_u32(&next_instr[1].cache); uint16_t index = read_u16(&next_instr[3].cache); - #line 1932 "Python/bytecodes.c" + #line 1923 "Python/bytecodes.c" PyTypeObject *tp = Py_TYPE(owner); assert(type_version != 0); DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR); @@ -2816,7 +2806,7 @@ Py_DECREF(old_value); } Py_DECREF(owner); - #line 2820 "Python/generated_cases.c.h" + #line 2810 "Python/generated_cases.c.h" STACK_SHRINK(2); next_instr += 4; DISPATCH(); @@ -2827,7 +2817,7 @@ PyObject *value = stack_pointer[-2]; uint32_t type_version = read_u32(&next_instr[1].cache); uint16_t hint = read_u16(&next_instr[3].cache); - #line 1952 "Python/bytecodes.c" + #line 1943 "Python/bytecodes.c" PyTypeObject *tp = Py_TYPE(owner); assert(type_version != 0); DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR); @@ -2866,7 +2856,7 @@ /* PEP 509 */ dict->ma_version_tag = new_version; Py_DECREF(owner); - #line 2870 "Python/generated_cases.c.h" + #line 2860 "Python/generated_cases.c.h" STACK_SHRINK(2); next_instr += 4; DISPATCH(); @@ -2877,7 +2867,7 @@ PyObject *value = stack_pointer[-2]; uint32_t type_version = read_u32(&next_instr[1].cache); uint16_t index = read_u16(&next_instr[3].cache); - #line 1993 "Python/bytecodes.c" + #line 1984 "Python/bytecodes.c" PyTypeObject *tp = Py_TYPE(owner); assert(type_version != 0); DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR); @@ -2887,7 +2877,7 @@ *(PyObject **)addr = value; Py_XDECREF(old_value); Py_DECREF(owner); - #line 2891 "Python/generated_cases.c.h" + #line 2881 "Python/generated_cases.c.h" STACK_SHRINK(2); next_instr += 4; DISPATCH(); @@ -2899,7 +2889,7 @@ PyObject *right = stack_pointer[-1]; PyObject *left = stack_pointer[-2]; PyObject *res; - #line 2012 "Python/bytecodes.c" + #line 2003 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION _PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr; if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { @@ -2912,12 +2902,12 @@ #endif /* ENABLE_SPECIALIZATION */ assert((oparg >> 4) <= Py_GE); res = PyObject_RichCompare(left, right, oparg>>4); - #line 2916 "Python/generated_cases.c.h" + #line 2906 "Python/generated_cases.c.h" Py_DECREF(left); Py_DECREF(right); - #line 2025 "Python/bytecodes.c" + #line 2016 "Python/bytecodes.c" if (res == NULL) goto pop_2_error; - #line 2921 "Python/generated_cases.c.h" + #line 2911 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; next_instr += 1; @@ -2928,7 +2918,7 @@ PyObject *right = stack_pointer[-1]; PyObject *left = stack_pointer[-2]; PyObject *res; - #line 2029 "Python/bytecodes.c" + #line 2020 "Python/bytecodes.c" DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP); DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP); STAT_INC(COMPARE_OP, hit); @@ -2939,7 +2929,7 @@ _Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc); _Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc); res = (sign_ish & oparg) ? Py_True : Py_False; - #line 2943 "Python/generated_cases.c.h" + #line 2933 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; next_instr += 1; @@ -2950,7 +2940,7 @@ PyObject *right = stack_pointer[-1]; PyObject *left = stack_pointer[-2]; PyObject *res; - #line 2043 "Python/bytecodes.c" + #line 2034 "Python/bytecodes.c" DEOPT_IF(!PyLong_CheckExact(left), COMPARE_OP); DEOPT_IF(!PyLong_CheckExact(right), COMPARE_OP); DEOPT_IF(!_PyLong_IsCompact((PyLongObject *)left), COMPARE_OP); @@ -2965,7 +2955,7 @@ _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free); _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free); res = (sign_ish & oparg) ? Py_True : Py_False; - #line 2969 "Python/generated_cases.c.h" + #line 2959 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; next_instr += 1; @@ -2976,7 +2966,7 @@ PyObject *right = stack_pointer[-1]; PyObject *left = stack_pointer[-2]; PyObject *res; - #line 2061 "Python/bytecodes.c" + #line 2052 "Python/bytecodes.c" DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP); DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP); STAT_INC(COMPARE_OP, hit); @@ -2988,7 +2978,7 @@ assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS); assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS); res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False; - #line 2992 "Python/generated_cases.c.h" + #line 2982 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; next_instr += 1; @@ -2999,14 +2989,14 @@ PyObject *right = stack_pointer[-1]; PyObject *left = stack_pointer[-2]; PyObject *b; - #line 2075 "Python/bytecodes.c" + #line 2066 "Python/bytecodes.c" int res = Py_Is(left, right) ^ oparg; - #line 3005 "Python/generated_cases.c.h" + #line 2995 "Python/generated_cases.c.h" Py_DECREF(left); Py_DECREF(right); - #line 2077 "Python/bytecodes.c" + #line 2068 "Python/bytecodes.c" b = res ? Py_True : Py_False; - #line 3010 "Python/generated_cases.c.h" + #line 3000 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = b; DISPATCH(); @@ -3016,15 +3006,15 @@ PyObject *right = stack_pointer[-1]; PyObject *left = stack_pointer[-2]; PyObject *b; - #line 2081 "Python/bytecodes.c" + #line 2072 "Python/bytecodes.c" int res = PySequence_Contains(right, left); - #line 3022 "Python/generated_cases.c.h" + #line 3012 "Python/generated_cases.c.h" Py_DECREF(left); Py_DECREF(right); - #line 2083 "Python/bytecodes.c" + #line 2074 "Python/bytecodes.c" if (res < 0) goto pop_2_error; b = (res ^ oparg) ? Py_True : Py_False; - #line 3028 "Python/generated_cases.c.h" + #line 3018 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = b; DISPATCH(); @@ -3035,12 +3025,12 @@ PyObject *exc_value = stack_pointer[-2]; PyObject *rest; PyObject *match; - #line 2088 "Python/bytecodes.c" + #line 2079 "Python/bytecodes.c" if (check_except_star_type_valid(tstate, match_type) < 0) { - #line 3041 "Python/generated_cases.c.h" + #line 3031 "Python/generated_cases.c.h" Py_DECREF(exc_value); Py_DECREF(match_type); - #line 2090 "Python/bytecodes.c" + #line 2081 "Python/bytecodes.c" if (true) goto pop_2_error; } @@ -3048,10 +3038,10 @@ rest = NULL; int res = exception_group_match(exc_value, match_type, &match, &rest); - #line 3052 "Python/generated_cases.c.h" + #line 3042 "Python/generated_cases.c.h" Py_DECREF(exc_value); Py_DECREF(match_type); - #line 2098 "Python/bytecodes.c" + #line 2089 "Python/bytecodes.c" if (res < 0) goto pop_2_error; assert((match == NULL) == (rest == NULL)); @@ -3060,7 +3050,7 @@ if (!Py_IsNone(match)) { PyErr_SetHandledException(match); } - #line 3064 "Python/generated_cases.c.h" + #line 3054 "Python/generated_cases.c.h" stack_pointer[-1] = match; stack_pointer[-2] = rest; DISPATCH(); @@ -3070,21 +3060,21 @@ PyObject *right = stack_pointer[-1]; PyObject *left = stack_pointer[-2]; PyObject *b; - #line 2109 "Python/bytecodes.c" + #line 2100 "Python/bytecodes.c" assert(PyExceptionInstance_Check(left)); if (check_except_type_valid(tstate, right) < 0) { - #line 3077 "Python/generated_cases.c.h" + #line 3067 "Python/generated_cases.c.h" Py_DECREF(right); - #line 2112 "Python/bytecodes.c" + #line 2103 "Python/bytecodes.c" if (true) goto pop_1_error; } int res = PyErr_GivenExceptionMatches(left, right); - #line 3084 "Python/generated_cases.c.h" + #line 3074 "Python/generated_cases.c.h" Py_DECREF(right); - #line 2117 "Python/bytecodes.c" + #line 2108 "Python/bytecodes.c" b = res ? Py_True : Py_False; - #line 3088 "Python/generated_cases.c.h" + #line 3078 "Python/generated_cases.c.h" stack_pointer[-1] = b; DISPATCH(); } @@ -3093,15 +3083,15 @@ PyObject *fromlist = stack_pointer[-1]; PyObject *level = stack_pointer[-2]; PyObject *res; - #line 2121 "Python/bytecodes.c" + #line 2112 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); res = import_name(tstate, frame, name, fromlist, level); - #line 3100 "Python/generated_cases.c.h" + #line 3090 "Python/generated_cases.c.h" Py_DECREF(level); Py_DECREF(fromlist); - #line 2124 "Python/bytecodes.c" + #line 2115 "Python/bytecodes.c" if (res == NULL) goto pop_2_error; - #line 3105 "Python/generated_cases.c.h" + #line 3095 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; DISPATCH(); @@ -3110,26 +3100,25 @@ TARGET(IMPORT_FROM) { PyObject *from = stack_pointer[-1]; PyObject *res; - #line 2128 "Python/bytecodes.c" + #line 2119 "Python/bytecodes.c" PyObject *name = GETITEM(frame->f_code->co_names, oparg); res = import_from(tstate, from, name); if (res == NULL) goto error; - #line 3118 "Python/generated_cases.c.h" + #line 3108 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = res; DISPATCH(); } TARGET(JUMP_FORWARD) { - #line 2134 "Python/bytecodes.c" + #line 2125 "Python/bytecodes.c" JUMPBY(oparg); - #line 3127 "Python/generated_cases.c.h" + #line 3117 "Python/generated_cases.c.h" DISPATCH(); } TARGET(JUMP_BACKWARD) { - PREDICTED(JUMP_BACKWARD); - #line 2138 "Python/bytecodes.c" + #line 2129 "Python/bytecodes.c" _Py_CODEUNIT *here = next_instr - 1; assert(oparg <= INSTR_OFFSET()); JUMPBY(1-oparg); @@ -3146,13 +3135,13 @@ goto resume_frame; } #endif /* ENABLE_SPECIALIZATION */ - #line 3150 "Python/generated_cases.c.h" + #line 3139 "Python/generated_cases.c.h" CHECK_EVAL_BREAKER(); DISPATCH(); } TARGET(ENTER_EXECUTOR) { - #line 2158 "Python/bytecodes.c" + #line 2149 "Python/bytecodes.c" _PyExecutorObject *executor = (_PyExecutorObject *)frame->f_code->co_executors->executors[oparg]; Py_INCREF(executor); frame = executor->execute(executor, frame, stack_pointer); @@ -3161,21 +3150,20 @@ goto error; } goto resume_frame; - #line 3165 "Python/generated_cases.c.h" + #line 3154 "Python/generated_cases.c.h" } TARGET(POP_JUMP_IF_FALSE) { - PREDICTED(POP_JUMP_IF_FALSE); PyObject *cond = stack_pointer[-1]; - #line 2169 "Python/bytecodes.c" + #line 2160 "Python/bytecodes.c" if (Py_IsFalse(cond)) { JUMPBY(oparg); } else if (!Py_IsTrue(cond)) { int err = PyObject_IsTrue(cond); - #line 3177 "Python/generated_cases.c.h" + #line 3165 "Python/generated_cases.c.h" Py_DECREF(cond); - #line 2175 "Python/bytecodes.c" + #line 2166 "Python/bytecodes.c" if (err == 0) { JUMPBY(oparg); } @@ -3183,22 +3171,22 @@ if (err < 0) goto pop_1_error; } } - #line 3187 "Python/generated_cases.c.h" + #line 3175 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } TARGET(POP_JUMP_IF_TRUE) { PyObject *cond = stack_pointer[-1]; - #line 2185 "Python/bytecodes.c" + #line 2176 "Python/bytecodes.c" if (Py_IsTrue(cond)) { JUMPBY(oparg); } else if (!Py_IsFalse(cond)) { int err = PyObject_IsTrue(cond); - #line 3200 "Python/generated_cases.c.h" + #line 3188 "Python/generated_cases.c.h" Py_DECREF(cond); - #line 2191 "Python/bytecodes.c" + #line 2182 "Python/bytecodes.c" if (err > 0) { JUMPBY(oparg); } @@ -3206,63 +3194,63 @@ if (err < 0) goto pop_1_error; } } - #line 3210 "Python/generated_cases.c.h" + #line 3198 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } TARGET(POP_JUMP_IF_NOT_NONE) { PyObject *value = stack_pointer[-1]; - #line 2201 "Python/bytecodes.c" + #line 2192 "Python/bytecodes.c" if (!Py_IsNone(value)) { - #line 3219 "Python/generated_cases.c.h" + #line 3207 "Python/generated_cases.c.h" Py_DECREF(value); - #line 2203 "Python/bytecodes.c" + #line 2194 "Python/bytecodes.c" JUMPBY(oparg); } - #line 3224 "Python/generated_cases.c.h" + #line 3212 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } TARGET(POP_JUMP_IF_NONE) { PyObject *value = stack_pointer[-1]; - #line 2208 "Python/bytecodes.c" + #line 2199 "Python/bytecodes.c" if (Py_IsNone(value)) { JUMPBY(oparg); } else { - #line 3236 "Python/generated_cases.c.h" + #line 3224 "Python/generated_cases.c.h" Py_DECREF(value); - #line 2213 "Python/bytecodes.c" + #line 2204 "Python/bytecodes.c" } - #line 3240 "Python/generated_cases.c.h" + #line 3228 "Python/generated_cases.c.h" STACK_SHRINK(1); DISPATCH(); } TARGET(JUMP_BACKWARD_NO_INTERRUPT) { - #line 2217 "Python/bytecodes.c" + #line 2208 "Python/bytecodes.c" /* This bytecode is used in the `yield from` or `await` loop. * If there is an interrupt, we want it handled in the innermost * generator or coroutine, so we deliberately do not check it here. * (see bpo-30039). */ JUMPBY(-oparg); - #line 3253 "Python/generated_cases.c.h" + #line 3241 "Python/generated_cases.c.h" DISPATCH(); } TARGET(GET_LEN) { PyObject *obj = stack_pointer[-1]; PyObject *len_o; - #line 2226 "Python/bytecodes.c" + #line 2217 "Python/bytecodes.c" // PUSH(len(TOS)) Py_ssize_t len_i = PyObject_Length(obj); if (len_i < 0) goto error; len_o = PyLong_FromSsize_t(len_i); if (len_o == NULL) goto error; - #line 3266 "Python/generated_cases.c.h" + #line 3254 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = len_o; DISPATCH(); @@ -3273,16 +3261,16 @@ PyObject *type = stack_pointer[-2]; PyObject *subject = stack_pointer[-3]; PyObject *attrs; - #line 2234 "Python/bytecodes.c" + #line 2225 "Python/bytecodes.c" // Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or // None on failure. assert(PyTuple_CheckExact(names)); attrs = match_class(tstate, subject, type, oparg, names); - #line 3282 "Python/generated_cases.c.h" + #line 3270 "Python/generated_cases.c.h" Py_DECREF(subject); Py_DECREF(type); Py_DECREF(names); - #line 2239 "Python/bytecodes.c" + #line 2230 "Python/bytecodes.c" if (attrs) { assert(PyTuple_CheckExact(attrs)); // Success! } @@ -3290,7 +3278,7 @@ if (_PyErr_Occurred(tstate)) goto pop_3_error; attrs = Py_None; // Failure! } - #line 3294 "Python/generated_cases.c.h" + #line 3282 "Python/generated_cases.c.h" STACK_SHRINK(2); stack_pointer[-1] = attrs; DISPATCH(); @@ -3299,26 +3287,24 @@ TARGET(MATCH_MAPPING) { PyObject *subject = stack_pointer[-1]; PyObject *res; - #line 2249 "Python/bytecodes.c" + #line 2240 "Python/bytecodes.c" int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING; res = match ? Py_True : Py_False; - #line 3306 "Python/generated_cases.c.h" + #line 3294 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = res; - PREDICT(POP_JUMP_IF_FALSE); DISPATCH(); } TARGET(MATCH_SEQUENCE) { PyObject *subject = stack_pointer[-1]; PyObject *res; - #line 2255 "Python/bytecodes.c" + #line 2245 "Python/bytecodes.c" int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE; res = match ? Py_True : Py_False; - #line 3319 "Python/generated_cases.c.h" + #line 3306 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = res; - PREDICT(POP_JUMP_IF_FALSE); DISPATCH(); } @@ -3326,11 +3312,11 @@ PyObject *keys = stack_pointer[-1]; PyObject *subject = stack_pointer[-2]; PyObject *values_or_none; - #line 2261 "Python/bytecodes.c" + #line 2250 "Python/bytecodes.c" // On successful match, PUSH(values). Otherwise, PUSH(None). values_or_none = match_keys(tstate, subject, keys); if (values_or_none == NULL) goto error; - #line 3334 "Python/generated_cases.c.h" + #line 3320 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = values_or_none; DISPATCH(); @@ -3339,14 +3325,14 @@ TARGET(GET_ITER) { PyObject *iterable = stack_pointer[-1]; PyObject *iter; - #line 2267 "Python/bytecodes.c" + #line 2256 "Python/bytecodes.c" /* before: [obj]; after [getiter(obj)] */ iter = PyObject_GetIter(iterable); - #line 3346 "Python/generated_cases.c.h" + #line 3332 "Python/generated_cases.c.h" Py_DECREF(iterable); - #line 2270 "Python/bytecodes.c" + #line 2259 "Python/bytecodes.c" if (iter == NULL) goto pop_1_error; - #line 3350 "Python/generated_cases.c.h" + #line 3336 "Python/generated_cases.c.h" stack_pointer[-1] = iter; DISPATCH(); } @@ -3354,7 +3340,7 @@ TARGET(GET_YIELD_FROM_ITER) { PyObject *iterable = stack_pointer[-1]; PyObject *iter; - #line 2274 "Python/bytecodes.c" + #line 2263 "Python/bytecodes.c" /* before: [obj]; after [getiter(obj)] */ if (PyCoro_CheckExact(iterable)) { /* `iterable` is a coroutine */ @@ -3377,13 +3363,12 @@ if (iter == NULL) { goto error; } - #line 3381 "Python/generated_cases.c.h" + #line 3367 "Python/generated_cases.c.h" Py_DECREF(iterable); - #line 2297 "Python/bytecodes.c" + #line 2286 "Python/bytecodes.c" } - #line 3385 "Python/generated_cases.c.h" + #line 3371 "Python/generated_cases.c.h" stack_pointer[-1] = iter; - PREDICT(LOAD_CONST); DISPATCH(); } @@ -3392,7 +3377,7 @@ static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size"); PyObject *iter = stack_pointer[-1]; PyObject *next; - #line 2316 "Python/bytecodes.c" + #line 2304 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION _PyForIterCache *cache = (_PyForIterCache *)next_instr; if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { @@ -3423,7 +3408,7 @@ DISPATCH(); } // Common case: no jump, leave it to the code generator - #line 3427 "Python/generated_cases.c.h" + #line 3412 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = next; next_instr += 1; @@ -3431,7 +3416,7 @@ } TARGET(INSTRUMENTED_FOR_ITER) { - #line 2349 "Python/bytecodes.c" + #line 2337 "Python/bytecodes.c" _Py_CODEUNIT *here = next_instr-1; _Py_CODEUNIT *target; PyObject *iter = TOP(); @@ -3457,14 +3442,14 @@ target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1; } INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH); - #line 3461 "Python/generated_cases.c.h" + #line 3446 "Python/generated_cases.c.h" DISPATCH(); } TARGET(FOR_ITER_LIST) { PyObject *iter = stack_pointer[-1]; PyObject *next; - #line 2377 "Python/bytecodes.c" + #line 2365 "Python/bytecodes.c" DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER); _PyListIterObject *it = (_PyListIterObject *)iter; STAT_INC(FOR_ITER, hit); @@ -3484,7 +3469,7 @@ DISPATCH(); end_for_iter_list: // Common case: no jump, leave it to the code generator - #line 3488 "Python/generated_cases.c.h" + #line 3473 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = next; next_instr += 1; @@ -3494,7 +3479,7 @@ TARGET(FOR_ITER_TUPLE) { PyObject *iter = stack_pointer[-1]; PyObject *next; - #line 2399 "Python/bytecodes.c" + #line 2387 "Python/bytecodes.c" _PyTupleIterObject *it = (_PyTupleIterObject *)iter; DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER); STAT_INC(FOR_ITER, hit); @@ -3514,7 +3499,7 @@ DISPATCH(); end_for_iter_tuple: // Common case: no jump, leave it to the code generator - #line 3518 "Python/generated_cases.c.h" + #line 3503 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = next; next_instr += 1; @@ -3524,7 +3509,7 @@ TARGET(FOR_ITER_RANGE) { PyObject *iter = stack_pointer[-1]; PyObject *next; - #line 2421 "Python/bytecodes.c" + #line 2409 "Python/bytecodes.c" _PyRangeIterObject *r = (_PyRangeIterObject *)iter; DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER); STAT_INC(FOR_ITER, hit); @@ -3542,7 +3527,7 @@ if (next == NULL) { goto error; } - #line 3546 "Python/generated_cases.c.h" + #line 3531 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = next; next_instr += 1; @@ -3551,7 +3536,7 @@ TARGET(FOR_ITER_GEN) { PyObject *iter = stack_pointer[-1]; - #line 2441 "Python/bytecodes.c" + #line 2429 "Python/bytecodes.c" DEOPT_IF(tstate->interp->eval_frame, FOR_ITER); PyGenObject *gen = (PyGenObject *)iter; DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER); @@ -3567,14 +3552,14 @@ assert(next_instr[oparg].op.code == END_FOR || next_instr[oparg].op.code == INSTRUMENTED_END_FOR); DISPATCH_INLINED(gen_frame); - #line 3571 "Python/generated_cases.c.h" + #line 3556 "Python/generated_cases.c.h" } TARGET(BEFORE_ASYNC_WITH) { PyObject *mgr = stack_pointer[-1]; PyObject *exit; PyObject *res; - #line 2459 "Python/bytecodes.c" + #line 2447 "Python/bytecodes.c" PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__)); if (enter == NULL) { if (!_PyErr_Occurred(tstate)) { @@ -3597,20 +3582,19 @@ Py_DECREF(enter); goto error; } - #line 3601 "Python/generated_cases.c.h" + #line 3586 "Python/generated_cases.c.h" Py_DECREF(mgr); - #line 2482 "Python/bytecodes.c" + #line 2470 "Python/bytecodes.c" res = _PyObject_CallNoArgs(enter); Py_DECREF(enter); if (res == NULL) { Py_DECREF(exit); if (true) goto pop_1_error; } - #line 3610 "Python/generated_cases.c.h" + #line 3595 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = res; stack_pointer[-2] = exit; - PREDICT(GET_AWAITABLE); DISPATCH(); } @@ -3618,7 +3602,7 @@ PyObject *mgr = stack_pointer[-1]; PyObject *exit; PyObject *res; - #line 2492 "Python/bytecodes.c" + #line 2479 "Python/bytecodes.c" /* pop the context manager, push its __exit__ and the * value returned from calling its __enter__ */ @@ -3644,16 +3628,16 @@ Py_DECREF(enter); goto error; } - #line 3648 "Python/generated_cases.c.h" + #line 3632 "Python/generated_cases.c.h" Py_DECREF(mgr); - #line 2518 "Python/bytecodes.c" + #line 2505 "Python/bytecodes.c" res = _PyObject_CallNoArgs(enter); Py_DECREF(enter); if (res == NULL) { Py_DECREF(exit); if (true) goto pop_1_error; } - #line 3657 "Python/generated_cases.c.h" + #line 3641 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = res; stack_pointer[-2] = exit; @@ -3665,7 +3649,7 @@ PyObject *lasti = stack_pointer[-3]; PyObject *exit_func = stack_pointer[-4]; PyObject *res; - #line 2527 "Python/bytecodes.c" + #line 2514 "Python/bytecodes.c" /* At the top of the stack are 4 values: - val: TOP = exc_info() - unused: SECOND = previous exception @@ -3686,7 +3670,7 @@ res = PyObject_Vectorcall(exit_func, stack + 1, 3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); if (res == NULL) goto error; - #line 3690 "Python/generated_cases.c.h" + #line 3674 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = res; DISPATCH(); @@ -3695,7 +3679,7 @@ TARGET(PUSH_EXC_INFO) { PyObject *new_exc = stack_pointer[-1]; PyObject *prev_exc; - #line 2550 "Python/bytecodes.c" + #line 2537 "Python/bytecodes.c" _PyErr_StackItem *exc_info = tstate->exc_info; if (exc_info->exc_value != NULL) { prev_exc = exc_info->exc_value; @@ -3705,7 +3689,7 @@ } assert(PyExceptionInstance_Check(new_exc)); exc_info->exc_value = Py_NewRef(new_exc); - #line 3709 "Python/generated_cases.c.h" + #line 3693 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = new_exc; stack_pointer[-2] = prev_exc; @@ -3719,7 +3703,7 @@ uint32_t type_version = read_u32(&next_instr[1].cache); uint32_t keys_version = read_u32(&next_instr[3].cache); PyObject *descr = read_obj(&next_instr[5].cache); - #line 2562 "Python/bytecodes.c" + #line 2549 "Python/bytecodes.c" /* Cached method object */ PyTypeObject *self_cls = Py_TYPE(self); assert(type_version != 0); @@ -3736,7 +3720,7 @@ assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR)); res = self; assert(oparg & 1); - #line 3740 "Python/generated_cases.c.h" + #line 3724 "Python/generated_cases.c.h" STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; } @@ -3750,7 +3734,7 @@ PyObject *res; uint32_t type_version = read_u32(&next_instr[1].cache); PyObject *descr = read_obj(&next_instr[5].cache); - #line 2581 "Python/bytecodes.c" + #line 2568 "Python/bytecodes.c" PyTypeObject *self_cls = Py_TYPE(self); DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR); assert(self_cls->tp_dictoffset == 0); @@ -3760,7 +3744,7 @@ res2 = Py_NewRef(descr); res = self; assert(oparg & 1); - #line 3764 "Python/generated_cases.c.h" + #line 3748 "Python/generated_cases.c.h" STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; } @@ -3774,7 +3758,7 @@ PyObject *res; uint32_t type_version = read_u32(&next_instr[1].cache); PyObject *descr = read_obj(&next_instr[5].cache); - #line 2593 "Python/bytecodes.c" + #line 2580 "Python/bytecodes.c" PyTypeObject *self_cls = Py_TYPE(self); DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR); Py_ssize_t dictoffset = self_cls->tp_dictoffset; @@ -3788,7 +3772,7 @@ res2 = Py_NewRef(descr); res = self; assert(oparg & 1); - #line 3792 "Python/generated_cases.c.h" + #line 3776 "Python/generated_cases.c.h" STACK_GROW(((oparg & 1) ? 1 : 0)); stack_pointer[-1] = res; if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; } @@ -3797,16 +3781,16 @@ } TARGET(KW_NAMES) { - #line 2609 "Python/bytecodes.c" + #line 2596 "Python/bytecodes.c" assert(kwnames == NULL); assert(oparg < PyTuple_GET_SIZE(frame->f_code->co_consts)); kwnames = GETITEM(frame->f_code->co_consts, oparg); - #line 3805 "Python/generated_cases.c.h" + #line 3789 "Python/generated_cases.c.h" DISPATCH(); } TARGET(INSTRUMENTED_CALL) { - #line 2615 "Python/bytecodes.c" + #line 2602 "Python/bytecodes.c" int is_meth = PEEK(oparg+2) != NULL; int total_args = oparg + is_meth; PyObject *function = PEEK(total_args + 1); @@ -3819,7 +3803,7 @@ _PyCallCache *cache = (_PyCallCache *)next_instr; INCREMENT_ADAPTIVE_COUNTER(cache->counter); GO_TO_INSTRUCTION(CALL); - #line 3823 "Python/generated_cases.c.h" + #line 3807 "Python/generated_cases.c.h" } TARGET(CALL) { @@ -3829,7 +3813,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2660 "Python/bytecodes.c" + #line 2647 "Python/bytecodes.c" int is_meth = method != NULL; int total_args = oparg; if (is_meth) { @@ -3911,7 +3895,7 @@ Py_DECREF(args[i]); } if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 3915 "Python/generated_cases.c.h" + #line 3899 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -3923,7 +3907,7 @@ TARGET(CALL_BOUND_METHOD_EXACT_ARGS) { PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; - #line 2748 "Python/bytecodes.c" + #line 2735 "Python/bytecodes.c" DEOPT_IF(method != NULL, CALL); DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL); STAT_INC(CALL, hit); @@ -3933,7 +3917,7 @@ PEEK(oparg + 2) = Py_NewRef(meth); // method Py_DECREF(callable); GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS); - #line 3937 "Python/generated_cases.c.h" + #line 3921 "Python/generated_cases.c.h" } TARGET(CALL_PY_EXACT_ARGS) { @@ -3942,7 +3926,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; uint32_t func_version = read_u32(&next_instr[1].cache); - #line 2760 "Python/bytecodes.c" + #line 2747 "Python/bytecodes.c" assert(kwnames == NULL); DEOPT_IF(tstate->interp->eval_frame, CALL); int is_meth = method != NULL; @@ -3968,7 +3952,7 @@ JUMPBY(INLINE_CACHE_ENTRIES_CALL); frame->return_offset = 0; DISPATCH_INLINED(new_frame); - #line 3972 "Python/generated_cases.c.h" + #line 3956 "Python/generated_cases.c.h" } TARGET(CALL_PY_WITH_DEFAULTS) { @@ -3976,7 +3960,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; uint32_t func_version = read_u32(&next_instr[1].cache); - #line 2788 "Python/bytecodes.c" + #line 2775 "Python/bytecodes.c" assert(kwnames == NULL); DEOPT_IF(tstate->interp->eval_frame, CALL); int is_meth = method != NULL; @@ -4012,7 +3996,7 @@ JUMPBY(INLINE_CACHE_ENTRIES_CALL); frame->return_offset = 0; DISPATCH_INLINED(new_frame); - #line 4016 "Python/generated_cases.c.h" + #line 4000 "Python/generated_cases.c.h" } TARGET(CALL_NO_KW_TYPE_1) { @@ -4020,7 +4004,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *null = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2826 "Python/bytecodes.c" + #line 2813 "Python/bytecodes.c" assert(kwnames == NULL); assert(oparg == 1); DEOPT_IF(null != NULL, CALL); @@ -4030,7 +4014,7 @@ res = Py_NewRef(Py_TYPE(obj)); Py_DECREF(obj); Py_DECREF(&PyType_Type); // I.e., callable - #line 4034 "Python/generated_cases.c.h" + #line 4018 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4043,7 +4027,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *null = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2838 "Python/bytecodes.c" + #line 2825 "Python/bytecodes.c" assert(kwnames == NULL); assert(oparg == 1); DEOPT_IF(null != NULL, CALL); @@ -4054,7 +4038,7 @@ Py_DECREF(arg); Py_DECREF(&PyUnicode_Type); // I.e., callable if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4058 "Python/generated_cases.c.h" + #line 4042 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4068,7 +4052,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *null = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2852 "Python/bytecodes.c" + #line 2839 "Python/bytecodes.c" assert(kwnames == NULL); assert(oparg == 1); DEOPT_IF(null != NULL, CALL); @@ -4079,7 +4063,7 @@ Py_DECREF(arg); Py_DECREF(&PyTuple_Type); // I.e., tuple if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4083 "Python/generated_cases.c.h" + #line 4067 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4093,7 +4077,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2866 "Python/bytecodes.c" + #line 2853 "Python/bytecodes.c" int is_meth = method != NULL; int total_args = oparg; if (is_meth) { @@ -4115,7 +4099,7 @@ } Py_DECREF(tp); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4119 "Python/generated_cases.c.h" + #line 4103 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4129,7 +4113,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2891 "Python/bytecodes.c" + #line 2878 "Python/bytecodes.c" /* Builtin METH_O functions */ assert(kwnames == NULL); int is_meth = method != NULL; @@ -4157,7 +4141,7 @@ Py_DECREF(arg); Py_DECREF(callable); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4161 "Python/generated_cases.c.h" + #line 4145 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4171,7 +4155,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2922 "Python/bytecodes.c" + #line 2909 "Python/bytecodes.c" /* Builtin METH_FASTCALL functions, without keywords */ assert(kwnames == NULL); int is_meth = method != NULL; @@ -4203,7 +4187,7 @@ 'invalid'). In those cases an exception is set, so we must handle it. */ - #line 4207 "Python/generated_cases.c.h" + #line 4191 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4217,7 +4201,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2957 "Python/bytecodes.c" + #line 2944 "Python/bytecodes.c" /* Builtin METH_FASTCALL | METH_KEYWORDS functions */ int is_meth = method != NULL; int total_args = oparg; @@ -4249,7 +4233,7 @@ } Py_DECREF(callable); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4253 "Python/generated_cases.c.h" + #line 4237 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4263,7 +4247,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 2992 "Python/bytecodes.c" + #line 2979 "Python/bytecodes.c" assert(kwnames == NULL); /* len(o) */ int is_meth = method != NULL; @@ -4288,7 +4272,7 @@ Py_DECREF(callable); Py_DECREF(arg); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4292 "Python/generated_cases.c.h" + #line 4276 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4301,7 +4285,7 @@ PyObject *callable = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 3019 "Python/bytecodes.c" + #line 3006 "Python/bytecodes.c" assert(kwnames == NULL); /* isinstance(o, o2) */ int is_meth = method != NULL; @@ -4328,7 +4312,7 @@ Py_DECREF(cls); Py_DECREF(callable); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4332 "Python/generated_cases.c.h" + #line 4316 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4340,7 +4324,7 @@ PyObject **args = (stack_pointer - oparg); PyObject *self = stack_pointer[-(1 + oparg)]; PyObject *method = stack_pointer[-(2 + oparg)]; - #line 3049 "Python/bytecodes.c" + #line 3036 "Python/bytecodes.c" assert(kwnames == NULL); assert(oparg == 1); assert(method != NULL); @@ -4358,14 +4342,14 @@ JUMPBY(INLINE_CACHE_ENTRIES_CALL + 1); assert(next_instr[-1].op.code == POP_TOP); DISPATCH(); - #line 4362 "Python/generated_cases.c.h" + #line 4346 "Python/generated_cases.c.h" } TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) { PyObject **args = (stack_pointer - oparg); PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 3069 "Python/bytecodes.c" + #line 3056 "Python/bytecodes.c" assert(kwnames == NULL); int is_meth = method != NULL; int total_args = oparg; @@ -4396,7 +4380,7 @@ Py_DECREF(arg); Py_DECREF(callable); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4400 "Python/generated_cases.c.h" + #line 4384 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4409,7 +4393,7 @@ PyObject **args = (stack_pointer - oparg); PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 3103 "Python/bytecodes.c" + #line 3090 "Python/bytecodes.c" int is_meth = method != NULL; int total_args = oparg; if (is_meth) { @@ -4438,7 +4422,7 @@ } Py_DECREF(callable); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4442 "Python/generated_cases.c.h" + #line 4426 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4451,7 +4435,7 @@ PyObject **args = (stack_pointer - oparg); PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 3135 "Python/bytecodes.c" + #line 3122 "Python/bytecodes.c" assert(kwnames == NULL); assert(oparg == 0 || oparg == 1); int is_meth = method != NULL; @@ -4480,7 +4464,7 @@ Py_DECREF(self); Py_DECREF(callable); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4484 "Python/generated_cases.c.h" + #line 4468 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4493,7 +4477,7 @@ PyObject **args = (stack_pointer - oparg); PyObject *method = stack_pointer[-(2 + oparg)]; PyObject *res; - #line 3167 "Python/bytecodes.c" + #line 3154 "Python/bytecodes.c" assert(kwnames == NULL); int is_meth = method != NULL; int total_args = oparg; @@ -4521,7 +4505,7 @@ } Py_DECREF(callable); if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; } - #line 4525 "Python/generated_cases.c.h" + #line 4509 "Python/generated_cases.c.h" STACK_SHRINK(oparg); STACK_SHRINK(1); stack_pointer[-1] = res; @@ -4531,9 +4515,9 @@ } TARGET(INSTRUMENTED_CALL_FUNCTION_EX) { - #line 3198 "Python/bytecodes.c" + #line 3185 "Python/bytecodes.c" GO_TO_INSTRUCTION(CALL_FUNCTION_EX); - #line 4537 "Python/generated_cases.c.h" + #line 4521 "Python/generated_cases.c.h" } TARGET(CALL_FUNCTION_EX) { @@ -4542,7 +4526,7 @@ PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))]; PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))]; PyObject *result; - #line 3202 "Python/bytecodes.c" + #line 3189 "Python/bytecodes.c" // DICT_MERGE is called before this opcode if there are kwargs. // It converts all dict subtypes in kwargs into regular dicts. assert(kwargs == NULL || PyDict_CheckExact(kwargs)); @@ -4604,14 +4588,14 @@ } result = PyObject_Call(func, callargs, kwargs); } - #line 4608 "Python/generated_cases.c.h" + #line 4592 "Python/generated_cases.c.h" Py_DECREF(func); Py_DECREF(callargs); Py_XDECREF(kwargs); - #line 3264 "Python/bytecodes.c" + #line 3251 "Python/bytecodes.c" assert(PEEK(3 + (oparg & 1)) == NULL); if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; } - #line 4615 "Python/generated_cases.c.h" + #line 4599 "Python/generated_cases.c.h" STACK_SHRINK(((oparg & 1) ? 1 : 0)); STACK_SHRINK(2); stack_pointer[-1] = result; @@ -4626,7 +4610,7 @@ PyObject *kwdefaults = (oparg & MAKE_FUNCTION_KWDEFAULTS) ? stack_pointer[-(1 + ((oparg & MAKE_FUNCTION_CLOSURE) ? 1 : 0) + ((oparg & MAKE_FUNCTION_ANNOTATIONS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_KWDEFAULTS) ? 1 : 0))] : NULL; PyObject *defaults = (oparg & MAKE_FUNCTION_DEFAULTS) ? stack_pointer[-(1 + ((oparg & MAKE_FUNCTION_CLOSURE) ? 1 : 0) + ((oparg & MAKE_FUNCTION_ANNOTATIONS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_KWDEFAULTS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_DEFAULTS) ? 1 : 0))] : NULL; PyObject *func; - #line 3274 "Python/bytecodes.c" + #line 3261 "Python/bytecodes.c" PyFunctionObject *func_obj = (PyFunctionObject *) PyFunction_New(codeobj, GLOBALS()); @@ -4655,14 +4639,14 @@ func_obj->func_version = ((PyCodeObject *)codeobj)->co_version; func = (PyObject *)func_obj; - #line 4659 "Python/generated_cases.c.h" + #line 4643 "Python/generated_cases.c.h" STACK_SHRINK(((oparg & MAKE_FUNCTION_DEFAULTS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_KWDEFAULTS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_ANNOTATIONS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_CLOSURE) ? 1 : 0)); stack_pointer[-1] = func; DISPATCH(); } TARGET(RETURN_GENERATOR) { - #line 3305 "Python/bytecodes.c" + #line 3292 "Python/bytecodes.c" assert(PyFunction_Check(frame->f_funcobj)); PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj; PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func); @@ -4683,7 +4667,7 @@ frame = cframe.current_frame = prev; _PyFrame_StackPush(frame, (PyObject *)gen); goto resume_frame; - #line 4687 "Python/generated_cases.c.h" + #line 4671 "Python/generated_cases.c.h" } TARGET(BUILD_SLICE) { @@ -4691,15 +4675,15 @@ PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))]; PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))]; PyObject *slice; - #line 3328 "Python/bytecodes.c" + #line 3315 "Python/bytecodes.c" slice = PySlice_New(start, stop, step); - #line 4697 "Python/generated_cases.c.h" + #line 4681 "Python/generated_cases.c.h" Py_DECREF(start); Py_DECREF(stop); Py_XDECREF(step); - #line 3330 "Python/bytecodes.c" + #line 3317 "Python/bytecodes.c" if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; } - #line 4703 "Python/generated_cases.c.h" + #line 4687 "Python/generated_cases.c.h" STACK_SHRINK(((oparg == 3) ? 1 : 0)); STACK_SHRINK(1); stack_pointer[-1] = slice; @@ -4710,7 +4694,7 @@ PyObject *fmt_spec = ((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? stack_pointer[-((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0))] : NULL; PyObject *value = stack_pointer[-(1 + (((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0))]; PyObject *result; - #line 3334 "Python/bytecodes.c" + #line 3321 "Python/bytecodes.c" /* Handles f-string value formatting. */ PyObject *(*conv_fn)(PyObject *); int which_conversion = oparg & FVC_MASK; @@ -4745,7 +4729,7 @@ Py_DECREF(value); Py_XDECREF(fmt_spec); if (result == NULL) { STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0)); goto pop_1_error; } - #line 4749 "Python/generated_cases.c.h" + #line 4733 "Python/generated_cases.c.h" STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0)); stack_pointer[-1] = result; DISPATCH(); @@ -4754,10 +4738,10 @@ TARGET(COPY) { PyObject *bottom = stack_pointer[-(1 + (oparg-1))]; PyObject *top; - #line 3371 "Python/bytecodes.c" + #line 3358 "Python/bytecodes.c" assert(oparg > 0); top = Py_NewRef(bottom); - #line 4761 "Python/generated_cases.c.h" + #line 4745 "Python/generated_cases.c.h" STACK_GROW(1); stack_pointer[-1] = top; DISPATCH(); @@ -4769,7 +4753,7 @@ PyObject *rhs = stack_pointer[-1]; PyObject *lhs = stack_pointer[-2]; PyObject *res; - #line 3376 "Python/bytecodes.c" + #line 3363 "Python/bytecodes.c" #if ENABLE_SPECIALIZATION _PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr; if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { @@ -4784,12 +4768,12 @@ assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops)); assert(binary_ops[oparg]); res = binary_ops[oparg](lhs, rhs); - #line 4788 "Python/generated_cases.c.h" + #line 4772 "Python/generated_cases.c.h" Py_DECREF(lhs); Py_DECREF(rhs); - #line 3391 "Python/bytecodes.c" + #line 3378 "Python/bytecodes.c" if (res == NULL) goto pop_2_error; - #line 4793 "Python/generated_cases.c.h" + #line 4777 "Python/generated_cases.c.h" STACK_SHRINK(1); stack_pointer[-1] = res; next_instr += 1; @@ -4799,16 +4783,16 @@ TARGET(SWAP) { PyObject *top = stack_pointer[-1]; PyObject *bottom = stack_pointer[-(2 + (oparg-2))]; - #line 3396 "Python/bytecodes.c" + #line 3383 "Python/bytecodes.c" assert(oparg >= 2); - #line 4805 "Python/generated_cases.c.h" + #line 4789 "Python/generated_cases.c.h" stack_pointer[-1] = bottom; stack_pointer[-(2 + (oparg-2))] = top; DISPATCH(); } TARGET(INSTRUMENTED_INSTRUCTION) { - #line 3400 "Python/bytecodes.c" + #line 3387 "Python/bytecodes.c" int next_opcode = _Py_call_instrumentation_instruction( tstate, frame, next_instr-1); if (next_opcode < 0) goto error; @@ -4820,26 +4804,26 @@ assert(next_opcode > 0 && next_opcode < 256); opcode = next_opcode; DISPATCH_GOTO(); - #line 4824 "Python/generated_cases.c.h" + #line 4808 "Python/generated_cases.c.h" } TARGET(INSTRUMENTED_JUMP_FORWARD) { - #line 3414 "Python/bytecodes.c" + #line 3401 "Python/bytecodes.c" INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP); - #line 4830 "Python/generated_cases.c.h" + #line 4814 "Python/generated_cases.c.h" DISPATCH(); } TARGET(INSTRUMENTED_JUMP_BACKWARD) { - #line 3418 "Python/bytecodes.c" + #line 3405 "Python/bytecodes.c" INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP); - #line 4837 "Python/generated_cases.c.h" + #line 4821 "Python/generated_cases.c.h" CHECK_EVAL_BREAKER(); DISPATCH(); } TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) { - #line 3423 "Python/bytecodes.c" + #line 3410 "Python/bytecodes.c" PyObject *cond = POP(); int err = PyObject_IsTrue(cond); Py_DECREF(cond); @@ -4848,12 +4832,12 @@ assert(err == 0 || err == 1); int offset = err*oparg; INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH); - #line 4852 "Python/generated_cases.c.h" + #line 4836 "Python/generated_cases.c.h" DISPATCH(); } TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) { - #line 3434 "Python/bytecodes.c" + #line 3421 "Python/bytecodes.c" PyObject *cond = POP(); int err = PyObject_IsTrue(cond); Py_DECREF(cond); @@ -4862,12 +4846,12 @@ assert(err == 0 || err == 1); int offset = (1-err)*oparg; INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH); - #line 4866 "Python/generated_cases.c.h" + #line 4850 "Python/generated_cases.c.h" DISPATCH(); } TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) { - #line 3445 "Python/bytecodes.c" + #line 3432 "Python/bytecodes.c" PyObject *value = POP(); _Py_CODEUNIT *here = next_instr-1; int offset; @@ -4879,12 +4863,12 @@ offset = 0; } INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH); - #line 4883 "Python/generated_cases.c.h" + #line 4867 "Python/generated_cases.c.h" DISPATCH(); } TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) { - #line 3459 "Python/bytecodes.c" + #line 3446 "Python/bytecodes.c" PyObject *value = POP(); _Py_CODEUNIT *here = next_instr-1; int offset; @@ -4896,30 +4880,30 @@ offset = oparg; } INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH); - #line 4900 "Python/generated_cases.c.h" + #line 4884 "Python/generated_cases.c.h" DISPATCH(); } TARGET(EXTENDED_ARG) { - #line 3473 "Python/bytecodes.c" + #line 3460 "Python/bytecodes.c" assert(oparg); opcode = next_instr->op.code; oparg = oparg << 8 | next_instr->op.arg; PRE_DISPATCH_GOTO(); DISPATCH_GOTO(); - #line 4911 "Python/generated_cases.c.h" + #line 4895 "Python/generated_cases.c.h" } TARGET(CACHE) { - #line 3481 "Python/bytecodes.c" + #line 3468 "Python/bytecodes.c" assert(0 && "Executing a cache."); Py_UNREACHABLE(); - #line 4918 "Python/generated_cases.c.h" + #line 4902 "Python/generated_cases.c.h" } TARGET(RESERVED) { - #line 3486 "Python/bytecodes.c" + #line 3473 "Python/bytecodes.c" assert(0 && "Executing RESERVED instruction."); Py_UNREACHABLE(); - #line 4925 "Python/generated_cases.c.h" + #line 4909 "Python/generated_cases.c.h" } |