summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorMark Shannon <mark@hotpy.org>2023-06-08 11:35:34 (GMT)
committerGitHub <noreply@github.com>2023-06-08 11:35:34 (GMT)
commite830289c52cecd99e5e2291972d648e9b3452a51 (patch)
tree096949cf5c51cb557f8d844940771cd7e2ee3a4e /Python
parent410c2f13e50ea53074cb1fb8074ac0c4d3564cc8 (diff)
downloadcpython-e830289c52cecd99e5e2291972d648e9b3452a51.zip
cpython-e830289c52cecd99e5e2291972d648e9b3452a51.tar.gz
cpython-e830289c52cecd99e5e2291972d648e9b3452a51.tar.bz2
GH-105229: Remove remaining two-codeunit superinstructions (GH-105326)
* Remove LOAD_CONST__LOAD_FAST and LOAD_FAST__LOAD_CONST superinstructions.
Diffstat (limited to 'Python')
-rw-r--r--Python/bytecodes.c3
-rw-r--r--Python/flowgraph.c2
-rw-r--r--Python/generated_cases.c.h1022
-rw-r--r--Python/instrumentation.c14
-rw-r--r--Python/opcode_metadata.h12
-rw-r--r--Python/opcode_targets.h20
-rw-r--r--Python/specialize.c10
7 files changed, 495 insertions, 588 deletions
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 1dc8011..e7f7c1a 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -233,9 +233,6 @@ dummy_func(
SETLOCAL(oparg2, value2);
}
- super(LOAD_FAST__LOAD_CONST) = LOAD_FAST + LOAD_CONST;
- super(LOAD_CONST__LOAD_FAST) = LOAD_CONST + LOAD_FAST;
-
inst(POP_TOP, (value --)) {
DECREF_INPUTS();
}
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
index b16b508..a144057 100644
--- a/Python/flowgraph.c
+++ b/Python/flowgraph.c
@@ -1676,7 +1676,6 @@ scan_block_for_locals(basicblock *b, basicblock ***sp)
for (int i = 0; i < b->b_iused; i++) {
cfg_instr *instr = &b->b_instr[i];
assert(instr->i_opcode != EXTENDED_ARG);
- assert(!IS_SUPERINSTRUCTION_OPCODE(instr->i_opcode));
if (instr->i_except != NULL) {
maybe_push(instr->i_except, unsafe_mask, sp);
}
@@ -1735,7 +1734,6 @@ fast_scan_many_locals(basicblock *entryblock, int nlocals)
for (int i = 0; i < b->b_iused; i++) {
cfg_instr *instr = &b->b_instr[i];
assert(instr->i_opcode != EXTENDED_ARG);
- assert(!IS_SUPERINSTRUCTION_OPCODE(instr->i_opcode));
int arg = instr->i_oparg;
if (arg < 64) {
continue;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 8f61ec3..5f54c86 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -168,64 +168,10 @@
DISPATCH();
}
- TARGET(LOAD_FAST__LOAD_CONST) {
- PyObject *_tmp_1;
- PyObject *_tmp_2;
- {
- PyObject *value;
- #line 192 "Python/bytecodes.c"
- value = GETLOCAL(oparg);
- assert(value != NULL);
- Py_INCREF(value);
- #line 181 "Python/generated_cases.c.h"
- _tmp_2 = value;
- }
- oparg = (next_instr++)->op.arg;
- {
- PyObject *value;
- #line 213 "Python/bytecodes.c"
- value = GETITEM(frame->f_code->co_consts, oparg);
- Py_INCREF(value);
- #line 190 "Python/generated_cases.c.h"
- _tmp_1 = value;
- }
- STACK_GROW(2);
- stack_pointer[-1] = _tmp_1;
- stack_pointer[-2] = _tmp_2;
- DISPATCH();
- }
-
- TARGET(LOAD_CONST__LOAD_FAST) {
- PyObject *_tmp_1;
- PyObject *_tmp_2;
- {
- PyObject *value;
- #line 213 "Python/bytecodes.c"
- value = GETITEM(frame->f_code->co_consts, oparg);
- Py_INCREF(value);
- #line 207 "Python/generated_cases.c.h"
- _tmp_2 = value;
- }
- oparg = (next_instr++)->op.arg;
- {
- PyObject *value;
- #line 192 "Python/bytecodes.c"
- value = GETLOCAL(oparg);
- assert(value != NULL);
- Py_INCREF(value);
- #line 217 "Python/generated_cases.c.h"
- _tmp_1 = value;
- }
- STACK_GROW(2);
- stack_pointer[-1] = _tmp_1;
- stack_pointer[-2] = _tmp_2;
- DISPATCH();
- }
-
TARGET(POP_TOP) {
PyObject *value = stack_pointer[-1];
- #line 240 "Python/bytecodes.c"
- #line 229 "Python/generated_cases.c.h"
+ #line 237 "Python/bytecodes.c"
+ #line 175 "Python/generated_cases.c.h"
Py_DECREF(value);
STACK_SHRINK(1);
DISPATCH();
@@ -233,9 +179,9 @@
TARGET(PUSH_NULL) {
PyObject *res;
- #line 244 "Python/bytecodes.c"
+ #line 241 "Python/bytecodes.c"
res = NULL;
- #line 239 "Python/generated_cases.c.h"
+ #line 185 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -246,14 +192,14 @@
PyObject *_tmp_2 = stack_pointer[-2];
{
PyObject *value = _tmp_1;
- #line 240 "Python/bytecodes.c"
- #line 251 "Python/generated_cases.c.h"
+ #line 237 "Python/bytecodes.c"
+ #line 197 "Python/generated_cases.c.h"
Py_DECREF(value);
}
{
PyObject *value = _tmp_2;
- #line 240 "Python/bytecodes.c"
- #line 257 "Python/generated_cases.c.h"
+ #line 237 "Python/bytecodes.c"
+ #line 203 "Python/generated_cases.c.h"
Py_DECREF(value);
}
STACK_SHRINK(2);
@@ -263,7 +209,7 @@
TARGET(INSTRUMENTED_END_FOR) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 250 "Python/bytecodes.c"
+ #line 247 "Python/bytecodes.c"
/* Need to create a fake StopIteration error here,
* to conform to PEP 380 */
if (PyGen_Check(receiver)) {
@@ -273,7 +219,7 @@
}
PyErr_SetRaisedException(NULL);
}
- #line 277 "Python/generated_cases.c.h"
+ #line 223 "Python/generated_cases.c.h"
Py_DECREF(receiver);
Py_DECREF(value);
STACK_SHRINK(2);
@@ -283,9 +229,9 @@
TARGET(END_SEND) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 263 "Python/bytecodes.c"
+ #line 260 "Python/bytecodes.c"
Py_DECREF(receiver);
- #line 289 "Python/generated_cases.c.h"
+ #line 235 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -294,7 +240,7 @@
TARGET(INSTRUMENTED_END_SEND) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 267 "Python/bytecodes.c"
+ #line 264 "Python/bytecodes.c"
if (PyGen_Check(receiver) || PyCoro_CheckExact(receiver)) {
PyErr_SetObject(PyExc_StopIteration, value);
if (monitor_stop_iteration(tstate, frame, next_instr-1)) {
@@ -303,7 +249,7 @@
PyErr_SetRaisedException(NULL);
}
Py_DECREF(receiver);
- #line 307 "Python/generated_cases.c.h"
+ #line 253 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -312,13 +258,13 @@
TARGET(UNARY_NEGATIVE) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 278 "Python/bytecodes.c"
+ #line 275 "Python/bytecodes.c"
res = PyNumber_Negative(value);
- #line 318 "Python/generated_cases.c.h"
+ #line 264 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 280 "Python/bytecodes.c"
+ #line 277 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 322 "Python/generated_cases.c.h"
+ #line 268 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -326,11 +272,11 @@
TARGET(UNARY_NOT) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 284 "Python/bytecodes.c"
+ #line 281 "Python/bytecodes.c"
int err = PyObject_IsTrue(value);
- #line 332 "Python/generated_cases.c.h"
+ #line 278 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 286 "Python/bytecodes.c"
+ #line 283 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
if (err == 0) {
res = Py_True;
@@ -338,7 +284,7 @@
else {
res = Py_False;
}
- #line 342 "Python/generated_cases.c.h"
+ #line 288 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -346,13 +292,13 @@
TARGET(UNARY_INVERT) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 296 "Python/bytecodes.c"
+ #line 293 "Python/bytecodes.c"
res = PyNumber_Invert(value);
- #line 352 "Python/generated_cases.c.h"
+ #line 298 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 298 "Python/bytecodes.c"
+ #line 295 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 356 "Python/generated_cases.c.h"
+ #line 302 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -363,10 +309,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 314 "Python/bytecodes.c"
+ #line 311 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 370 "Python/generated_cases.c.h"
+ #line 316 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -374,13 +320,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 319 "Python/bytecodes.c"
+ #line 316 "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 384 "Python/generated_cases.c.h"
+ #line 330 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -395,10 +341,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 314 "Python/bytecodes.c"
+ #line 311 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 402 "Python/generated_cases.c.h"
+ #line 348 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -406,13 +352,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 327 "Python/bytecodes.c"
+ #line 324 "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 416 "Python/generated_cases.c.h"
+ #line 362 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -427,10 +373,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 314 "Python/bytecodes.c"
+ #line 311 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 434 "Python/generated_cases.c.h"
+ #line 380 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -438,13 +384,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 335 "Python/bytecodes.c"
+ #line 332 "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 448 "Python/generated_cases.c.h"
+ #line 394 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -459,10 +405,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 350 "Python/bytecodes.c"
+ #line 347 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 466 "Python/generated_cases.c.h"
+ #line 412 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -470,13 +416,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 355 "Python/bytecodes.c"
+ #line 352 "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 480 "Python/generated_cases.c.h"
+ #line 426 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -491,10 +437,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 350 "Python/bytecodes.c"
+ #line 347 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 498 "Python/generated_cases.c.h"
+ #line 444 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -502,13 +448,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 363 "Python/bytecodes.c"
+ #line 360 "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 512 "Python/generated_cases.c.h"
+ #line 458 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -523,10 +469,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 350 "Python/bytecodes.c"
+ #line 347 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 530 "Python/generated_cases.c.h"
+ #line 476 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -534,13 +480,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 371 "Python/bytecodes.c"
+ #line 368 "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 544 "Python/generated_cases.c.h"
+ #line 490 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -555,10 +501,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 386 "Python/bytecodes.c"
+ #line 383 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 562 "Python/generated_cases.c.h"
+ #line 508 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -566,13 +512,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 391 "Python/bytecodes.c"
+ #line 388 "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 576 "Python/generated_cases.c.h"
+ #line 522 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -587,17 +533,17 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 386 "Python/bytecodes.c"
+ #line 383 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 594 "Python/generated_cases.c.h"
+ #line 540 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 408 "Python/bytecodes.c"
+ #line 405 "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);
@@ -621,7 +567,7 @@
if (*target_local == NULL) goto pop_2_error;
// The STORE_FAST is already done.
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
- #line 625 "Python/generated_cases.c.h"
+ #line 571 "Python/generated_cases.c.h"
}
STACK_SHRINK(2);
DISPATCH();
@@ -633,7 +579,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
PyObject *res;
- #line 445 "Python/bytecodes.c"
+ #line 442 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -645,12 +591,12 @@
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
res = PyObject_GetItem(container, sub);
- #line 649 "Python/generated_cases.c.h"
+ #line 595 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 457 "Python/bytecodes.c"
+ #line 454 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 654 "Python/generated_cases.c.h"
+ #line 600 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -662,7 +608,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *res;
- #line 461 "Python/bytecodes.c"
+ #line 458 "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.
@@ -675,7 +621,7 @@
}
Py_DECREF(container);
if (res == NULL) goto pop_3_error;
- #line 679 "Python/generated_cases.c.h"
+ #line 625 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = res;
DISPATCH();
@@ -686,7 +632,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *v = stack_pointer[-4];
- #line 476 "Python/bytecodes.c"
+ #line 473 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
int err;
if (slice == NULL) {
@@ -699,7 +645,7 @@
Py_DECREF(v);
Py_DECREF(container);
if (err) goto pop_4_error;
- #line 703 "Python/generated_cases.c.h"
+ #line 649 "Python/generated_cases.c.h"
STACK_SHRINK(4);
DISPATCH();
}
@@ -708,7 +654,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *res;
- #line 491 "Python/bytecodes.c"
+ #line 488 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
@@ -722,7 +668,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 726 "Python/generated_cases.c.h"
+ #line 672 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -733,7 +679,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *tuple = stack_pointer[-2];
PyObject *res;
- #line 507 "Python/bytecodes.c"
+ #line 504 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
@@ -747,7 +693,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(tuple);
- #line 751 "Python/generated_cases.c.h"
+ #line 697 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -758,7 +704,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *res;
- #line 523 "Python/bytecodes.c"
+ #line 520 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
res = PyDict_GetItemWithError(dict, sub);
@@ -766,14 +712,14 @@
if (!_PyErr_Occurred(tstate)) {
_PyErr_SetKeyError(sub);
}
- #line 770 "Python/generated_cases.c.h"
+ #line 716 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
- #line 531 "Python/bytecodes.c"
+ #line 528 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
Py_INCREF(res); // Do this before DECREF'ing dict, sub
- #line 777 "Python/generated_cases.c.h"
+ #line 723 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
STACK_SHRINK(1);
@@ -785,7 +731,7 @@
TARGET(BINARY_SUBSCR_GETITEM) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 538 "Python/bytecodes.c"
+ #line 535 "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);
@@ -808,15 +754,15 @@
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_SUBSCR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 812 "Python/generated_cases.c.h"
+ #line 758 "Python/generated_cases.c.h"
}
TARGET(LIST_APPEND) {
PyObject *v = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 563 "Python/bytecodes.c"
+ #line 560 "Python/bytecodes.c"
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
- #line 820 "Python/generated_cases.c.h"
+ #line 766 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -824,13 +770,13 @@
TARGET(SET_ADD) {
PyObject *v = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 567 "Python/bytecodes.c"
+ #line 564 "Python/bytecodes.c"
int err = PySet_Add(set, v);
- #line 830 "Python/generated_cases.c.h"
+ #line 776 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 569 "Python/bytecodes.c"
+ #line 566 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 834 "Python/generated_cases.c.h"
+ #line 780 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -842,7 +788,7 @@
PyObject *container = stack_pointer[-2];
PyObject *v = stack_pointer[-3];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 579 "Python/bytecodes.c"
+ #line 576 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr--;
@@ -857,13 +803,13 @@
#endif /* ENABLE_SPECIALIZATION */
/* container[sub] = v */
int err = PyObject_SetItem(container, sub, v);
- #line 861 "Python/generated_cases.c.h"
+ #line 807 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(container);
Py_DECREF(sub);
- #line 594 "Python/bytecodes.c"
+ #line 591 "Python/bytecodes.c"
if (err) goto pop_3_error;
- #line 867 "Python/generated_cases.c.h"
+ #line 813 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -873,7 +819,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 598 "Python/bytecodes.c"
+ #line 595 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
@@ -890,7 +836,7 @@
Py_DECREF(old_value);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 894 "Python/generated_cases.c.h"
+ #line 840 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -900,13 +846,13 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 617 "Python/bytecodes.c"
+ #line 614 "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 910 "Python/generated_cases.c.h"
+ #line 856 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -915,15 +861,15 @@
TARGET(DELETE_SUBSCR) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 625 "Python/bytecodes.c"
+ #line 622 "Python/bytecodes.c"
/* del container[sub] */
int err = PyObject_DelItem(container, sub);
- #line 922 "Python/generated_cases.c.h"
+ #line 868 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 628 "Python/bytecodes.c"
+ #line 625 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 927 "Python/generated_cases.c.h"
+ #line 873 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -931,14 +877,14 @@
TARGET(CALL_INTRINSIC_1) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 632 "Python/bytecodes.c"
+ #line 629 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_1);
res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value);
- #line 938 "Python/generated_cases.c.h"
+ #line 884 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 635 "Python/bytecodes.c"
+ #line 632 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 942 "Python/generated_cases.c.h"
+ #line 888 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -947,15 +893,15 @@
PyObject *value1 = stack_pointer[-1];
PyObject *value2 = stack_pointer[-2];
PyObject *res;
- #line 639 "Python/bytecodes.c"
+ #line 636 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_2);
res = _PyIntrinsics_BinaryFunctions[oparg](tstate, value2, value1);
- #line 954 "Python/generated_cases.c.h"
+ #line 900 "Python/generated_cases.c.h"
Py_DECREF(value2);
Py_DECREF(value1);
- #line 642 "Python/bytecodes.c"
+ #line 639 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 959 "Python/generated_cases.c.h"
+ #line 905 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -963,7 +909,7 @@
TARGET(RAISE_VARARGS) {
PyObject **args = (stack_pointer - oparg);
- #line 646 "Python/bytecodes.c"
+ #line 643 "Python/bytecodes.c"
PyObject *cause = NULL, *exc = NULL;
switch (oparg) {
case 2:
@@ -981,12 +927,12 @@
break;
}
if (true) { STACK_SHRINK(oparg); goto error; }
- #line 985 "Python/generated_cases.c.h"
+ #line 931 "Python/generated_cases.c.h"
}
TARGET(INTERPRETER_EXIT) {
PyObject *retval = stack_pointer[-1];
- #line 666 "Python/bytecodes.c"
+ #line 663 "Python/bytecodes.c"
assert(frame == &entry_frame);
assert(_PyFrame_IsIncomplete(frame));
STACK_SHRINK(1); // Since we're not going to DISPATCH()
@@ -997,12 +943,12 @@
assert(!_PyErr_Occurred(tstate));
_Py_LeaveRecursiveCallTstate(tstate);
return retval;
- #line 1001 "Python/generated_cases.c.h"
+ #line 947 "Python/generated_cases.c.h"
}
TARGET(RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 679 "Python/bytecodes.c"
+ #line 676 "Python/bytecodes.c"
STACK_SHRINK(1);
assert(EMPTY());
_PyFrame_SetStackPointer(frame, stack_pointer);
@@ -1015,12 +961,12 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1019 "Python/generated_cases.c.h"
+ #line 965 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 694 "Python/bytecodes.c"
+ #line 691 "Python/bytecodes.c"
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
frame, next_instr-1, retval);
@@ -1037,11 +983,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1041 "Python/generated_cases.c.h"
+ #line 987 "Python/generated_cases.c.h"
}
TARGET(RETURN_CONST) {
- #line 713 "Python/bytecodes.c"
+ #line 710 "Python/bytecodes.c"
PyObject *retval = GETITEM(frame->f_code->co_consts, oparg);
Py_INCREF(retval);
assert(EMPTY());
@@ -1055,11 +1001,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1059 "Python/generated_cases.c.h"
+ #line 1005 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_CONST) {
- #line 729 "Python/bytecodes.c"
+ #line 726 "Python/bytecodes.c"
PyObject *retval = GETITEM(frame->f_code->co_consts, oparg);
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
@@ -1077,13 +1023,13 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1081 "Python/generated_cases.c.h"
+ #line 1027 "Python/generated_cases.c.h"
}
TARGET(GET_AITER) {
PyObject *obj = stack_pointer[-1];
PyObject *iter;
- #line 749 "Python/bytecodes.c"
+ #line 746 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyTypeObject *type = Py_TYPE(obj);
@@ -1096,16 +1042,16 @@
"'async for' requires an object with "
"__aiter__ method, got %.100s",
type->tp_name);
- #line 1100 "Python/generated_cases.c.h"
+ #line 1046 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 762 "Python/bytecodes.c"
+ #line 759 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
iter = (*getter)(obj);
- #line 1107 "Python/generated_cases.c.h"
+ #line 1053 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 767 "Python/bytecodes.c"
+ #line 764 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
if (Py_TYPE(iter)->tp_as_async == NULL ||
@@ -1118,7 +1064,7 @@
Py_DECREF(iter);
if (true) goto pop_1_error;
}
- #line 1122 "Python/generated_cases.c.h"
+ #line 1068 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -1126,7 +1072,7 @@
TARGET(GET_ANEXT) {
PyObject *aiter = stack_pointer[-1];
PyObject *awaitable;
- #line 782 "Python/bytecodes.c"
+ #line 779 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyObject *next_iter = NULL;
PyTypeObject *type = Py_TYPE(aiter);
@@ -1169,7 +1115,7 @@
Py_DECREF(next_iter);
}
}
- #line 1173 "Python/generated_cases.c.h"
+ #line 1119 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = awaitable;
DISPATCH();
@@ -1178,16 +1124,16 @@
TARGET(GET_AWAITABLE) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 827 "Python/bytecodes.c"
+ #line 824 "Python/bytecodes.c"
iter = _PyCoro_GetAwaitableIter(iterable);
if (iter == NULL) {
format_awaitable_error(tstate, Py_TYPE(iterable), oparg);
}
- #line 1189 "Python/generated_cases.c.h"
+ #line 1135 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 834 "Python/bytecodes.c"
+ #line 831 "Python/bytecodes.c"
if (iter != NULL && PyCoro_CheckExact(iter)) {
PyObject *yf = _PyGen_yf((PyGenObject*)iter);
@@ -1204,7 +1150,7 @@
}
if (iter == NULL) goto pop_1_error;
- #line 1208 "Python/generated_cases.c.h"
+ #line 1154 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -1215,7 +1161,7 @@
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
PyObject *retval;
- #line 858 "Python/bytecodes.c"
+ #line 855 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PySendCache *cache = (_PySendCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1262,7 +1208,7 @@
}
}
Py_DECREF(v);
- #line 1266 "Python/generated_cases.c.h"
+ #line 1212 "Python/generated_cases.c.h"
stack_pointer[-1] = retval;
next_instr += 1;
DISPATCH();
@@ -1271,7 +1217,7 @@
TARGET(SEND_GEN) {
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 907 "Python/bytecodes.c"
+ #line 904 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, SEND);
PyGenObject *gen = (PyGenObject *)receiver;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type &&
@@ -1287,12 +1233,12 @@
tstate->exc_info = &gen->gi_exc_state;
JUMPBY(INLINE_CACHE_ENTRIES_SEND);
DISPATCH_INLINED(gen_frame);
- #line 1291 "Python/generated_cases.c.h"
+ #line 1237 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 925 "Python/bytecodes.c"
+ #line 922 "Python/bytecodes.c"
assert(frame != &entry_frame);
PyGenObject *gen = _PyFrame_GetGenerator(frame);
gen->gi_frame_state = FRAME_SUSPENDED;
@@ -1309,12 +1255,12 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1313 "Python/generated_cases.c.h"
+ #line 1259 "Python/generated_cases.c.h"
}
TARGET(YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 944 "Python/bytecodes.c"
+ #line 941 "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.
@@ -1330,15 +1276,15 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1334 "Python/generated_cases.c.h"
+ #line 1280 "Python/generated_cases.c.h"
}
TARGET(POP_EXCEPT) {
PyObject *exc_value = stack_pointer[-1];
- #line 962 "Python/bytecodes.c"
+ #line 959 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
Py_XSETREF(exc_info->exc_value, exc_value);
- #line 1342 "Python/generated_cases.c.h"
+ #line 1288 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1346,7 +1292,7 @@
TARGET(RERAISE) {
PyObject *exc = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
- #line 967 "Python/bytecodes.c"
+ #line 964 "Python/bytecodes.c"
assert(oparg >= 0 && oparg <= 2);
if (oparg) {
PyObject *lasti = values[0];
@@ -1364,26 +1310,26 @@
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
- #line 1368 "Python/generated_cases.c.h"
+ #line 1314 "Python/generated_cases.c.h"
}
TARGET(END_ASYNC_FOR) {
PyObject *exc = stack_pointer[-1];
PyObject *awaitable = stack_pointer[-2];
- #line 987 "Python/bytecodes.c"
+ #line 984 "Python/bytecodes.c"
assert(exc && PyExceptionInstance_Check(exc));
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
- #line 1377 "Python/generated_cases.c.h"
+ #line 1323 "Python/generated_cases.c.h"
Py_DECREF(awaitable);
Py_DECREF(exc);
- #line 990 "Python/bytecodes.c"
+ #line 987 "Python/bytecodes.c"
}
else {
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
}
- #line 1387 "Python/generated_cases.c.h"
+ #line 1333 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -1394,23 +1340,23 @@
PyObject *sub_iter = stack_pointer[-3];
PyObject *none;
PyObject *value;
- #line 999 "Python/bytecodes.c"
+ #line 996 "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 1403 "Python/generated_cases.c.h"
+ #line 1349 "Python/generated_cases.c.h"
Py_DECREF(sub_iter);
Py_DECREF(last_sent_val);
Py_DECREF(exc_value);
- #line 1004 "Python/bytecodes.c"
+ #line 1001 "Python/bytecodes.c"
none = Py_None;
}
else {
_PyErr_SetRaisedException(tstate, Py_NewRef(exc_value));
goto exception_unwind;
}
- #line 1414 "Python/generated_cases.c.h"
+ #line 1360 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
stack_pointer[-2] = none;
@@ -1419,9 +1365,9 @@
TARGET(LOAD_ASSERTION_ERROR) {
PyObject *value;
- #line 1013 "Python/bytecodes.c"
+ #line 1010 "Python/bytecodes.c"
value = Py_NewRef(PyExc_AssertionError);
- #line 1425 "Python/generated_cases.c.h"
+ #line 1371 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -1429,7 +1375,7 @@
TARGET(LOAD_BUILD_CLASS) {
PyObject *bc;
- #line 1017 "Python/bytecodes.c"
+ #line 1014 "Python/bytecodes.c"
if (PyDict_CheckExact(BUILTINS())) {
bc = _PyDict_GetItemWithError(BUILTINS(),
&_Py_ID(__build_class__));
@@ -1451,7 +1397,7 @@
if (true) goto error;
}
}
- #line 1455 "Python/generated_cases.c.h"
+ #line 1401 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = bc;
DISPATCH();
@@ -1459,33 +1405,33 @@
TARGET(STORE_NAME) {
PyObject *v = stack_pointer[-1];
- #line 1042 "Python/bytecodes.c"
+ #line 1039 "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 1470 "Python/generated_cases.c.h"
+ #line 1416 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1049 "Python/bytecodes.c"
+ #line 1046 "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 1479 "Python/generated_cases.c.h"
+ #line 1425 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1056 "Python/bytecodes.c"
+ #line 1053 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1483 "Python/generated_cases.c.h"
+ #line 1429 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_NAME) {
- #line 1060 "Python/bytecodes.c"
+ #line 1057 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
PyObject *ns = LOCALS();
int err;
@@ -1502,7 +1448,7 @@
name);
goto error;
}
- #line 1506 "Python/generated_cases.c.h"
+ #line 1452 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1510,7 +1456,7 @@
PREDICTED(UNPACK_SEQUENCE);
static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
PyObject *seq = stack_pointer[-1];
- #line 1086 "Python/bytecodes.c"
+ #line 1083 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1523,11 +1469,11 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject **top = stack_pointer + oparg - 1;
int res = unpack_iterable(tstate, seq, oparg, -1, top);
- #line 1527 "Python/generated_cases.c.h"
+ #line 1473 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1099 "Python/bytecodes.c"
+ #line 1096 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1531 "Python/generated_cases.c.h"
+ #line 1477 "Python/generated_cases.c.h"
STACK_SHRINK(1);
STACK_GROW(oparg);
next_instr += 1;
@@ -1537,14 +1483,14 @@
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1103 "Python/bytecodes.c"
+ #line 1100 "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 1548 "Python/generated_cases.c.h"
+ #line 1494 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1555,7 +1501,7 @@
TARGET(UNPACK_SEQUENCE_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1113 "Python/bytecodes.c"
+ #line 1110 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1563,7 +1509,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1567 "Python/generated_cases.c.h"
+ #line 1513 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1574,7 +1520,7 @@
TARGET(UNPACK_SEQUENCE_LIST) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1124 "Python/bytecodes.c"
+ #line 1121 "Python/bytecodes.c"
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1582,7 +1528,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1586 "Python/generated_cases.c.h"
+ #line 1532 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1592,15 +1538,15 @@
TARGET(UNPACK_EX) {
PyObject *seq = stack_pointer[-1];
- #line 1135 "Python/bytecodes.c"
+ #line 1132 "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 1600 "Python/generated_cases.c.h"
+ #line 1546 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1139 "Python/bytecodes.c"
+ #line 1136 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1604 "Python/generated_cases.c.h"
+ #line 1550 "Python/generated_cases.c.h"
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
DISPATCH();
}
@@ -1611,7 +1557,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *v = stack_pointer[-2];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 1150 "Python/bytecodes.c"
+ #line 1147 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
@@ -1627,12 +1573,12 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyObject_SetAttr(owner, name, v);
- #line 1631 "Python/generated_cases.c.h"
+ #line 1577 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(owner);
- #line 1166 "Python/bytecodes.c"
+ #line 1163 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 1636 "Python/generated_cases.c.h"
+ #line 1582 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -1640,34 +1586,34 @@
TARGET(DELETE_ATTR) {
PyObject *owner = stack_pointer[-1];
- #line 1170 "Python/bytecodes.c"
+ #line 1167 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
- #line 1647 "Python/generated_cases.c.h"
+ #line 1593 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1173 "Python/bytecodes.c"
+ #line 1170 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1651 "Python/generated_cases.c.h"
+ #line 1597 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(STORE_GLOBAL) {
PyObject *v = stack_pointer[-1];
- #line 1177 "Python/bytecodes.c"
+ #line 1174 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
- #line 1661 "Python/generated_cases.c.h"
+ #line 1607 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1180 "Python/bytecodes.c"
+ #line 1177 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1665 "Python/generated_cases.c.h"
+ #line 1611 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_GLOBAL) {
- #line 1184 "Python/bytecodes.c"
+ #line 1181 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err;
err = PyDict_DelItem(GLOBALS(), name);
@@ -1679,7 +1625,7 @@
}
goto error;
}
- #line 1683 "Python/generated_cases.c.h"
+ #line 1629 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1687,7 +1633,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1198 "Python/bytecodes.c"
+ #line 1195 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1695,7 +1641,7 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1699 "Python/generated_cases.c.h"
+ #line 1645 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
STACK_GROW(1);
@@ -1707,7 +1653,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1198 "Python/bytecodes.c"
+ #line 1195 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1715,13 +1661,13 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1719 "Python/generated_cases.c.h"
+ #line 1665 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1210 "Python/bytecodes.c"
+ #line 1207 "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);
@@ -1778,7 +1724,7 @@
}
}
}
- #line 1782 "Python/generated_cases.c.h"
+ #line 1728 "Python/generated_cases.c.h"
_tmp_1 = v;
}
STACK_GROW(1);
@@ -1791,7 +1737,7 @@
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1210 "Python/bytecodes.c"
+ #line 1207 "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);
@@ -1848,7 +1794,7 @@
}
}
}
- #line 1852 "Python/generated_cases.c.h"
+ #line 1798 "Python/generated_cases.c.h"
_tmp_1 = v;
}
stack_pointer[-1] = _tmp_1;
@@ -1860,7 +1806,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size");
PyObject *null = NULL;
PyObject *v;
- #line 1279 "Python/bytecodes.c"
+ #line 1276 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1912,7 +1858,7 @@
}
}
null = NULL;
- #line 1916 "Python/generated_cases.c.h"
+ #line 1862 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = v;
@@ -1926,7 +1872,7 @@
PyObject *res;
uint16_t index = read_u16(&next_instr[1].cache);
uint16_t version = read_u16(&next_instr[2].cache);
- #line 1333 "Python/bytecodes.c"
+ #line 1330 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
PyDictObject *dict = (PyDictObject *)GLOBALS();
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
@@ -1937,7 +1883,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1941 "Python/generated_cases.c.h"
+ #line 1887 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1952,7 +1898,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 1346 "Python/bytecodes.c"
+ #line 1343 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
DEOPT_IF(!PyDict_CheckExact(BUILTINS()), LOAD_GLOBAL);
PyDictObject *mdict = (PyDictObject *)GLOBALS();
@@ -1967,7 +1913,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1971 "Python/generated_cases.c.h"
+ #line 1917 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1977,16 +1923,16 @@
}
TARGET(DELETE_FAST) {
- #line 1363 "Python/bytecodes.c"
+ #line 1360 "Python/bytecodes.c"
PyObject *v = GETLOCAL(oparg);
if (v == NULL) goto unbound_local_error;
SETLOCAL(oparg, NULL);
- #line 1985 "Python/generated_cases.c.h"
+ #line 1931 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(MAKE_CELL) {
- #line 1369 "Python/bytecodes.c"
+ #line 1366 "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);
@@ -1995,12 +1941,12 @@
goto resume_with_error;
}
SETLOCAL(oparg, cell);
- #line 1999 "Python/generated_cases.c.h"
+ #line 1945 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(DELETE_DEREF) {
- #line 1380 "Python/bytecodes.c"
+ #line 1377 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
// Can't use ERROR_IF here.
@@ -2011,14 +1957,14 @@
}
PyCell_SET(cell, NULL);
Py_DECREF(oldobj);
- #line 2015 "Python/generated_cases.c.h"
+ #line 1961 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(LOAD_FROM_DICT_OR_DEREF) {
PyObject *class_dict = stack_pointer[-1];
PyObject *value;
- #line 1393 "Python/bytecodes.c"
+ #line 1390 "Python/bytecodes.c"
PyObject *name;
assert(class_dict);
assert(oparg >= 0 && oparg < frame->f_code->co_nlocalsplus);
@@ -2053,14 +1999,14 @@
}
Py_INCREF(value);
}
- #line 2057 "Python/generated_cases.c.h"
+ #line 2003 "Python/generated_cases.c.h"
stack_pointer[-1] = value;
DISPATCH();
}
TARGET(LOAD_DEREF) {
PyObject *value;
- #line 1430 "Python/bytecodes.c"
+ #line 1427 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
value = PyCell_GET(cell);
if (value == NULL) {
@@ -2068,7 +2014,7 @@
if (true) goto error;
}
Py_INCREF(value);
- #line 2072 "Python/generated_cases.c.h"
+ #line 2018 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -2076,18 +2022,18 @@
TARGET(STORE_DEREF) {
PyObject *v = stack_pointer[-1];
- #line 1440 "Python/bytecodes.c"
+ #line 1437 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
Py_XDECREF(oldobj);
- #line 2085 "Python/generated_cases.c.h"
+ #line 2031 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(COPY_FREE_VARS) {
- #line 1447 "Python/bytecodes.c"
+ #line 1444 "Python/bytecodes.c"
/* Copy closure variables to free variables */
PyCodeObject *co = frame->f_code;
assert(PyFunction_Check(frame->f_funcobj));
@@ -2098,22 +2044,22 @@
PyObject *o = PyTuple_GET_ITEM(closure, i);
frame->localsplus[offset + i] = Py_NewRef(o);
}
- #line 2102 "Python/generated_cases.c.h"
+ #line 2048 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(BUILD_STRING) {
PyObject **pieces = (stack_pointer - oparg);
PyObject *str;
- #line 1460 "Python/bytecodes.c"
+ #line 1457 "Python/bytecodes.c"
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
- #line 2111 "Python/generated_cases.c.h"
+ #line 2057 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
- #line 1462 "Python/bytecodes.c"
+ #line 1459 "Python/bytecodes.c"
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2117 "Python/generated_cases.c.h"
+ #line 2063 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = str;
@@ -2123,10 +2069,10 @@
TARGET(BUILD_TUPLE) {
PyObject **values = (stack_pointer - oparg);
PyObject *tup;
- #line 1466 "Python/bytecodes.c"
+ #line 1463 "Python/bytecodes.c"
tup = _PyTuple_FromArraySteal(values, oparg);
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2130 "Python/generated_cases.c.h"
+ #line 2076 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = tup;
@@ -2136,10 +2082,10 @@
TARGET(BUILD_LIST) {
PyObject **values = (stack_pointer - oparg);
PyObject *list;
- #line 1471 "Python/bytecodes.c"
+ #line 1468 "Python/bytecodes.c"
list = _PyList_FromArraySteal(values, oparg);
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2143 "Python/generated_cases.c.h"
+ #line 2089 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = list;
@@ -2149,7 +2095,7 @@
TARGET(LIST_EXTEND) {
PyObject *iterable = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 1476 "Python/bytecodes.c"
+ #line 1473 "Python/bytecodes.c"
PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
if (none_val == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
@@ -2160,13 +2106,13 @@
"Value after * must be an iterable, not %.200s",
Py_TYPE(iterable)->tp_name);
}
- #line 2164 "Python/generated_cases.c.h"
+ #line 2110 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1487 "Python/bytecodes.c"
+ #line 1484 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
assert(Py_IsNone(none_val));
- #line 2170 "Python/generated_cases.c.h"
+ #line 2116 "Python/generated_cases.c.h"
Py_DECREF(iterable);
STACK_SHRINK(1);
DISPATCH();
@@ -2175,13 +2121,13 @@
TARGET(SET_UPDATE) {
PyObject *iterable = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 1494 "Python/bytecodes.c"
+ #line 1491 "Python/bytecodes.c"
int err = _PySet_Update(set, iterable);
- #line 2181 "Python/generated_cases.c.h"
+ #line 2127 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1496 "Python/bytecodes.c"
+ #line 1493 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
- #line 2185 "Python/generated_cases.c.h"
+ #line 2131 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2189,7 +2135,7 @@
TARGET(BUILD_SET) {
PyObject **values = (stack_pointer - oparg);
PyObject *set;
- #line 1500 "Python/bytecodes.c"
+ #line 1497 "Python/bytecodes.c"
set = PySet_New(NULL);
if (set == NULL)
goto error;
@@ -2204,7 +2150,7 @@
Py_DECREF(set);
if (true) { STACK_SHRINK(oparg); goto error; }
}
- #line 2208 "Python/generated_cases.c.h"
+ #line 2154 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = set;
@@ -2214,7 +2160,7 @@
TARGET(BUILD_MAP) {
PyObject **values = (stack_pointer - oparg*2);
PyObject *map;
- #line 1517 "Python/bytecodes.c"
+ #line 1514 "Python/bytecodes.c"
map = _PyDict_FromItems(
values, 2,
values+1, 2,
@@ -2222,13 +2168,13 @@
if (map == NULL)
goto error;
- #line 2226 "Python/generated_cases.c.h"
+ #line 2172 "Python/generated_cases.c.h"
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
- #line 1525 "Python/bytecodes.c"
+ #line 1522 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
- #line 2232 "Python/generated_cases.c.h"
+ #line 2178 "Python/generated_cases.c.h"
STACK_SHRINK(oparg*2);
STACK_GROW(1);
stack_pointer[-1] = map;
@@ -2236,7 +2182,7 @@
}
TARGET(SETUP_ANNOTATIONS) {
- #line 1529 "Python/bytecodes.c"
+ #line 1526 "Python/bytecodes.c"
int err;
PyObject *ann_dict;
if (LOCALS() == NULL) {
@@ -2276,7 +2222,7 @@
Py_DECREF(ann_dict);
}
}
- #line 2280 "Python/generated_cases.c.h"
+ #line 2226 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -2284,7 +2230,7 @@
PyObject *keys = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
PyObject *map;
- #line 1571 "Python/bytecodes.c"
+ #line 1568 "Python/bytecodes.c"
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -2294,14 +2240,14 @@
map = _PyDict_FromItems(
&PyTuple_GET_ITEM(keys, 0), 1,
values, 1, oparg);
- #line 2298 "Python/generated_cases.c.h"
+ #line 2244 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
- #line 1581 "Python/bytecodes.c"
+ #line 1578 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
- #line 2305 "Python/generated_cases.c.h"
+ #line 2251 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
stack_pointer[-1] = map;
DISPATCH();
@@ -2309,7 +2255,7 @@
TARGET(DICT_UPDATE) {
PyObject *update = stack_pointer[-1];
- #line 1585 "Python/bytecodes.c"
+ #line 1582 "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)) {
@@ -2317,12 +2263,12 @@
"'%.200s' object is not a mapping",
Py_TYPE(update)->tp_name);
}
- #line 2321 "Python/generated_cases.c.h"
+ #line 2267 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1593 "Python/bytecodes.c"
+ #line 1590 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2326 "Python/generated_cases.c.h"
+ #line 2272 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2330,17 +2276,17 @@
TARGET(DICT_MERGE) {
PyObject *update = stack_pointer[-1];
- #line 1599 "Python/bytecodes.c"
+ #line 1596 "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 2339 "Python/generated_cases.c.h"
+ #line 2285 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1604 "Python/bytecodes.c"
+ #line 1601 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2344 "Python/generated_cases.c.h"
+ #line 2290 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2349,25 +2295,25 @@
TARGET(MAP_ADD) {
PyObject *value = stack_pointer[-1];
PyObject *key = stack_pointer[-2];
- #line 1610 "Python/bytecodes.c"
+ #line 1607 "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 2359 "Python/generated_cases.c.h"
+ #line 2305 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) {
- #line 1618 "Python/bytecodes.c"
+ #line 1615 "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 2371 "Python/generated_cases.c.h"
+ #line 2317 "Python/generated_cases.c.h"
}
TARGET(LOAD_SUPER_ATTR) {
@@ -2378,7 +2324,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1632 "Python/bytecodes.c"
+ #line 1629 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2);
int load_method = oparg & 1;
#if ENABLE_SPECIALIZATION
@@ -2420,16 +2366,16 @@
}
}
}
- #line 2424 "Python/generated_cases.c.h"
+ #line 2370 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1674 "Python/bytecodes.c"
+ #line 1671 "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 2433 "Python/generated_cases.c.h"
+ #line 2379 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2444,20 +2390,20 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1681 "Python/bytecodes.c"
+ #line 1678 "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 2455 "Python/generated_cases.c.h"
+ #line 2401 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1688 "Python/bytecodes.c"
+ #line 1685 "Python/bytecodes.c"
if (res == NULL) goto pop_3_error;
- #line 2461 "Python/generated_cases.c.h"
+ #line 2407 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2472,7 +2418,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2;
PyObject *res;
- #line 1692 "Python/bytecodes.c"
+ #line 1689 "Python/bytecodes.c"
assert(oparg & 1);
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -2495,7 +2441,7 @@
res = res2;
res2 = NULL;
}
- #line 2499 "Python/generated_cases.c.h"
+ #line 2445 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
stack_pointer[-2] = res2;
@@ -2509,7 +2455,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *res2 = NULL;
PyObject *res;
- #line 1731 "Python/bytecodes.c"
+ #line 1728 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2543,9 +2489,9 @@
NULL | meth | arg1 | ... | argN
*/
- #line 2547 "Python/generated_cases.c.h"
+ #line 2493 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1765 "Python/bytecodes.c"
+ #line 1762 "Python/bytecodes.c"
if (meth == NULL) goto pop_1_error;
res2 = NULL;
res = meth;
@@ -2554,12 +2500,12 @@
else {
/* Classic, pushes one value. */
res = PyObject_GetAttr(owner, name);
- #line 2558 "Python/generated_cases.c.h"
+ #line 2504 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1774 "Python/bytecodes.c"
+ #line 1771 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
}
- #line 2563 "Python/generated_cases.c.h"
+ #line 2509 "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; }
@@ -2573,7 +2519,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1779 "Python/bytecodes.c"
+ #line 1776 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2586,7 +2532,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2590 "Python/generated_cases.c.h"
+ #line 2536 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2601,7 +2547,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1795 "Python/bytecodes.c"
+ #line 1792 "Python/bytecodes.c"
DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
assert(dict != NULL);
@@ -2614,7 +2560,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2618 "Python/generated_cases.c.h"
+ #line 2564 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2629,7 +2575,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1811 "Python/bytecodes.c"
+ #line 1808 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2656,7 +2602,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2660 "Python/generated_cases.c.h"
+ #line 2606 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2671,7 +2617,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1841 "Python/bytecodes.c"
+ #line 1838 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2681,7 +2627,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2685 "Python/generated_cases.c.h"
+ #line 2631 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2696,7 +2642,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 1854 "Python/bytecodes.c"
+ #line 1851 "Python/bytecodes.c"
DEOPT_IF(!PyType_Check(cls), LOAD_ATTR);
DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version,
@@ -2708,7 +2654,7 @@
res = descr;
assert(res != NULL);
Py_INCREF(res);
- #line 2712 "Python/generated_cases.c.h"
+ #line 2658 "Python/generated_cases.c.h"
Py_DECREF(cls);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2722,7 +2668,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 1869 "Python/bytecodes.c"
+ #line 1866 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
@@ -2746,7 +2692,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2750 "Python/generated_cases.c.h"
+ #line 2696 "Python/generated_cases.c.h"
}
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
@@ -2754,7 +2700,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 1895 "Python/bytecodes.c"
+ #line 1892 "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);
@@ -2780,7 +2726,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2784 "Python/generated_cases.c.h"
+ #line 2730 "Python/generated_cases.c.h"
}
TARGET(STORE_ATTR_INSTANCE_VALUE) {
@@ -2788,7 +2734,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 1923 "Python/bytecodes.c"
+ #line 1920 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2806,7 +2752,7 @@
Py_DECREF(old_value);
}
Py_DECREF(owner);
- #line 2810 "Python/generated_cases.c.h"
+ #line 2756 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2817,7 +2763,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 1943 "Python/bytecodes.c"
+ #line 1940 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2856,7 +2802,7 @@
/* PEP 509 */
dict->ma_version_tag = new_version;
Py_DECREF(owner);
- #line 2860 "Python/generated_cases.c.h"
+ #line 2806 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2867,7 +2813,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 1984 "Python/bytecodes.c"
+ #line 1981 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2877,7 +2823,7 @@
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
- #line 2881 "Python/generated_cases.c.h"
+ #line 2827 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2889,7 +2835,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2003 "Python/bytecodes.c"
+ #line 2000 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2902,12 +2848,12 @@
#endif /* ENABLE_SPECIALIZATION */
assert((oparg >> 4) <= Py_GE);
res = PyObject_RichCompare(left, right, oparg>>4);
- #line 2906 "Python/generated_cases.c.h"
+ #line 2852 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2016 "Python/bytecodes.c"
+ #line 2013 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2911 "Python/generated_cases.c.h"
+ #line 2857 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2918,7 +2864,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2020 "Python/bytecodes.c"
+ #line 2017 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2929,7 +2875,7 @@
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2933 "Python/generated_cases.c.h"
+ #line 2879 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2940,7 +2886,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2034 "Python/bytecodes.c"
+ #line 2031 "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);
@@ -2955,7 +2901,7 @@
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2959 "Python/generated_cases.c.h"
+ #line 2905 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2966,7 +2912,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2052 "Python/bytecodes.c"
+ #line 2049 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2978,7 +2924,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 2982 "Python/generated_cases.c.h"
+ #line 2928 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2989,14 +2935,14 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2066 "Python/bytecodes.c"
+ #line 2063 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 2995 "Python/generated_cases.c.h"
+ #line 2941 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2068 "Python/bytecodes.c"
+ #line 2065 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 3000 "Python/generated_cases.c.h"
+ #line 2946 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -3006,15 +2952,15 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2072 "Python/bytecodes.c"
+ #line 2069 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 3012 "Python/generated_cases.c.h"
+ #line 2958 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2074 "Python/bytecodes.c"
+ #line 2071 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
- #line 3018 "Python/generated_cases.c.h"
+ #line 2964 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -3025,12 +2971,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2079 "Python/bytecodes.c"
+ #line 2076 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 3031 "Python/generated_cases.c.h"
+ #line 2977 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2081 "Python/bytecodes.c"
+ #line 2078 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -3038,10 +2984,10 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 3042 "Python/generated_cases.c.h"
+ #line 2988 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2089 "Python/bytecodes.c"
+ #line 2086 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -3050,7 +2996,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 3054 "Python/generated_cases.c.h"
+ #line 3000 "Python/generated_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
DISPATCH();
@@ -3060,21 +3006,21 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2100 "Python/bytecodes.c"
+ #line 2097 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 3067 "Python/generated_cases.c.h"
+ #line 3013 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2103 "Python/bytecodes.c"
+ #line 2100 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 3074 "Python/generated_cases.c.h"
+ #line 3020 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2108 "Python/bytecodes.c"
+ #line 2105 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 3078 "Python/generated_cases.c.h"
+ #line 3024 "Python/generated_cases.c.h"
stack_pointer[-1] = b;
DISPATCH();
}
@@ -3083,15 +3029,15 @@
PyObject *fromlist = stack_pointer[-1];
PyObject *level = stack_pointer[-2];
PyObject *res;
- #line 2112 "Python/bytecodes.c"
+ #line 2109 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_name(tstate, frame, name, fromlist, level);
- #line 3090 "Python/generated_cases.c.h"
+ #line 3036 "Python/generated_cases.c.h"
Py_DECREF(level);
Py_DECREF(fromlist);
- #line 2115 "Python/bytecodes.c"
+ #line 2112 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 3095 "Python/generated_cases.c.h"
+ #line 3041 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3100,25 +3046,25 @@
TARGET(IMPORT_FROM) {
PyObject *from = stack_pointer[-1];
PyObject *res;
- #line 2119 "Python/bytecodes.c"
+ #line 2116 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- #line 3108 "Python/generated_cases.c.h"
+ #line 3054 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
}
TARGET(JUMP_FORWARD) {
- #line 2125 "Python/bytecodes.c"
+ #line 2122 "Python/bytecodes.c"
JUMPBY(oparg);
- #line 3117 "Python/generated_cases.c.h"
+ #line 3063 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(JUMP_BACKWARD) {
- #line 2129 "Python/bytecodes.c"
+ #line 2126 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr - 1;
assert(oparg <= INSTR_OFFSET());
JUMPBY(1-oparg);
@@ -3135,13 +3081,13 @@
goto resume_frame;
}
#endif /* ENABLE_SPECIALIZATION */
- #line 3139 "Python/generated_cases.c.h"
+ #line 3085 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(ENTER_EXECUTOR) {
- #line 2149 "Python/bytecodes.c"
+ #line 2146 "Python/bytecodes.c"
_PyExecutorObject *executor = (_PyExecutorObject *)frame->f_code->co_executors->executors[oparg];
Py_INCREF(executor);
frame = executor->execute(executor, frame, stack_pointer);
@@ -3150,20 +3096,20 @@
goto error;
}
goto resume_frame;
- #line 3154 "Python/generated_cases.c.h"
+ #line 3100 "Python/generated_cases.c.h"
}
TARGET(POP_JUMP_IF_FALSE) {
PyObject *cond = stack_pointer[-1];
- #line 2160 "Python/bytecodes.c"
+ #line 2157 "Python/bytecodes.c"
if (Py_IsFalse(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsTrue(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3165 "Python/generated_cases.c.h"
+ #line 3111 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2166 "Python/bytecodes.c"
+ #line 2163 "Python/bytecodes.c"
if (err == 0) {
JUMPBY(oparg);
}
@@ -3171,22 +3117,22 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3175 "Python/generated_cases.c.h"
+ #line 3121 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_TRUE) {
PyObject *cond = stack_pointer[-1];
- #line 2176 "Python/bytecodes.c"
+ #line 2173 "Python/bytecodes.c"
if (Py_IsTrue(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsFalse(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3188 "Python/generated_cases.c.h"
+ #line 3134 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2182 "Python/bytecodes.c"
+ #line 2179 "Python/bytecodes.c"
if (err > 0) {
JUMPBY(oparg);
}
@@ -3194,63 +3140,63 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3198 "Python/generated_cases.c.h"
+ #line 3144 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NOT_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2192 "Python/bytecodes.c"
+ #line 2189 "Python/bytecodes.c"
if (!Py_IsNone(value)) {
- #line 3207 "Python/generated_cases.c.h"
+ #line 3153 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2194 "Python/bytecodes.c"
+ #line 2191 "Python/bytecodes.c"
JUMPBY(oparg);
}
- #line 3212 "Python/generated_cases.c.h"
+ #line 3158 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2199 "Python/bytecodes.c"
+ #line 2196 "Python/bytecodes.c"
if (Py_IsNone(value)) {
JUMPBY(oparg);
}
else {
- #line 3224 "Python/generated_cases.c.h"
+ #line 3170 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2204 "Python/bytecodes.c"
+ #line 2201 "Python/bytecodes.c"
}
- #line 3228 "Python/generated_cases.c.h"
+ #line 3174 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
- #line 2208 "Python/bytecodes.c"
+ #line 2205 "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 3241 "Python/generated_cases.c.h"
+ #line 3187 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(GET_LEN) {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2217 "Python/bytecodes.c"
+ #line 2214 "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 3254 "Python/generated_cases.c.h"
+ #line 3200 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3261,16 +3207,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2225 "Python/bytecodes.c"
+ #line 2222 "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 3270 "Python/generated_cases.c.h"
+ #line 3216 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2230 "Python/bytecodes.c"
+ #line 2227 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -3278,7 +3224,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 3282 "Python/generated_cases.c.h"
+ #line 3228 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3287,10 +3233,10 @@
TARGET(MATCH_MAPPING) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2240 "Python/bytecodes.c"
+ #line 2237 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 3294 "Python/generated_cases.c.h"
+ #line 3240 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3299,10 +3245,10 @@
TARGET(MATCH_SEQUENCE) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2245 "Python/bytecodes.c"
+ #line 2242 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 3306 "Python/generated_cases.c.h"
+ #line 3252 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3312,11 +3258,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2250 "Python/bytecodes.c"
+ #line 2247 "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 3320 "Python/generated_cases.c.h"
+ #line 3266 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3325,14 +3271,14 @@
TARGET(GET_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2256 "Python/bytecodes.c"
+ #line 2253 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3332 "Python/generated_cases.c.h"
+ #line 3278 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2259 "Python/bytecodes.c"
+ #line 2256 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3336 "Python/generated_cases.c.h"
+ #line 3282 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3340,7 +3286,7 @@
TARGET(GET_YIELD_FROM_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2263 "Python/bytecodes.c"
+ #line 2260 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -3363,11 +3309,11 @@
if (iter == NULL) {
goto error;
}
- #line 3367 "Python/generated_cases.c.h"
+ #line 3313 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2286 "Python/bytecodes.c"
+ #line 2283 "Python/bytecodes.c"
}
- #line 3371 "Python/generated_cases.c.h"
+ #line 3317 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3377,7 +3323,7 @@
static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2304 "Python/bytecodes.c"
+ #line 2301 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3408,7 +3354,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3412 "Python/generated_cases.c.h"
+ #line 3358 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3416,7 +3362,7 @@
}
TARGET(INSTRUMENTED_FOR_ITER) {
- #line 2337 "Python/bytecodes.c"
+ #line 2334 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr-1;
_Py_CODEUNIT *target;
PyObject *iter = TOP();
@@ -3442,14 +3388,14 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3446 "Python/generated_cases.c.h"
+ #line 3392 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(FOR_ITER_LIST) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2365 "Python/bytecodes.c"
+ #line 2362 "Python/bytecodes.c"
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
_PyListIterObject *it = (_PyListIterObject *)iter;
STAT_INC(FOR_ITER, hit);
@@ -3469,7 +3415,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3473 "Python/generated_cases.c.h"
+ #line 3419 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3479,7 +3425,7 @@
TARGET(FOR_ITER_TUPLE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2387 "Python/bytecodes.c"
+ #line 2384 "Python/bytecodes.c"
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3499,7 +3445,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3503 "Python/generated_cases.c.h"
+ #line 3449 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3509,7 +3455,7 @@
TARGET(FOR_ITER_RANGE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2409 "Python/bytecodes.c"
+ #line 2406 "Python/bytecodes.c"
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3527,7 +3473,7 @@
if (next == NULL) {
goto error;
}
- #line 3531 "Python/generated_cases.c.h"
+ #line 3477 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3536,7 +3482,7 @@
TARGET(FOR_ITER_GEN) {
PyObject *iter = stack_pointer[-1];
- #line 2429 "Python/bytecodes.c"
+ #line 2426 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3552,14 +3498,14 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3556 "Python/generated_cases.c.h"
+ #line 3502 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2447 "Python/bytecodes.c"
+ #line 2444 "Python/bytecodes.c"
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
@@ -3582,16 +3528,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3586 "Python/generated_cases.c.h"
+ #line 3532 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2470 "Python/bytecodes.c"
+ #line 2467 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3595 "Python/generated_cases.c.h"
+ #line 3541 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3602,7 +3548,7 @@
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2479 "Python/bytecodes.c"
+ #line 2476 "Python/bytecodes.c"
/* pop the context manager, push its __exit__ and the
* value returned from calling its __enter__
*/
@@ -3628,16 +3574,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3632 "Python/generated_cases.c.h"
+ #line 3578 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2505 "Python/bytecodes.c"
+ #line 2502 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3641 "Python/generated_cases.c.h"
+ #line 3587 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3649,7 +3595,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2514 "Python/bytecodes.c"
+ #line 2511 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -3670,7 +3616,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3674 "Python/generated_cases.c.h"
+ #line 3620 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3679,7 +3625,7 @@
TARGET(PUSH_EXC_INFO) {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2537 "Python/bytecodes.c"
+ #line 2534 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -3689,7 +3635,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3693 "Python/generated_cases.c.h"
+ #line 3639 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3703,7 +3649,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 2549 "Python/bytecodes.c"
+ #line 2546 "Python/bytecodes.c"
/* Cached method object */
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3720,7 +3666,7 @@
assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
assert(oparg & 1);
- #line 3724 "Python/generated_cases.c.h"
+ #line 3670 "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; }
@@ -3734,7 +3680,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2568 "Python/bytecodes.c"
+ #line 2565 "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);
@@ -3744,7 +3690,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3748 "Python/generated_cases.c.h"
+ #line 3694 "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; }
@@ -3758,7 +3704,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2580 "Python/bytecodes.c"
+ #line 2577 "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;
@@ -3772,7 +3718,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3776 "Python/generated_cases.c.h"
+ #line 3722 "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; }
@@ -3781,16 +3727,16 @@
}
TARGET(KW_NAMES) {
- #line 2596 "Python/bytecodes.c"
+ #line 2593 "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 3789 "Python/generated_cases.c.h"
+ #line 3735 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_CALL) {
- #line 2602 "Python/bytecodes.c"
+ #line 2599 "Python/bytecodes.c"
int is_meth = PEEK(oparg+2) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -3803,7 +3749,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3807 "Python/generated_cases.c.h"
+ #line 3753 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3813,7 +3759,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2647 "Python/bytecodes.c"
+ #line 2644 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3895,7 +3841,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3899 "Python/generated_cases.c.h"
+ #line 3845 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3907,7 +3853,7 @@
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2735 "Python/bytecodes.c"
+ #line 2732 "Python/bytecodes.c"
DEOPT_IF(method != NULL, CALL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
STAT_INC(CALL, hit);
@@ -3917,7 +3863,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 3921 "Python/generated_cases.c.h"
+ #line 3867 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -3926,7 +3872,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2747 "Python/bytecodes.c"
+ #line 2744 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3952,7 +3898,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3956 "Python/generated_cases.c.h"
+ #line 3902 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -3960,7 +3906,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2775 "Python/bytecodes.c"
+ #line 2772 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3996,7 +3942,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 4000 "Python/generated_cases.c.h"
+ #line 3946 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -4004,7 +3950,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2813 "Python/bytecodes.c"
+ #line 2810 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4014,7 +3960,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 4018 "Python/generated_cases.c.h"
+ #line 3964 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4027,7 +3973,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2825 "Python/bytecodes.c"
+ #line 2822 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4038,7 +3984,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4042 "Python/generated_cases.c.h"
+ #line 3988 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4052,7 +3998,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2839 "Python/bytecodes.c"
+ #line 2836 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4063,7 +4009,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4067 "Python/generated_cases.c.h"
+ #line 4013 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4077,7 +4023,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2853 "Python/bytecodes.c"
+ #line 2850 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4099,7 +4045,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4103 "Python/generated_cases.c.h"
+ #line 4049 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4113,7 +4059,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2878 "Python/bytecodes.c"
+ #line 2875 "Python/bytecodes.c"
/* Builtin METH_O functions */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4141,7 +4087,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4145 "Python/generated_cases.c.h"
+ #line 4091 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4155,7 +4101,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2909 "Python/bytecodes.c"
+ #line 2906 "Python/bytecodes.c"
/* Builtin METH_FASTCALL functions, without keywords */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4187,7 +4133,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 4191 "Python/generated_cases.c.h"
+ #line 4137 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4201,7 +4147,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2944 "Python/bytecodes.c"
+ #line 2941 "Python/bytecodes.c"
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
int is_meth = method != NULL;
int total_args = oparg;
@@ -4233,7 +4179,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4237 "Python/generated_cases.c.h"
+ #line 4183 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4247,7 +4193,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2979 "Python/bytecodes.c"
+ #line 2976 "Python/bytecodes.c"
assert(kwnames == NULL);
/* len(o) */
int is_meth = method != NULL;
@@ -4272,7 +4218,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4276 "Python/generated_cases.c.h"
+ #line 4222 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4285,7 +4231,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3006 "Python/bytecodes.c"
+ #line 3003 "Python/bytecodes.c"
assert(kwnames == NULL);
/* isinstance(o, o2) */
int is_meth = method != NULL;
@@ -4312,7 +4258,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4316 "Python/generated_cases.c.h"
+ #line 4262 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4324,7 +4270,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *self = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 3036 "Python/bytecodes.c"
+ #line 3033 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
assert(method != NULL);
@@ -4342,14 +4288,14 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4346 "Python/generated_cases.c.h"
+ #line 4292 "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 3056 "Python/bytecodes.c"
+ #line 3053 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4380,7 +4326,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4384 "Python/generated_cases.c.h"
+ #line 4330 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4393,7 +4339,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3090 "Python/bytecodes.c"
+ #line 3087 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4422,7 +4368,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4426 "Python/generated_cases.c.h"
+ #line 4372 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4435,7 +4381,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3122 "Python/bytecodes.c"
+ #line 3119 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 0 || oparg == 1);
int is_meth = method != NULL;
@@ -4464,7 +4410,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4468 "Python/generated_cases.c.h"
+ #line 4414 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4477,7 +4423,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3154 "Python/bytecodes.c"
+ #line 3151 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4505,7 +4451,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4509 "Python/generated_cases.c.h"
+ #line 4455 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4515,9 +4461,9 @@
}
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
- #line 3185 "Python/bytecodes.c"
+ #line 3182 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4521 "Python/generated_cases.c.h"
+ #line 4467 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4526,7 +4472,7 @@
PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
PyObject *result;
- #line 3189 "Python/bytecodes.c"
+ #line 3186 "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));
@@ -4588,14 +4534,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4592 "Python/generated_cases.c.h"
+ #line 4538 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
- #line 3251 "Python/bytecodes.c"
+ #line 3248 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- #line 4599 "Python/generated_cases.c.h"
+ #line 4545 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4610,7 +4556,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 3261 "Python/bytecodes.c"
+ #line 3258 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -4639,14 +4585,14 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4643 "Python/generated_cases.c.h"
+ #line 4589 "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 3292 "Python/bytecodes.c"
+ #line 3289 "Python/bytecodes.c"
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4667,7 +4613,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4671 "Python/generated_cases.c.h"
+ #line 4617 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4675,15 +4621,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3315 "Python/bytecodes.c"
+ #line 3312 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4681 "Python/generated_cases.c.h"
+ #line 4627 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3317 "Python/bytecodes.c"
+ #line 3314 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 4687 "Python/generated_cases.c.h"
+ #line 4633 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4694,7 +4640,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 3321 "Python/bytecodes.c"
+ #line 3318 "Python/bytecodes.c"
/* Handles f-string value formatting. */
PyObject *(*conv_fn)(PyObject *);
int which_conversion = oparg & FVC_MASK;
@@ -4729,7 +4675,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 4733 "Python/generated_cases.c.h"
+ #line 4679 "Python/generated_cases.c.h"
STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0));
stack_pointer[-1] = result;
DISPATCH();
@@ -4738,10 +4684,10 @@
TARGET(COPY) {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3358 "Python/bytecodes.c"
+ #line 3355 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4745 "Python/generated_cases.c.h"
+ #line 4691 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4753,7 +4699,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3363 "Python/bytecodes.c"
+ #line 3360 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4768,12 +4714,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4772 "Python/generated_cases.c.h"
+ #line 4718 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3378 "Python/bytecodes.c"
+ #line 3375 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4777 "Python/generated_cases.c.h"
+ #line 4723 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4783,16 +4729,16 @@
TARGET(SWAP) {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3383 "Python/bytecodes.c"
+ #line 3380 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4789 "Python/generated_cases.c.h"
+ #line 4735 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
}
TARGET(INSTRUMENTED_INSTRUCTION) {
- #line 3387 "Python/bytecodes.c"
+ #line 3384 "Python/bytecodes.c"
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, next_instr-1);
if (next_opcode < 0) goto error;
@@ -4804,26 +4750,26 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 4808 "Python/generated_cases.c.h"
+ #line 4754 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
- #line 3401 "Python/bytecodes.c"
+ #line 3398 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
- #line 4814 "Python/generated_cases.c.h"
+ #line 4760 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
- #line 3405 "Python/bytecodes.c"
+ #line 3402 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
- #line 4821 "Python/generated_cases.c.h"
+ #line 4767 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
- #line 3410 "Python/bytecodes.c"
+ #line 3407 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4832,12 +4778,12 @@
assert(err == 0 || err == 1);
int offset = err*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4836 "Python/generated_cases.c.h"
+ #line 4782 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
- #line 3421 "Python/bytecodes.c"
+ #line 3418 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4846,12 +4792,12 @@
assert(err == 0 || err == 1);
int offset = (1-err)*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4850 "Python/generated_cases.c.h"
+ #line 4796 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
- #line 3432 "Python/bytecodes.c"
+ #line 3429 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4863,12 +4809,12 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4867 "Python/generated_cases.c.h"
+ #line 4813 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
- #line 3446 "Python/bytecodes.c"
+ #line 3443 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4880,30 +4826,30 @@
offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4884 "Python/generated_cases.c.h"
+ #line 4830 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(EXTENDED_ARG) {
- #line 3460 "Python/bytecodes.c"
+ #line 3457 "Python/bytecodes.c"
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 4895 "Python/generated_cases.c.h"
+ #line 4841 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
- #line 3468 "Python/bytecodes.c"
+ #line 3465 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 4902 "Python/generated_cases.c.h"
+ #line 4848 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
- #line 3473 "Python/bytecodes.c"
+ #line 3470 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 4909 "Python/generated_cases.c.h"
+ #line 4855 "Python/generated_cases.c.h"
}
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
index d8e47bf..e144272 100644
--- a/Python/instrumentation.c
+++ b/Python/instrumentation.c
@@ -1487,17 +1487,6 @@ update_instrumentation_data(PyCodeObject *code, PyInterpreterState *interp)
return 0;
}
-static const uint8_t super_instructions[256] = {
- [LOAD_FAST__LOAD_CONST] = 1,
- [LOAD_CONST__LOAD_FAST] = 1,
-};
-
-/* Should use instruction metadata for this */
-static bool
-is_super_instruction(uint8_t opcode) {
- return super_instructions[opcode] != 0;
-}
-
int
_Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
{
@@ -1539,9 +1528,6 @@ _Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
/* Insert instrumentation */
for (int i = 0; i < code_len; i+= _PyInstruction_GetLength(code, i)) {
_Py_CODEUNIT *instr = &_PyCode_CODE(code)[i];
- if (is_super_instruction(instr->op.code)) {
- instr->op.code = _PyOpcode_Deopt[instr->op.code];
- }
CHECK(instr->op.code != 0);
int base_opcode = _Py_GetBaseOpcode(code, i);
if (opcode_has_event(base_opcode)) {
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index ce9c2e7..2c4d1aa 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -33,10 +33,6 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
return 1;
case STORE_FAST_STORE_FAST:
return 2;
- case LOAD_FAST__LOAD_CONST:
- return 0+0;
- case LOAD_CONST__LOAD_FAST:
- return 0+0;
case POP_TOP:
return 1;
case PUSH_NULL:
@@ -431,10 +427,6 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
return 1;
case STORE_FAST_STORE_FAST:
return 0;
- case LOAD_FAST__LOAD_CONST:
- return 1+1;
- case LOAD_CONST__LOAD_FAST:
- return 1+1;
case POP_TOP:
return 0;
case PUSH_NULL:
@@ -799,7 +791,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
}
#endif
-enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT_IBC000, INSTR_FMT_IBC00000000, INSTR_FMT_IBIB, INSTR_FMT_IX, INSTR_FMT_IXC, INSTR_FMT_IXC000 };
+enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT_IBC000, INSTR_FMT_IBC00000000, INSTR_FMT_IX, INSTR_FMT_IXC, INSTR_FMT_IXC000 };
struct opcode_metadata {
bool valid_entry;
enum InstructionFormat instr_format;
@@ -821,8 +813,6 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
[STORE_FAST] = { true, INSTR_FMT_IB },
[STORE_FAST_LOAD_FAST] = { true, INSTR_FMT_IB },
[STORE_FAST_STORE_FAST] = { true, INSTR_FMT_IB },
- [LOAD_FAST__LOAD_CONST] = { true, INSTR_FMT_IBIB },
- [LOAD_CONST__LOAD_FAST] = { true, INSTR_FMT_IBIB },
[POP_TOP] = { true, INSTR_FMT_IX },
[PUSH_NULL] = { true, INSTR_FMT_IX },
[END_FOR] = { true, INSTR_FMT_IB },
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index 8835ad9..02e6033 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -83,11 +83,11 @@ static void *opcode_targets[256] = {
&&TARGET_LOAD_ATTR_METHOD_NO_DICT,
&&TARGET_LOAD_ATTR_METHOD_WITH_VALUES,
&&TARGET_RETURN_VALUE,
- &&TARGET_LOAD_CONST__LOAD_FAST,
+ &&TARGET_LOAD_GLOBAL_BUILTIN,
&&TARGET_SETUP_ANNOTATIONS,
- &&TARGET_LOAD_FAST__LOAD_CONST,
+ &&TARGET_LOAD_GLOBAL_MODULE,
&&TARGET_LOAD_LOCALS,
- &&TARGET_LOAD_GLOBAL_BUILTIN,
+ &&TARGET_STORE_ATTR_INSTANCE_VALUE,
&&TARGET_POP_EXCEPT,
&&TARGET_STORE_NAME,
&&TARGET_DELETE_NAME,
@@ -110,9 +110,9 @@ static void *opcode_targets[256] = {
&&TARGET_IMPORT_NAME,
&&TARGET_IMPORT_FROM,
&&TARGET_JUMP_FORWARD,
- &&TARGET_LOAD_GLOBAL_MODULE,
- &&TARGET_STORE_ATTR_INSTANCE_VALUE,
&&TARGET_STORE_ATTR_SLOT,
+ &&TARGET_STORE_ATTR_WITH_HINT,
+ &&TARGET_STORE_SUBSCR_DICT,
&&TARGET_POP_JUMP_IF_FALSE,
&&TARGET_POP_JUMP_IF_TRUE,
&&TARGET_LOAD_GLOBAL,
@@ -147,20 +147,20 @@ static void *opcode_targets[256] = {
&&TARGET_LIST_APPEND,
&&TARGET_SET_ADD,
&&TARGET_MAP_ADD,
- &&TARGET_STORE_ATTR_WITH_HINT,
+ &&TARGET_STORE_SUBSCR_LIST_INT,
&&TARGET_COPY_FREE_VARS,
&&TARGET_YIELD_VALUE,
&&TARGET_RESUME,
&&TARGET_MATCH_CLASS,
- &&TARGET_STORE_SUBSCR_DICT,
- &&TARGET_STORE_SUBSCR_LIST_INT,
+ &&TARGET_UNPACK_SEQUENCE_LIST,
+ &&TARGET_UNPACK_SEQUENCE_TUPLE,
&&TARGET_FORMAT_VALUE,
&&TARGET_BUILD_CONST_KEY_MAP,
&&TARGET_BUILD_STRING,
- &&TARGET_UNPACK_SEQUENCE_LIST,
- &&TARGET_UNPACK_SEQUENCE_TUPLE,
&&TARGET_UNPACK_SEQUENCE_TWO_TUPLE,
&&TARGET_SEND_GEN,
+ &&_unknown_opcode,
+ &&_unknown_opcode,
&&TARGET_LIST_EXTEND,
&&TARGET_SET_UPDATE,
&&TARGET_DICT_MERGE,
diff --git a/Python/specialize.c b/Python/specialize.c
index e5c6d68..cff414a 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -273,22 +273,12 @@ _PyCode_Quicken(PyCodeObject *code)
int opcode = 0;
_Py_CODEUNIT *instructions = _PyCode_CODE(code);
for (int i = 0; i < Py_SIZE(code); i++) {
- int previous_opcode = opcode;
opcode = _Py_GetBaseOpcode(code, i);
assert(opcode < MIN_INSTRUMENTED_OPCODE);
int caches = _PyOpcode_Caches[opcode];
if (caches) {
instructions[i + 1].cache = adaptive_counter_warmup();
i += caches;
- continue;
- }
- switch (previous_opcode << 8 | opcode) {
- case LOAD_CONST << 8 | LOAD_FAST:
- instructions[i - 1].op.code = LOAD_CONST__LOAD_FAST;
- break;
- case LOAD_FAST << 8 | LOAD_CONST:
- instructions[i - 1].op.code = LOAD_FAST__LOAD_CONST;
- break;
}
}
#endif /* ENABLE_SPECIALIZATION */
generated by cgit v0.12 at 2025-06-02 16:52:47 (GMT)