[Python-checkins] gh-104909: Split BINARY_OP into micro-ops (#104910)
gvanrossum
webhook-mailer at python.org
Wed May 31 11:09:31 EDT 2023
https://github.com/python/cpython/commit/df396b59af9d50892e5e30463300e8458cb84263
commit: df396b59af9d50892e5e30463300e8458cb84263
branch: main
author: Guido van Rossum <guido at python.org>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2023-05-31T08:09:23-07:00
summary:
gh-104909: Split BINARY_OP into micro-ops (#104910)
Co-authored-by: Brandt Bucher <brandtbucher at gmail.com>
files:
M Python/bytecodes.c
M Python/generated_cases.c.h
M Python/opcode_metadata.h
M Tools/cases_generator/generate_cases.py
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 0baf2451ee4f..5f73fc8f7248 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -279,57 +279,94 @@ dummy_func(
family(binary_op, INLINE_CACHE_ENTRIES_BINARY_OP) = {
BINARY_OP,
- BINARY_OP_ADD_FLOAT,
+ BINARY_OP_MULTIPLY_INT,
BINARY_OP_ADD_INT,
- BINARY_OP_ADD_UNICODE,
- // BINARY_OP_INPLACE_ADD_UNICODE, // This is an odd duck.
+ BINARY_OP_SUBTRACT_INT,
BINARY_OP_MULTIPLY_FLOAT,
- BINARY_OP_MULTIPLY_INT,
+ BINARY_OP_ADD_FLOAT,
BINARY_OP_SUBTRACT_FLOAT,
- BINARY_OP_SUBTRACT_INT,
+ BINARY_OP_ADD_UNICODE,
+ // BINARY_OP_INPLACE_ADD_UNICODE, // See comments at that opcode.
};
-
- inst(BINARY_OP_MULTIPLY_INT, (unused/1, left, right -- prod)) {
+ op(_GUARD_BOTH_INT, (left, right -- left, right)) {
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
+ }
+
+ op(_BINARY_OP_MULTIPLY_INT, (unused/1, left, right -- res)) {
STAT_INC(BINARY_OP, hit);
- prod = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
+ res = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
- ERROR_IF(prod == NULL, error);
+ ERROR_IF(res == NULL, error);
}
- inst(BINARY_OP_MULTIPLY_FLOAT, (unused/1, left, right -- prod)) {
- DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
- DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
+ op(_BINARY_OP_ADD_INT, (unused/1, left, right -- res)) {
STAT_INC(BINARY_OP, hit);
- double dprod = ((PyFloatObject *)left)->ob_fval *
- ((PyFloatObject *)right)->ob_fval;
- DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dprod, prod);
+ res = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
+ _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
+ _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
+ ERROR_IF(res == NULL, error);
}
- inst(BINARY_OP_SUBTRACT_INT, (unused/1, left, right -- sub)) {
- DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
- DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
+ op(_BINARY_OP_SUBTRACT_INT, (unused/1, left, right -- res)) {
STAT_INC(BINARY_OP, hit);
- sub = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
+ res = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
- ERROR_IF(sub == NULL, error);
+ ERROR_IF(res == NULL, error);
}
- inst(BINARY_OP_SUBTRACT_FLOAT, (unused/1, left, right -- sub)) {
+ macro(BINARY_OP_MULTIPLY_INT) =
+ _GUARD_BOTH_INT + _BINARY_OP_MULTIPLY_INT;
+ macro(BINARY_OP_ADD_INT) =
+ _GUARD_BOTH_INT + _BINARY_OP_ADD_INT;
+ macro(BINARY_OP_SUBTRACT_INT) =
+ _GUARD_BOTH_INT + _BINARY_OP_SUBTRACT_INT;
+
+ op(_GUARD_BOTH_FLOAT, (left, right -- left, right)) {
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
+ }
+
+ op(_BINARY_OP_MULTIPLY_FLOAT, (unused/1, left, right -- res)) {
STAT_INC(BINARY_OP, hit);
- double dsub = ((PyFloatObject *)left)->ob_fval - ((PyFloatObject *)right)->ob_fval;
- DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dsub, sub);
+ double dres =
+ ((PyFloatObject *)left)->ob_fval *
+ ((PyFloatObject *)right)->ob_fval;
+ DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
+ }
+
+ op(_BINARY_OP_ADD_FLOAT, (unused/1, left, right -- res)) {
+ STAT_INC(BINARY_OP, hit);
+ double dres =
+ ((PyFloatObject *)left)->ob_fval +
+ ((PyFloatObject *)right)->ob_fval;
+ DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
+ }
+
+ op(_BINARY_OP_SUBTRACT_FLOAT, (unused/1, left, right -- res)) {
+ STAT_INC(BINARY_OP, hit);
+ double dres =
+ ((PyFloatObject *)left)->ob_fval -
+ ((PyFloatObject *)right)->ob_fval;
+ DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
}
- inst(BINARY_OP_ADD_UNICODE, (unused/1, left, right -- res)) {
+ macro(BINARY_OP_MULTIPLY_FLOAT) =
+ _GUARD_BOTH_FLOAT + _BINARY_OP_MULTIPLY_FLOAT;
+ macro(BINARY_OP_ADD_FLOAT) =
+ _GUARD_BOTH_FLOAT + _BINARY_OP_ADD_FLOAT;
+ macro(BINARY_OP_SUBTRACT_FLOAT) =
+ _GUARD_BOTH_FLOAT + _BINARY_OP_SUBTRACT_FLOAT;
+
+ op(_GUARD_BOTH_UNICODE, (left, right -- left, right)) {
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
- DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
+ DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
+ }
+
+ op(_BINARY_OP_ADD_UNICODE, (unused/1, left, right -- res)) {
STAT_INC(BINARY_OP, hit);
res = PyUnicode_Concat(left, right);
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
@@ -337,15 +374,16 @@ dummy_func(
ERROR_IF(res == NULL, error);
}
+ macro(BINARY_OP_ADD_UNICODE) =
+ _GUARD_BOTH_UNICODE + _BINARY_OP_ADD_UNICODE;
+
// This is a subtle one. It's a super-instruction for
// BINARY_OP_ADD_UNICODE followed by STORE_FAST
// where the store goes into the left argument.
// So the inputs are the same as for all BINARY_OP
// specializations, but there is no output.
// At the end we just skip over the STORE_FAST.
- inst(BINARY_OP_INPLACE_ADD_UNICODE, (left, right --)) {
- DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
- DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
+ op(_BINARY_OP_INPLACE_ADD_UNICODE, (left, right --)) {
_Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP];
assert(true_next.op.code == STORE_FAST ||
true_next.op.code == STORE_FAST__LOAD_FAST);
@@ -372,24 +410,8 @@ dummy_func(
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
}
- inst(BINARY_OP_ADD_FLOAT, (unused/1, left, right -- sum)) {
- DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
- DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- double dsum = ((PyFloatObject *)left)->ob_fval +
- ((PyFloatObject *)right)->ob_fval;
- DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dsum, sum);
- }
-
- inst(BINARY_OP_ADD_INT, (unused/1, left, right -- sum)) {
- DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
- DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- sum = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
- _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
- _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
- ERROR_IF(sum == NULL, error);
- }
+ macro(BINARY_OP_INPLACE_ADD_UNICODE) =
+ _GUARD_BOTH_UNICODE + _BINARY_OP_INPLACE_ADD_UNICODE;
family(binary_subscr, INLINE_CACHE_ENTRIES_BINARY_SUBSCR) = {
BINARY_SUBSCR,
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 103373ec0db0..1c5e4f2f1846 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -385,166 +385,273 @@
}
TARGET(BINARY_OP_MULTIPLY_INT) {
- PyObject *right = stack_pointer[-1];
- PyObject *left = stack_pointer[-2];
- PyObject *prod;
- #line 294 "Python/bytecodes.c"
- DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
- DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- prod = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
- _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
- _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
- if (prod == NULL) goto pop_2_error;
- #line 400 "Python/generated_cases.c.h"
- STACK_SHRINK(1);
- stack_pointer[-1] = prod;
+ PyObject *_tmp_1 = stack_pointer[-1];
+ PyObject *_tmp_2 = stack_pointer[-2];
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 293 "Python/bytecodes.c"
+ DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
+ DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
+ #line 397 "Python/generated_cases.c.h"
+ _tmp_2 = left;
+ _tmp_1 = right;
+ }
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ PyObject *res;
+ #line 298 "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 411 "Python/generated_cases.c.h"
+ _tmp_2 = res;
+ }
next_instr += 1;
+ STACK_SHRINK(1);
+ stack_pointer[-1] = _tmp_2;
DISPATCH();
}
- TARGET(BINARY_OP_MULTIPLY_FLOAT) {
- PyObject *right = stack_pointer[-1];
- PyObject *left = stack_pointer[-2];
- PyObject *prod;
- #line 304 "Python/bytecodes.c"
- DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
- DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- double dprod = ((PyFloatObject *)left)->ob_fval *
- ((PyFloatObject *)right)->ob_fval;
- DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dprod, prod);
- #line 418 "Python/generated_cases.c.h"
- STACK_SHRINK(1);
- stack_pointer[-1] = prod;
+ TARGET(BINARY_OP_ADD_INT) {
+ PyObject *_tmp_1 = stack_pointer[-1];
+ PyObject *_tmp_2 = stack_pointer[-2];
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 293 "Python/bytecodes.c"
+ DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
+ DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
+ #line 429 "Python/generated_cases.c.h"
+ _tmp_2 = left;
+ _tmp_1 = right;
+ }
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ PyObject *res;
+ #line 306 "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 443 "Python/generated_cases.c.h"
+ _tmp_2 = res;
+ }
next_instr += 1;
+ STACK_SHRINK(1);
+ stack_pointer[-1] = _tmp_2;
DISPATCH();
}
TARGET(BINARY_OP_SUBTRACT_INT) {
- PyObject *right = stack_pointer[-1];
- PyObject *left = stack_pointer[-2];
- PyObject *sub;
- #line 313 "Python/bytecodes.c"
- DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
- DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- sub = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
- _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
- _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
- if (sub == NULL) goto pop_2_error;
- #line 437 "Python/generated_cases.c.h"
- STACK_SHRINK(1);
- stack_pointer[-1] = sub;
+ PyObject *_tmp_1 = stack_pointer[-1];
+ PyObject *_tmp_2 = stack_pointer[-2];
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 293 "Python/bytecodes.c"
+ DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
+ DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
+ #line 461 "Python/generated_cases.c.h"
+ _tmp_2 = left;
+ _tmp_1 = right;
+ }
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ PyObject *res;
+ #line 314 "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 475 "Python/generated_cases.c.h"
+ _tmp_2 = res;
+ }
next_instr += 1;
+ STACK_SHRINK(1);
+ stack_pointer[-1] = _tmp_2;
DISPATCH();
}
- TARGET(BINARY_OP_SUBTRACT_FLOAT) {
- PyObject *right = stack_pointer[-1];
- PyObject *left = stack_pointer[-2];
- PyObject *sub;
- #line 323 "Python/bytecodes.c"
- DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
- DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- double dsub = ((PyFloatObject *)left)->ob_fval - ((PyFloatObject *)right)->ob_fval;
- DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dsub, sub);
- #line 454 "Python/generated_cases.c.h"
- STACK_SHRINK(1);
- stack_pointer[-1] = sub;
+ TARGET(BINARY_OP_MULTIPLY_FLOAT) {
+ PyObject *_tmp_1 = stack_pointer[-1];
+ PyObject *_tmp_2 = stack_pointer[-2];
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 329 "Python/bytecodes.c"
+ DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
+ DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
+ #line 493 "Python/generated_cases.c.h"
+ _tmp_2 = left;
+ _tmp_1 = right;
+ }
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ PyObject *res;
+ #line 334 "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 507 "Python/generated_cases.c.h"
+ _tmp_2 = res;
+ }
next_instr += 1;
+ STACK_SHRINK(1);
+ stack_pointer[-1] = _tmp_2;
DISPATCH();
}
- TARGET(BINARY_OP_ADD_UNICODE) {
- PyObject *right = stack_pointer[-1];
- PyObject *left = stack_pointer[-2];
- PyObject *res;
- #line 331 "Python/bytecodes.c"
- DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
- DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
- 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 473 "Python/generated_cases.c.h"
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ TARGET(BINARY_OP_ADD_FLOAT) {
+ PyObject *_tmp_1 = stack_pointer[-1];
+ PyObject *_tmp_2 = stack_pointer[-2];
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 329 "Python/bytecodes.c"
+ DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
+ DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
+ #line 525 "Python/generated_cases.c.h"
+ _tmp_2 = left;
+ _tmp_1 = right;
+ }
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ PyObject *res;
+ #line 342 "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 539 "Python/generated_cases.c.h"
+ _tmp_2 = res;
+ }
next_instr += 1;
+ STACK_SHRINK(1);
+ stack_pointer[-1] = _tmp_2;
DISPATCH();
}
- TARGET(BINARY_OP_INPLACE_ADD_UNICODE) {
- PyObject *right = stack_pointer[-1];
- PyObject *left = stack_pointer[-2];
- #line 347 "Python/bytecodes.c"
- DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
- DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
- _Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP];
- assert(true_next.op.code == STORE_FAST ||
- true_next.op.code == STORE_FAST__LOAD_FAST);
- PyObject **target_local = &GETLOCAL(true_next.op.arg);
- DEOPT_IF(*target_local != left, BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- /* Handle `left = left + right` or `left += right` for str.
- *
- * When possible, extend `left` in place rather than
- * allocating a new PyUnicodeObject. This attempts to avoid
- * quadratic behavior when one neglects to use str.join().
- *
- * If `left` has only two references remaining (one from
- * the stack, one in the locals), DECREFing `left` leaves
- * only the locals reference, so PyUnicode_Append knows
- * that the string is safe to mutate.
- */
- assert(Py_REFCNT(left) >= 2);
- _Py_DECREF_NO_DEALLOC(left);
- PyUnicode_Append(target_local, right);
- _Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
- if (*target_local == NULL) goto pop_2_error;
- // The STORE_FAST is already done.
- JUMPBY(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
- #line 510 "Python/generated_cases.c.h"
- STACK_SHRINK(2);
+ TARGET(BINARY_OP_SUBTRACT_FLOAT) {
+ PyObject *_tmp_1 = stack_pointer[-1];
+ PyObject *_tmp_2 = stack_pointer[-2];
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 329 "Python/bytecodes.c"
+ DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
+ DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
+ #line 557 "Python/generated_cases.c.h"
+ _tmp_2 = left;
+ _tmp_1 = right;
+ }
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ PyObject *res;
+ #line 350 "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 571 "Python/generated_cases.c.h"
+ _tmp_2 = res;
+ }
+ next_instr += 1;
+ STACK_SHRINK(1);
+ stack_pointer[-1] = _tmp_2;
DISPATCH();
}
- TARGET(BINARY_OP_ADD_FLOAT) {
- PyObject *right = stack_pointer[-1];
- PyObject *left = stack_pointer[-2];
- PyObject *sum;
- #line 376 "Python/bytecodes.c"
- DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
- DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- double dsum = ((PyFloatObject *)left)->ob_fval +
- ((PyFloatObject *)right)->ob_fval;
- DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dsum, sum);
- #line 526 "Python/generated_cases.c.h"
- STACK_SHRINK(1);
- stack_pointer[-1] = sum;
+ TARGET(BINARY_OP_ADD_UNICODE) {
+ PyObject *_tmp_1 = stack_pointer[-1];
+ PyObject *_tmp_2 = stack_pointer[-2];
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 365 "Python/bytecodes.c"
+ DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
+ DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
+ #line 589 "Python/generated_cases.c.h"
+ _tmp_2 = left;
+ _tmp_1 = right;
+ }
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ PyObject *res;
+ #line 370 "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 603 "Python/generated_cases.c.h"
+ _tmp_2 = res;
+ }
next_instr += 1;
+ STACK_SHRINK(1);
+ stack_pointer[-1] = _tmp_2;
DISPATCH();
}
- TARGET(BINARY_OP_ADD_INT) {
- PyObject *right = stack_pointer[-1];
- PyObject *left = stack_pointer[-2];
- PyObject *sum;
- #line 385 "Python/bytecodes.c"
- DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
- DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
- STAT_INC(BINARY_OP, hit);
- sum = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
- _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
- _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
- if (sum == NULL) goto pop_2_error;
- #line 545 "Python/generated_cases.c.h"
- STACK_SHRINK(1);
- stack_pointer[-1] = sum;
- next_instr += 1;
+ TARGET(BINARY_OP_INPLACE_ADD_UNICODE) {
+ PyObject *_tmp_1 = stack_pointer[-1];
+ PyObject *_tmp_2 = stack_pointer[-2];
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 365 "Python/bytecodes.c"
+ DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
+ DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
+ #line 621 "Python/generated_cases.c.h"
+ _tmp_2 = left;
+ _tmp_1 = right;
+ }
+ {
+ PyObject *right = _tmp_1;
+ PyObject *left = _tmp_2;
+ #line 387 "Python/bytecodes.c"
+ _Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP];
+ assert(true_next.op.code == STORE_FAST ||
+ true_next.op.code == STORE_FAST__LOAD_FAST);
+ PyObject **target_local = &GETLOCAL(true_next.op.arg);
+ DEOPT_IF(*target_local != left, BINARY_OP);
+ STAT_INC(BINARY_OP, hit);
+ /* Handle `left = left + right` or `left += right` for str.
+ *
+ * When possible, extend `left` in place rather than
+ * allocating a new PyUnicodeObject. This attempts to avoid
+ * quadratic behavior when one neglects to use str.join().
+ *
+ * If `left` has only two references remaining (one from
+ * the stack, one in the locals), DECREFing `left` leaves
+ * only the locals reference, so PyUnicode_Append knows
+ * that the string is safe to mutate.
+ */
+ assert(Py_REFCNT(left) >= 2);
+ _Py_DECREF_NO_DEALLOC(left);
+ PyUnicode_Append(target_local, right);
+ _Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
+ if (*target_local == NULL) goto pop_2_error;
+ // The STORE_FAST is already done.
+ JUMPBY(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
+ #line 653 "Python/generated_cases.c.h"
+ }
+ STACK_SHRINK(2);
DISPATCH();
}
@@ -554,7 +661,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
PyObject *res;
- #line 403 "Python/bytecodes.c"
+ #line 425 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -566,12 +673,12 @@
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
res = PyObject_GetItem(container, sub);
- #line 570 "Python/generated_cases.c.h"
+ #line 677 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 415 "Python/bytecodes.c"
+ #line 437 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 575 "Python/generated_cases.c.h"
+ #line 682 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -583,7 +690,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *res;
- #line 419 "Python/bytecodes.c"
+ #line 441 "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.
@@ -596,7 +703,7 @@
}
Py_DECREF(container);
if (res == NULL) goto pop_3_error;
- #line 600 "Python/generated_cases.c.h"
+ #line 707 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = res;
DISPATCH();
@@ -607,7 +714,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *v = stack_pointer[-4];
- #line 434 "Python/bytecodes.c"
+ #line 456 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
int err;
if (slice == NULL) {
@@ -620,7 +727,7 @@
Py_DECREF(v);
Py_DECREF(container);
if (err) goto pop_4_error;
- #line 624 "Python/generated_cases.c.h"
+ #line 731 "Python/generated_cases.c.h"
STACK_SHRINK(4);
DISPATCH();
}
@@ -629,7 +736,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *res;
- #line 449 "Python/bytecodes.c"
+ #line 471 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
@@ -643,7 +750,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 647 "Python/generated_cases.c.h"
+ #line 754 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -654,7 +761,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *tuple = stack_pointer[-2];
PyObject *res;
- #line 465 "Python/bytecodes.c"
+ #line 487 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
@@ -668,7 +775,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(tuple);
- #line 672 "Python/generated_cases.c.h"
+ #line 779 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -679,7 +786,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *res;
- #line 481 "Python/bytecodes.c"
+ #line 503 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
res = PyDict_GetItemWithError(dict, sub);
@@ -687,14 +794,14 @@
if (!_PyErr_Occurred(tstate)) {
_PyErr_SetKeyError(sub);
}
- #line 691 "Python/generated_cases.c.h"
+ #line 798 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
- #line 489 "Python/bytecodes.c"
+ #line 511 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
Py_INCREF(res); // Do this before DECREF'ing dict, sub
- #line 698 "Python/generated_cases.c.h"
+ #line 805 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
STACK_SHRINK(1);
@@ -706,7 +813,7 @@
TARGET(BINARY_SUBSCR_GETITEM) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 496 "Python/bytecodes.c"
+ #line 518 "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);
@@ -729,15 +836,15 @@
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_SUBSCR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 733 "Python/generated_cases.c.h"
+ #line 840 "Python/generated_cases.c.h"
}
TARGET(LIST_APPEND) {
PyObject *v = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 521 "Python/bytecodes.c"
+ #line 543 "Python/bytecodes.c"
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
- #line 741 "Python/generated_cases.c.h"
+ #line 848 "Python/generated_cases.c.h"
STACK_SHRINK(1);
PREDICT(JUMP_BACKWARD);
DISPATCH();
@@ -746,13 +853,13 @@
TARGET(SET_ADD) {
PyObject *v = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 526 "Python/bytecodes.c"
+ #line 548 "Python/bytecodes.c"
int err = PySet_Add(set, v);
- #line 752 "Python/generated_cases.c.h"
+ #line 859 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 528 "Python/bytecodes.c"
+ #line 550 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 756 "Python/generated_cases.c.h"
+ #line 863 "Python/generated_cases.c.h"
STACK_SHRINK(1);
PREDICT(JUMP_BACKWARD);
DISPATCH();
@@ -765,7 +872,7 @@
PyObject *container = stack_pointer[-2];
PyObject *v = stack_pointer[-3];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 539 "Python/bytecodes.c"
+ #line 561 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr--;
@@ -780,13 +887,13 @@
#endif /* ENABLE_SPECIALIZATION */
/* container[sub] = v */
int err = PyObject_SetItem(container, sub, v);
- #line 784 "Python/generated_cases.c.h"
+ #line 891 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(container);
Py_DECREF(sub);
- #line 554 "Python/bytecodes.c"
+ #line 576 "Python/bytecodes.c"
if (err) goto pop_3_error;
- #line 790 "Python/generated_cases.c.h"
+ #line 897 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -796,7 +903,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 558 "Python/bytecodes.c"
+ #line 580 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
@@ -813,7 +920,7 @@
Py_DECREF(old_value);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 817 "Python/generated_cases.c.h"
+ #line 924 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -823,13 +930,13 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 577 "Python/bytecodes.c"
+ #line 599 "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 833 "Python/generated_cases.c.h"
+ #line 940 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -838,15 +945,15 @@
TARGET(DELETE_SUBSCR) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 585 "Python/bytecodes.c"
+ #line 607 "Python/bytecodes.c"
/* del container[sub] */
int err = PyObject_DelItem(container, sub);
- #line 845 "Python/generated_cases.c.h"
+ #line 952 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 588 "Python/bytecodes.c"
+ #line 610 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 850 "Python/generated_cases.c.h"
+ #line 957 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -854,14 +961,14 @@
TARGET(CALL_INTRINSIC_1) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 592 "Python/bytecodes.c"
+ #line 614 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_1);
res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value);
- #line 861 "Python/generated_cases.c.h"
+ #line 968 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 595 "Python/bytecodes.c"
+ #line 617 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 865 "Python/generated_cases.c.h"
+ #line 972 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -870,15 +977,15 @@
PyObject *value1 = stack_pointer[-1];
PyObject *value2 = stack_pointer[-2];
PyObject *res;
- #line 599 "Python/bytecodes.c"
+ #line 621 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_2);
res = _PyIntrinsics_BinaryFunctions[oparg](tstate, value2, value1);
- #line 877 "Python/generated_cases.c.h"
+ #line 984 "Python/generated_cases.c.h"
Py_DECREF(value2);
Py_DECREF(value1);
- #line 602 "Python/bytecodes.c"
+ #line 624 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 882 "Python/generated_cases.c.h"
+ #line 989 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -886,7 +993,7 @@
TARGET(RAISE_VARARGS) {
PyObject **args = (stack_pointer - oparg);
- #line 606 "Python/bytecodes.c"
+ #line 628 "Python/bytecodes.c"
PyObject *cause = NULL, *exc = NULL;
switch (oparg) {
case 2:
@@ -904,12 +1011,12 @@
break;
}
if (true) { STACK_SHRINK(oparg); goto error; }
- #line 908 "Python/generated_cases.c.h"
+ #line 1015 "Python/generated_cases.c.h"
}
TARGET(INTERPRETER_EXIT) {
PyObject *retval = stack_pointer[-1];
- #line 626 "Python/bytecodes.c"
+ #line 648 "Python/bytecodes.c"
assert(frame == &entry_frame);
assert(_PyFrame_IsIncomplete(frame));
STACK_SHRINK(1); // Since we're not going to DISPATCH()
@@ -920,12 +1027,12 @@
assert(!_PyErr_Occurred(tstate));
_Py_LeaveRecursiveCallTstate(tstate);
return retval;
- #line 924 "Python/generated_cases.c.h"
+ #line 1031 "Python/generated_cases.c.h"
}
TARGET(RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 639 "Python/bytecodes.c"
+ #line 661 "Python/bytecodes.c"
STACK_SHRINK(1);
assert(EMPTY());
_PyFrame_SetStackPointer(frame, stack_pointer);
@@ -938,12 +1045,12 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 942 "Python/generated_cases.c.h"
+ #line 1049 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 654 "Python/bytecodes.c"
+ #line 676 "Python/bytecodes.c"
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
frame, next_instr-1, retval);
@@ -960,11 +1067,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 964 "Python/generated_cases.c.h"
+ #line 1071 "Python/generated_cases.c.h"
}
TARGET(RETURN_CONST) {
- #line 673 "Python/bytecodes.c"
+ #line 695 "Python/bytecodes.c"
PyObject *retval = GETITEM(frame->f_code->co_consts, oparg);
Py_INCREF(retval);
assert(EMPTY());
@@ -978,11 +1085,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 982 "Python/generated_cases.c.h"
+ #line 1089 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_CONST) {
- #line 689 "Python/bytecodes.c"
+ #line 711 "Python/bytecodes.c"
PyObject *retval = GETITEM(frame->f_code->co_consts, oparg);
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
@@ -1000,13 +1107,13 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1004 "Python/generated_cases.c.h"
+ #line 1111 "Python/generated_cases.c.h"
}
TARGET(GET_AITER) {
PyObject *obj = stack_pointer[-1];
PyObject *iter;
- #line 709 "Python/bytecodes.c"
+ #line 731 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyTypeObject *type = Py_TYPE(obj);
@@ -1019,16 +1126,16 @@
"'async for' requires an object with "
"__aiter__ method, got %.100s",
type->tp_name);
- #line 1023 "Python/generated_cases.c.h"
+ #line 1130 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 722 "Python/bytecodes.c"
+ #line 744 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
iter = (*getter)(obj);
- #line 1030 "Python/generated_cases.c.h"
+ #line 1137 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 727 "Python/bytecodes.c"
+ #line 749 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
if (Py_TYPE(iter)->tp_as_async == NULL ||
@@ -1041,7 +1148,7 @@
Py_DECREF(iter);
if (true) goto pop_1_error;
}
- #line 1045 "Python/generated_cases.c.h"
+ #line 1152 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -1049,7 +1156,7 @@
TARGET(GET_ANEXT) {
PyObject *aiter = stack_pointer[-1];
PyObject *awaitable;
- #line 742 "Python/bytecodes.c"
+ #line 764 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyObject *next_iter = NULL;
PyTypeObject *type = Py_TYPE(aiter);
@@ -1093,7 +1200,7 @@
}
}
- #line 1097 "Python/generated_cases.c.h"
+ #line 1204 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = awaitable;
PREDICT(LOAD_CONST);
@@ -1104,16 +1211,16 @@
PREDICTED(GET_AWAITABLE);
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 789 "Python/bytecodes.c"
+ #line 811 "Python/bytecodes.c"
iter = _PyCoro_GetAwaitableIter(iterable);
if (iter == NULL) {
format_awaitable_error(tstate, Py_TYPE(iterable), oparg);
}
- #line 1115 "Python/generated_cases.c.h"
+ #line 1222 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 796 "Python/bytecodes.c"
+ #line 818 "Python/bytecodes.c"
if (iter != NULL && PyCoro_CheckExact(iter)) {
PyObject *yf = _PyGen_yf((PyGenObject*)iter);
@@ -1131,7 +1238,7 @@
if (iter == NULL) goto pop_1_error;
- #line 1135 "Python/generated_cases.c.h"
+ #line 1242 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
PREDICT(LOAD_CONST);
DISPATCH();
@@ -1143,7 +1250,7 @@
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
PyObject *retval;
- #line 822 "Python/bytecodes.c"
+ #line 844 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PySendCache *cache = (_PySendCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1190,7 +1297,7 @@
}
}
Py_DECREF(v);
- #line 1194 "Python/generated_cases.c.h"
+ #line 1301 "Python/generated_cases.c.h"
stack_pointer[-1] = retval;
next_instr += 1;
DISPATCH();
@@ -1199,7 +1306,7 @@
TARGET(SEND_GEN) {
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 871 "Python/bytecodes.c"
+ #line 893 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, SEND);
PyGenObject *gen = (PyGenObject *)receiver;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type &&
@@ -1215,12 +1322,12 @@
tstate->exc_info = &gen->gi_exc_state;
JUMPBY(INLINE_CACHE_ENTRIES_SEND);
DISPATCH_INLINED(gen_frame);
- #line 1219 "Python/generated_cases.c.h"
+ #line 1326 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 889 "Python/bytecodes.c"
+ #line 911 "Python/bytecodes.c"
assert(frame != &entry_frame);
PyGenObject *gen = _PyFrame_GetGenerator(frame);
gen->gi_frame_state = FRAME_SUSPENDED;
@@ -1237,12 +1344,12 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1241 "Python/generated_cases.c.h"
+ #line 1348 "Python/generated_cases.c.h"
}
TARGET(YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 908 "Python/bytecodes.c"
+ #line 930 "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.
@@ -1258,15 +1365,15 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1262 "Python/generated_cases.c.h"
+ #line 1369 "Python/generated_cases.c.h"
}
TARGET(POP_EXCEPT) {
PyObject *exc_value = stack_pointer[-1];
- #line 926 "Python/bytecodes.c"
+ #line 948 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
Py_XSETREF(exc_info->exc_value, exc_value);
- #line 1270 "Python/generated_cases.c.h"
+ #line 1377 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1274,7 +1381,7 @@
TARGET(RERAISE) {
PyObject *exc = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
- #line 931 "Python/bytecodes.c"
+ #line 953 "Python/bytecodes.c"
assert(oparg >= 0 && oparg <= 2);
if (oparg) {
PyObject *lasti = values[0];
@@ -1292,26 +1399,26 @@
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
- #line 1296 "Python/generated_cases.c.h"
+ #line 1403 "Python/generated_cases.c.h"
}
TARGET(END_ASYNC_FOR) {
PyObject *exc = stack_pointer[-1];
PyObject *awaitable = stack_pointer[-2];
- #line 951 "Python/bytecodes.c"
+ #line 973 "Python/bytecodes.c"
assert(exc && PyExceptionInstance_Check(exc));
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
- #line 1305 "Python/generated_cases.c.h"
+ #line 1412 "Python/generated_cases.c.h"
Py_DECREF(awaitable);
Py_DECREF(exc);
- #line 954 "Python/bytecodes.c"
+ #line 976 "Python/bytecodes.c"
}
else {
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
}
- #line 1315 "Python/generated_cases.c.h"
+ #line 1422 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -1322,23 +1429,23 @@
PyObject *sub_iter = stack_pointer[-3];
PyObject *none;
PyObject *value;
- #line 963 "Python/bytecodes.c"
+ #line 985 "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 1331 "Python/generated_cases.c.h"
+ #line 1438 "Python/generated_cases.c.h"
Py_DECREF(sub_iter);
Py_DECREF(last_sent_val);
Py_DECREF(exc_value);
- #line 968 "Python/bytecodes.c"
+ #line 990 "Python/bytecodes.c"
none = Py_None;
}
else {
_PyErr_SetRaisedException(tstate, Py_NewRef(exc_value));
goto exception_unwind;
}
- #line 1342 "Python/generated_cases.c.h"
+ #line 1449 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
stack_pointer[-2] = none;
@@ -1347,9 +1454,9 @@
TARGET(LOAD_ASSERTION_ERROR) {
PyObject *value;
- #line 977 "Python/bytecodes.c"
+ #line 999 "Python/bytecodes.c"
value = Py_NewRef(PyExc_AssertionError);
- #line 1353 "Python/generated_cases.c.h"
+ #line 1460 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -1357,7 +1464,7 @@
TARGET(LOAD_BUILD_CLASS) {
PyObject *bc;
- #line 981 "Python/bytecodes.c"
+ #line 1003 "Python/bytecodes.c"
if (PyDict_CheckExact(BUILTINS())) {
bc = _PyDict_GetItemWithError(BUILTINS(),
&_Py_ID(__build_class__));
@@ -1379,7 +1486,7 @@
if (true) goto error;
}
}
- #line 1383 "Python/generated_cases.c.h"
+ #line 1490 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = bc;
DISPATCH();
@@ -1387,33 +1494,33 @@
TARGET(STORE_NAME) {
PyObject *v = stack_pointer[-1];
- #line 1006 "Python/bytecodes.c"
+ #line 1028 "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 1398 "Python/generated_cases.c.h"
+ #line 1505 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1013 "Python/bytecodes.c"
+ #line 1035 "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 1407 "Python/generated_cases.c.h"
+ #line 1514 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1020 "Python/bytecodes.c"
+ #line 1042 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1411 "Python/generated_cases.c.h"
+ #line 1518 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_NAME) {
- #line 1024 "Python/bytecodes.c"
+ #line 1046 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
PyObject *ns = LOCALS();
int err;
@@ -1430,7 +1537,7 @@
name);
goto error;
}
- #line 1434 "Python/generated_cases.c.h"
+ #line 1541 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1438,7 +1545,7 @@
PREDICTED(UNPACK_SEQUENCE);
static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
PyObject *seq = stack_pointer[-1];
- #line 1050 "Python/bytecodes.c"
+ #line 1072 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1451,11 +1558,11 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject **top = stack_pointer + oparg - 1;
int res = unpack_iterable(tstate, seq, oparg, -1, top);
- #line 1455 "Python/generated_cases.c.h"
+ #line 1562 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1063 "Python/bytecodes.c"
+ #line 1085 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1459 "Python/generated_cases.c.h"
+ #line 1566 "Python/generated_cases.c.h"
STACK_SHRINK(1);
STACK_GROW(oparg);
next_instr += 1;
@@ -1465,14 +1572,14 @@
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1067 "Python/bytecodes.c"
+ #line 1089 "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 1476 "Python/generated_cases.c.h"
+ #line 1583 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1483,7 +1590,7 @@
TARGET(UNPACK_SEQUENCE_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1077 "Python/bytecodes.c"
+ #line 1099 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1491,7 +1598,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1495 "Python/generated_cases.c.h"
+ #line 1602 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1502,7 +1609,7 @@
TARGET(UNPACK_SEQUENCE_LIST) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1088 "Python/bytecodes.c"
+ #line 1110 "Python/bytecodes.c"
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1510,7 +1617,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1514 "Python/generated_cases.c.h"
+ #line 1621 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1520,15 +1627,15 @@
TARGET(UNPACK_EX) {
PyObject *seq = stack_pointer[-1];
- #line 1099 "Python/bytecodes.c"
+ #line 1121 "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 1528 "Python/generated_cases.c.h"
+ #line 1635 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1103 "Python/bytecodes.c"
+ #line 1125 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1532 "Python/generated_cases.c.h"
+ #line 1639 "Python/generated_cases.c.h"
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
DISPATCH();
}
@@ -1539,7 +1646,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *v = stack_pointer[-2];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 1114 "Python/bytecodes.c"
+ #line 1136 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
@@ -1555,12 +1662,12 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyObject_SetAttr(owner, name, v);
- #line 1559 "Python/generated_cases.c.h"
+ #line 1666 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(owner);
- #line 1130 "Python/bytecodes.c"
+ #line 1152 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 1564 "Python/generated_cases.c.h"
+ #line 1671 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -1568,34 +1675,34 @@
TARGET(DELETE_ATTR) {
PyObject *owner = stack_pointer[-1];
- #line 1134 "Python/bytecodes.c"
+ #line 1156 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
- #line 1575 "Python/generated_cases.c.h"
+ #line 1682 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1137 "Python/bytecodes.c"
+ #line 1159 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1579 "Python/generated_cases.c.h"
+ #line 1686 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(STORE_GLOBAL) {
PyObject *v = stack_pointer[-1];
- #line 1141 "Python/bytecodes.c"
+ #line 1163 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
- #line 1589 "Python/generated_cases.c.h"
+ #line 1696 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1144 "Python/bytecodes.c"
+ #line 1166 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1593 "Python/generated_cases.c.h"
+ #line 1700 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_GLOBAL) {
- #line 1148 "Python/bytecodes.c"
+ #line 1170 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err;
err = PyDict_DelItem(GLOBALS(), name);
@@ -1607,7 +1714,7 @@
}
goto error;
}
- #line 1611 "Python/generated_cases.c.h"
+ #line 1718 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1615,7 +1722,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1162 "Python/bytecodes.c"
+ #line 1184 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1623,7 +1730,7 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1627 "Python/generated_cases.c.h"
+ #line 1734 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
STACK_GROW(1);
@@ -1635,7 +1742,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1162 "Python/bytecodes.c"
+ #line 1184 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1643,13 +1750,13 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1647 "Python/generated_cases.c.h"
+ #line 1754 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1174 "Python/bytecodes.c"
+ #line 1196 "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);
@@ -1706,7 +1813,7 @@
}
}
}
- #line 1710 "Python/generated_cases.c.h"
+ #line 1817 "Python/generated_cases.c.h"
_tmp_1 = v;
}
STACK_GROW(1);
@@ -1719,7 +1826,7 @@
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1174 "Python/bytecodes.c"
+ #line 1196 "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);
@@ -1776,7 +1883,7 @@
}
}
}
- #line 1780 "Python/generated_cases.c.h"
+ #line 1887 "Python/generated_cases.c.h"
_tmp_1 = v;
}
stack_pointer[-1] = _tmp_1;
@@ -1788,7 +1895,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size");
PyObject *null = NULL;
PyObject *v;
- #line 1243 "Python/bytecodes.c"
+ #line 1265 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1840,7 +1947,7 @@
}
}
null = NULL;
- #line 1844 "Python/generated_cases.c.h"
+ #line 1951 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = v;
@@ -1854,7 +1961,7 @@
PyObject *res;
uint16_t index = read_u16(&next_instr[1].cache);
uint16_t version = read_u16(&next_instr[2].cache);
- #line 1297 "Python/bytecodes.c"
+ #line 1319 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
PyDictObject *dict = (PyDictObject *)GLOBALS();
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
@@ -1865,7 +1972,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1869 "Python/generated_cases.c.h"
+ #line 1976 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1880,7 +1987,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 1310 "Python/bytecodes.c"
+ #line 1332 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
DEOPT_IF(!PyDict_CheckExact(BUILTINS()), LOAD_GLOBAL);
PyDictObject *mdict = (PyDictObject *)GLOBALS();
@@ -1895,7 +2002,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1899 "Python/generated_cases.c.h"
+ #line 2006 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1905,16 +2012,16 @@
}
TARGET(DELETE_FAST) {
- #line 1327 "Python/bytecodes.c"
+ #line 1349 "Python/bytecodes.c"
PyObject *v = GETLOCAL(oparg);
if (v == NULL) goto unbound_local_error;
SETLOCAL(oparg, NULL);
- #line 1913 "Python/generated_cases.c.h"
+ #line 2020 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(MAKE_CELL) {
- #line 1333 "Python/bytecodes.c"
+ #line 1355 "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);
@@ -1923,12 +2030,12 @@
goto resume_with_error;
}
SETLOCAL(oparg, cell);
- #line 1927 "Python/generated_cases.c.h"
+ #line 2034 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(DELETE_DEREF) {
- #line 1344 "Python/bytecodes.c"
+ #line 1366 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
// Can't use ERROR_IF here.
@@ -1939,14 +2046,14 @@
}
PyCell_SET(cell, NULL);
Py_DECREF(oldobj);
- #line 1943 "Python/generated_cases.c.h"
+ #line 2050 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(LOAD_FROM_DICT_OR_DEREF) {
PyObject *class_dict = stack_pointer[-1];
PyObject *value;
- #line 1357 "Python/bytecodes.c"
+ #line 1379 "Python/bytecodes.c"
PyObject *name;
assert(class_dict);
assert(oparg >= 0 && oparg < frame->f_code->co_nlocalsplus);
@@ -1981,14 +2088,14 @@
}
Py_INCREF(value);
}
- #line 1985 "Python/generated_cases.c.h"
+ #line 2092 "Python/generated_cases.c.h"
stack_pointer[-1] = value;
DISPATCH();
}
TARGET(LOAD_DEREF) {
PyObject *value;
- #line 1394 "Python/bytecodes.c"
+ #line 1416 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
value = PyCell_GET(cell);
if (value == NULL) {
@@ -1996,7 +2103,7 @@
if (true) goto error;
}
Py_INCREF(value);
- #line 2000 "Python/generated_cases.c.h"
+ #line 2107 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -2004,18 +2111,18 @@
TARGET(STORE_DEREF) {
PyObject *v = stack_pointer[-1];
- #line 1404 "Python/bytecodes.c"
+ #line 1426 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
Py_XDECREF(oldobj);
- #line 2013 "Python/generated_cases.c.h"
+ #line 2120 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(COPY_FREE_VARS) {
- #line 1411 "Python/bytecodes.c"
+ #line 1433 "Python/bytecodes.c"
/* Copy closure variables to free variables */
PyCodeObject *co = frame->f_code;
assert(PyFunction_Check(frame->f_funcobj));
@@ -2026,22 +2133,22 @@
PyObject *o = PyTuple_GET_ITEM(closure, i);
frame->localsplus[offset + i] = Py_NewRef(o);
}
- #line 2030 "Python/generated_cases.c.h"
+ #line 2137 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(BUILD_STRING) {
PyObject **pieces = (stack_pointer - oparg);
PyObject *str;
- #line 1424 "Python/bytecodes.c"
+ #line 1446 "Python/bytecodes.c"
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
- #line 2039 "Python/generated_cases.c.h"
+ #line 2146 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
- #line 1426 "Python/bytecodes.c"
+ #line 1448 "Python/bytecodes.c"
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2045 "Python/generated_cases.c.h"
+ #line 2152 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = str;
@@ -2051,10 +2158,10 @@
TARGET(BUILD_TUPLE) {
PyObject **values = (stack_pointer - oparg);
PyObject *tup;
- #line 1430 "Python/bytecodes.c"
+ #line 1452 "Python/bytecodes.c"
tup = _PyTuple_FromArraySteal(values, oparg);
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2058 "Python/generated_cases.c.h"
+ #line 2165 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = tup;
@@ -2064,10 +2171,10 @@
TARGET(BUILD_LIST) {
PyObject **values = (stack_pointer - oparg);
PyObject *list;
- #line 1435 "Python/bytecodes.c"
+ #line 1457 "Python/bytecodes.c"
list = _PyList_FromArraySteal(values, oparg);
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2071 "Python/generated_cases.c.h"
+ #line 2178 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = list;
@@ -2077,7 +2184,7 @@
TARGET(LIST_EXTEND) {
PyObject *iterable = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 1440 "Python/bytecodes.c"
+ #line 1462 "Python/bytecodes.c"
PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
if (none_val == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
@@ -2088,13 +2195,13 @@
"Value after * must be an iterable, not %.200s",
Py_TYPE(iterable)->tp_name);
}
- #line 2092 "Python/generated_cases.c.h"
+ #line 2199 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1451 "Python/bytecodes.c"
+ #line 1473 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
assert(Py_IsNone(none_val));
- #line 2098 "Python/generated_cases.c.h"
+ #line 2205 "Python/generated_cases.c.h"
Py_DECREF(iterable);
STACK_SHRINK(1);
DISPATCH();
@@ -2103,13 +2210,13 @@
TARGET(SET_UPDATE) {
PyObject *iterable = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 1458 "Python/bytecodes.c"
+ #line 1480 "Python/bytecodes.c"
int err = _PySet_Update(set, iterable);
- #line 2109 "Python/generated_cases.c.h"
+ #line 2216 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1460 "Python/bytecodes.c"
+ #line 1482 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
- #line 2113 "Python/generated_cases.c.h"
+ #line 2220 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2117,7 +2224,7 @@
TARGET(BUILD_SET) {
PyObject **values = (stack_pointer - oparg);
PyObject *set;
- #line 1464 "Python/bytecodes.c"
+ #line 1486 "Python/bytecodes.c"
set = PySet_New(NULL);
if (set == NULL)
goto error;
@@ -2132,7 +2239,7 @@
Py_DECREF(set);
if (true) { STACK_SHRINK(oparg); goto error; }
}
- #line 2136 "Python/generated_cases.c.h"
+ #line 2243 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = set;
@@ -2142,7 +2249,7 @@
TARGET(BUILD_MAP) {
PyObject **values = (stack_pointer - oparg*2);
PyObject *map;
- #line 1481 "Python/bytecodes.c"
+ #line 1503 "Python/bytecodes.c"
map = _PyDict_FromItems(
values, 2,
values+1, 2,
@@ -2150,13 +2257,13 @@
if (map == NULL)
goto error;
- #line 2154 "Python/generated_cases.c.h"
+ #line 2261 "Python/generated_cases.c.h"
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
- #line 1489 "Python/bytecodes.c"
+ #line 1511 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
- #line 2160 "Python/generated_cases.c.h"
+ #line 2267 "Python/generated_cases.c.h"
STACK_SHRINK(oparg*2);
STACK_GROW(1);
stack_pointer[-1] = map;
@@ -2164,7 +2271,7 @@
}
TARGET(SETUP_ANNOTATIONS) {
- #line 1493 "Python/bytecodes.c"
+ #line 1515 "Python/bytecodes.c"
int err;
PyObject *ann_dict;
if (LOCALS() == NULL) {
@@ -2204,7 +2311,7 @@
Py_DECREF(ann_dict);
}
}
- #line 2208 "Python/generated_cases.c.h"
+ #line 2315 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -2212,7 +2319,7 @@
PyObject *keys = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
PyObject *map;
- #line 1535 "Python/bytecodes.c"
+ #line 1557 "Python/bytecodes.c"
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -2222,14 +2329,14 @@
map = _PyDict_FromItems(
&PyTuple_GET_ITEM(keys, 0), 1,
values, 1, oparg);
- #line 2226 "Python/generated_cases.c.h"
+ #line 2333 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
- #line 1545 "Python/bytecodes.c"
+ #line 1567 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
- #line 2233 "Python/generated_cases.c.h"
+ #line 2340 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
stack_pointer[-1] = map;
DISPATCH();
@@ -2237,7 +2344,7 @@
TARGET(DICT_UPDATE) {
PyObject *update = stack_pointer[-1];
- #line 1549 "Python/bytecodes.c"
+ #line 1571 "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)) {
@@ -2245,12 +2352,12 @@
"'%.200s' object is not a mapping",
Py_TYPE(update)->tp_name);
}
- #line 2249 "Python/generated_cases.c.h"
+ #line 2356 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1557 "Python/bytecodes.c"
+ #line 1579 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2254 "Python/generated_cases.c.h"
+ #line 2361 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2258,17 +2365,17 @@
TARGET(DICT_MERGE) {
PyObject *update = stack_pointer[-1];
- #line 1563 "Python/bytecodes.c"
+ #line 1585 "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 2267 "Python/generated_cases.c.h"
+ #line 2374 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1568 "Python/bytecodes.c"
+ #line 1590 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2272 "Python/generated_cases.c.h"
+ #line 2379 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
PREDICT(CALL_FUNCTION_EX);
@@ -2278,26 +2385,26 @@
TARGET(MAP_ADD) {
PyObject *value = stack_pointer[-1];
PyObject *key = stack_pointer[-2];
- #line 1575 "Python/bytecodes.c"
+ #line 1597 "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 2288 "Python/generated_cases.c.h"
+ #line 2395 "Python/generated_cases.c.h"
STACK_SHRINK(2);
PREDICT(JUMP_BACKWARD);
DISPATCH();
}
TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) {
- #line 1584 "Python/bytecodes.c"
+ #line 1606 "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 2301 "Python/generated_cases.c.h"
+ #line 2408 "Python/generated_cases.c.h"
}
TARGET(LOAD_SUPER_ATTR) {
@@ -2308,7 +2415,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1598 "Python/bytecodes.c"
+ #line 1620 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2);
int load_method = oparg & 1;
#if ENABLE_SPECIALIZATION
@@ -2350,16 +2457,16 @@
}
}
}
- #line 2354 "Python/generated_cases.c.h"
+ #line 2461 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1640 "Python/bytecodes.c"
+ #line 1662 "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 2363 "Python/generated_cases.c.h"
+ #line 2470 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2374,20 +2481,20 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1647 "Python/bytecodes.c"
+ #line 1669 "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 2385 "Python/generated_cases.c.h"
+ #line 2492 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1654 "Python/bytecodes.c"
+ #line 1676 "Python/bytecodes.c"
if (res == NULL) goto pop_3_error;
- #line 2391 "Python/generated_cases.c.h"
+ #line 2498 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2402,7 +2509,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2;
PyObject *res;
- #line 1658 "Python/bytecodes.c"
+ #line 1680 "Python/bytecodes.c"
assert(oparg & 1);
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -2425,7 +2532,7 @@
res = res2;
res2 = NULL;
}
- #line 2429 "Python/generated_cases.c.h"
+ #line 2536 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
stack_pointer[-2] = res2;
@@ -2439,7 +2546,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *res2 = NULL;
PyObject *res;
- #line 1697 "Python/bytecodes.c"
+ #line 1719 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2473,9 +2580,9 @@
NULL | meth | arg1 | ... | argN
*/
- #line 2477 "Python/generated_cases.c.h"
+ #line 2584 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1731 "Python/bytecodes.c"
+ #line 1753 "Python/bytecodes.c"
if (meth == NULL) goto pop_1_error;
res2 = NULL;
res = meth;
@@ -2484,12 +2591,12 @@
else {
/* Classic, pushes one value. */
res = PyObject_GetAttr(owner, name);
- #line 2488 "Python/generated_cases.c.h"
+ #line 2595 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1740 "Python/bytecodes.c"
+ #line 1762 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
}
- #line 2493 "Python/generated_cases.c.h"
+ #line 2600 "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; }
@@ -2503,7 +2610,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1745 "Python/bytecodes.c"
+ #line 1767 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2516,7 +2623,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2520 "Python/generated_cases.c.h"
+ #line 2627 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2531,7 +2638,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1761 "Python/bytecodes.c"
+ #line 1783 "Python/bytecodes.c"
DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
assert(dict != NULL);
@@ -2544,7 +2651,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2548 "Python/generated_cases.c.h"
+ #line 2655 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2559,7 +2666,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1777 "Python/bytecodes.c"
+ #line 1799 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2586,7 +2693,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2590 "Python/generated_cases.c.h"
+ #line 2697 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2601,7 +2708,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1807 "Python/bytecodes.c"
+ #line 1829 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2611,7 +2718,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2615 "Python/generated_cases.c.h"
+ #line 2722 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2626,7 +2733,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 1820 "Python/bytecodes.c"
+ #line 1842 "Python/bytecodes.c"
DEOPT_IF(!PyType_Check(cls), LOAD_ATTR);
DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version,
@@ -2638,7 +2745,7 @@
res = descr;
assert(res != NULL);
Py_INCREF(res);
- #line 2642 "Python/generated_cases.c.h"
+ #line 2749 "Python/generated_cases.c.h"
Py_DECREF(cls);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2652,7 +2759,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 1835 "Python/bytecodes.c"
+ #line 1857 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
@@ -2676,7 +2783,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2680 "Python/generated_cases.c.h"
+ #line 2787 "Python/generated_cases.c.h"
}
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
@@ -2684,7 +2791,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 1861 "Python/bytecodes.c"
+ #line 1883 "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);
@@ -2710,7 +2817,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2714 "Python/generated_cases.c.h"
+ #line 2821 "Python/generated_cases.c.h"
}
TARGET(STORE_ATTR_INSTANCE_VALUE) {
@@ -2718,7 +2825,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 1889 "Python/bytecodes.c"
+ #line 1911 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2736,7 +2843,7 @@
Py_DECREF(old_value);
}
Py_DECREF(owner);
- #line 2740 "Python/generated_cases.c.h"
+ #line 2847 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2747,7 +2854,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 1909 "Python/bytecodes.c"
+ #line 1931 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2786,7 +2893,7 @@
/* PEP 509 */
dict->ma_version_tag = new_version;
Py_DECREF(owner);
- #line 2790 "Python/generated_cases.c.h"
+ #line 2897 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2797,7 +2904,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 1950 "Python/bytecodes.c"
+ #line 1972 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2807,7 +2914,7 @@
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
- #line 2811 "Python/generated_cases.c.h"
+ #line 2918 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2819,7 +2926,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 1969 "Python/bytecodes.c"
+ #line 1991 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2832,12 +2939,12 @@
#endif /* ENABLE_SPECIALIZATION */
assert((oparg >> 4) <= Py_GE);
res = PyObject_RichCompare(left, right, oparg>>4);
- #line 2836 "Python/generated_cases.c.h"
+ #line 2943 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 1982 "Python/bytecodes.c"
+ #line 2004 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2841 "Python/generated_cases.c.h"
+ #line 2948 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2848,7 +2955,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 1986 "Python/bytecodes.c"
+ #line 2008 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2859,7 +2966,7 @@
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2863 "Python/generated_cases.c.h"
+ #line 2970 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2870,7 +2977,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2000 "Python/bytecodes.c"
+ #line 2022 "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);
@@ -2885,7 +2992,7 @@
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2889 "Python/generated_cases.c.h"
+ #line 2996 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2896,7 +3003,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2018 "Python/bytecodes.c"
+ #line 2040 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2908,7 +3015,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 2912 "Python/generated_cases.c.h"
+ #line 3019 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2919,14 +3026,14 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2032 "Python/bytecodes.c"
+ #line 2054 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 2925 "Python/generated_cases.c.h"
+ #line 3032 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2034 "Python/bytecodes.c"
+ #line 2056 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 2930 "Python/generated_cases.c.h"
+ #line 3037 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2936,15 +3043,15 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2038 "Python/bytecodes.c"
+ #line 2060 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 2942 "Python/generated_cases.c.h"
+ #line 3049 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2040 "Python/bytecodes.c"
+ #line 2062 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
- #line 2948 "Python/generated_cases.c.h"
+ #line 3055 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2955,12 +3062,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2045 "Python/bytecodes.c"
+ #line 2067 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 2961 "Python/generated_cases.c.h"
+ #line 3068 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2047 "Python/bytecodes.c"
+ #line 2069 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -2968,10 +3075,10 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 2972 "Python/generated_cases.c.h"
+ #line 3079 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2055 "Python/bytecodes.c"
+ #line 2077 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -2980,7 +3087,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 2984 "Python/generated_cases.c.h"
+ #line 3091 "Python/generated_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
DISPATCH();
@@ -2990,21 +3097,21 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2066 "Python/bytecodes.c"
+ #line 2088 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 2997 "Python/generated_cases.c.h"
+ #line 3104 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2069 "Python/bytecodes.c"
+ #line 2091 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 3004 "Python/generated_cases.c.h"
+ #line 3111 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2074 "Python/bytecodes.c"
+ #line 2096 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 3008 "Python/generated_cases.c.h"
+ #line 3115 "Python/generated_cases.c.h"
stack_pointer[-1] = b;
DISPATCH();
}
@@ -3013,15 +3120,15 @@
PyObject *fromlist = stack_pointer[-1];
PyObject *level = stack_pointer[-2];
PyObject *res;
- #line 2078 "Python/bytecodes.c"
+ #line 2100 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_name(tstate, frame, name, fromlist, level);
- #line 3020 "Python/generated_cases.c.h"
+ #line 3127 "Python/generated_cases.c.h"
Py_DECREF(level);
Py_DECREF(fromlist);
- #line 2081 "Python/bytecodes.c"
+ #line 2103 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 3025 "Python/generated_cases.c.h"
+ #line 3132 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3030,29 +3137,29 @@
TARGET(IMPORT_FROM) {
PyObject *from = stack_pointer[-1];
PyObject *res;
- #line 2085 "Python/bytecodes.c"
+ #line 2107 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- #line 3038 "Python/generated_cases.c.h"
+ #line 3145 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
}
TARGET(JUMP_FORWARD) {
- #line 2091 "Python/bytecodes.c"
+ #line 2113 "Python/bytecodes.c"
JUMPBY(oparg);
- #line 3047 "Python/generated_cases.c.h"
+ #line 3154 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(JUMP_BACKWARD) {
PREDICTED(JUMP_BACKWARD);
- #line 2095 "Python/bytecodes.c"
+ #line 2117 "Python/bytecodes.c"
assert(oparg < INSTR_OFFSET());
JUMPBY(-oparg);
- #line 3056 "Python/generated_cases.c.h"
+ #line 3163 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
@@ -3060,15 +3167,15 @@
TARGET(POP_JUMP_IF_FALSE) {
PREDICTED(POP_JUMP_IF_FALSE);
PyObject *cond = stack_pointer[-1];
- #line 2101 "Python/bytecodes.c"
+ #line 2123 "Python/bytecodes.c"
if (Py_IsFalse(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsTrue(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3070 "Python/generated_cases.c.h"
+ #line 3177 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2107 "Python/bytecodes.c"
+ #line 2129 "Python/bytecodes.c"
if (err == 0) {
JUMPBY(oparg);
}
@@ -3076,22 +3183,22 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3080 "Python/generated_cases.c.h"
+ #line 3187 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_TRUE) {
PyObject *cond = stack_pointer[-1];
- #line 2117 "Python/bytecodes.c"
+ #line 2139 "Python/bytecodes.c"
if (Py_IsTrue(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsFalse(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3093 "Python/generated_cases.c.h"
+ #line 3200 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2123 "Python/bytecodes.c"
+ #line 2145 "Python/bytecodes.c"
if (err > 0) {
JUMPBY(oparg);
}
@@ -3099,63 +3206,63 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3103 "Python/generated_cases.c.h"
+ #line 3210 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NOT_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2133 "Python/bytecodes.c"
+ #line 2155 "Python/bytecodes.c"
if (!Py_IsNone(value)) {
- #line 3112 "Python/generated_cases.c.h"
+ #line 3219 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2135 "Python/bytecodes.c"
+ #line 2157 "Python/bytecodes.c"
JUMPBY(oparg);
}
- #line 3117 "Python/generated_cases.c.h"
+ #line 3224 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2140 "Python/bytecodes.c"
+ #line 2162 "Python/bytecodes.c"
if (Py_IsNone(value)) {
JUMPBY(oparg);
}
else {
- #line 3129 "Python/generated_cases.c.h"
+ #line 3236 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2145 "Python/bytecodes.c"
+ #line 2167 "Python/bytecodes.c"
}
- #line 3133 "Python/generated_cases.c.h"
+ #line 3240 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
- #line 2149 "Python/bytecodes.c"
+ #line 2171 "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 3146 "Python/generated_cases.c.h"
+ #line 3253 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(GET_LEN) {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2158 "Python/bytecodes.c"
+ #line 2180 "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 3159 "Python/generated_cases.c.h"
+ #line 3266 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3166,16 +3273,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2166 "Python/bytecodes.c"
+ #line 2188 "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 3175 "Python/generated_cases.c.h"
+ #line 3282 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2171 "Python/bytecodes.c"
+ #line 2193 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -3183,7 +3290,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 3187 "Python/generated_cases.c.h"
+ #line 3294 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3192,10 +3299,10 @@
TARGET(MATCH_MAPPING) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2181 "Python/bytecodes.c"
+ #line 2203 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 3199 "Python/generated_cases.c.h"
+ #line 3306 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3205,10 +3312,10 @@
TARGET(MATCH_SEQUENCE) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2187 "Python/bytecodes.c"
+ #line 2209 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 3212 "Python/generated_cases.c.h"
+ #line 3319 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3219,11 +3326,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2193 "Python/bytecodes.c"
+ #line 2215 "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 3227 "Python/generated_cases.c.h"
+ #line 3334 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3232,14 +3339,14 @@
TARGET(GET_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2199 "Python/bytecodes.c"
+ #line 2221 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3239 "Python/generated_cases.c.h"
+ #line 3346 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2202 "Python/bytecodes.c"
+ #line 2224 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3243 "Python/generated_cases.c.h"
+ #line 3350 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3247,7 +3354,7 @@
TARGET(GET_YIELD_FROM_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2206 "Python/bytecodes.c"
+ #line 2228 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -3270,11 +3377,11 @@
if (iter == NULL) {
goto error;
}
- #line 3274 "Python/generated_cases.c.h"
+ #line 3381 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2229 "Python/bytecodes.c"
+ #line 2251 "Python/bytecodes.c"
}
- #line 3278 "Python/generated_cases.c.h"
+ #line 3385 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
PREDICT(LOAD_CONST);
DISPATCH();
@@ -3285,7 +3392,7 @@
static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2248 "Python/bytecodes.c"
+ #line 2270 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3316,7 +3423,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3320 "Python/generated_cases.c.h"
+ #line 3427 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3324,7 +3431,7 @@
}
TARGET(INSTRUMENTED_FOR_ITER) {
- #line 2281 "Python/bytecodes.c"
+ #line 2303 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr-1;
_Py_CODEUNIT *target;
PyObject *iter = TOP();
@@ -3350,14 +3457,14 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3354 "Python/generated_cases.c.h"
+ #line 3461 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(FOR_ITER_LIST) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2309 "Python/bytecodes.c"
+ #line 2331 "Python/bytecodes.c"
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
_PyListIterObject *it = (_PyListIterObject *)iter;
STAT_INC(FOR_ITER, hit);
@@ -3377,7 +3484,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3381 "Python/generated_cases.c.h"
+ #line 3488 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3387,7 +3494,7 @@
TARGET(FOR_ITER_TUPLE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2331 "Python/bytecodes.c"
+ #line 2353 "Python/bytecodes.c"
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3407,7 +3514,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3411 "Python/generated_cases.c.h"
+ #line 3518 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3417,7 +3524,7 @@
TARGET(FOR_ITER_RANGE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2353 "Python/bytecodes.c"
+ #line 2375 "Python/bytecodes.c"
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3435,7 +3542,7 @@
if (next == NULL) {
goto error;
}
- #line 3439 "Python/generated_cases.c.h"
+ #line 3546 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3444,7 +3551,7 @@
TARGET(FOR_ITER_GEN) {
PyObject *iter = stack_pointer[-1];
- #line 2373 "Python/bytecodes.c"
+ #line 2395 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3460,14 +3567,14 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3464 "Python/generated_cases.c.h"
+ #line 3571 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2391 "Python/bytecodes.c"
+ #line 2413 "Python/bytecodes.c"
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
@@ -3490,16 +3597,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3494 "Python/generated_cases.c.h"
+ #line 3601 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2414 "Python/bytecodes.c"
+ #line 2436 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3503 "Python/generated_cases.c.h"
+ #line 3610 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3511,7 +3618,7 @@
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2424 "Python/bytecodes.c"
+ #line 2446 "Python/bytecodes.c"
/* pop the context manager, push its __exit__ and the
* value returned from calling its __enter__
*/
@@ -3537,16 +3644,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3541 "Python/generated_cases.c.h"
+ #line 3648 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2450 "Python/bytecodes.c"
+ #line 2472 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3550 "Python/generated_cases.c.h"
+ #line 3657 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3558,7 +3665,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2459 "Python/bytecodes.c"
+ #line 2481 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -3579,7 +3686,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3583 "Python/generated_cases.c.h"
+ #line 3690 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3588,7 +3695,7 @@
TARGET(PUSH_EXC_INFO) {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2482 "Python/bytecodes.c"
+ #line 2504 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -3598,7 +3705,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3602 "Python/generated_cases.c.h"
+ #line 3709 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3612,7 +3719,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 2494 "Python/bytecodes.c"
+ #line 2516 "Python/bytecodes.c"
/* Cached method object */
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3629,7 +3736,7 @@
assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
assert(oparg & 1);
- #line 3633 "Python/generated_cases.c.h"
+ #line 3740 "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; }
@@ -3643,7 +3750,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2513 "Python/bytecodes.c"
+ #line 2535 "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);
@@ -3653,7 +3760,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3657 "Python/generated_cases.c.h"
+ #line 3764 "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; }
@@ -3667,7 +3774,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2525 "Python/bytecodes.c"
+ #line 2547 "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;
@@ -3681,7 +3788,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3685 "Python/generated_cases.c.h"
+ #line 3792 "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; }
@@ -3690,16 +3797,16 @@
}
TARGET(KW_NAMES) {
- #line 2541 "Python/bytecodes.c"
+ #line 2563 "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 3698 "Python/generated_cases.c.h"
+ #line 3805 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_CALL) {
- #line 2547 "Python/bytecodes.c"
+ #line 2569 "Python/bytecodes.c"
int is_meth = PEEK(oparg+2) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -3712,7 +3819,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3716 "Python/generated_cases.c.h"
+ #line 3823 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3722,7 +3829,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2592 "Python/bytecodes.c"
+ #line 2614 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3804,7 +3911,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3808 "Python/generated_cases.c.h"
+ #line 3915 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3816,7 +3923,7 @@
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2680 "Python/bytecodes.c"
+ #line 2702 "Python/bytecodes.c"
DEOPT_IF(method != NULL, CALL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
STAT_INC(CALL, hit);
@@ -3826,7 +3933,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 3830 "Python/generated_cases.c.h"
+ #line 3937 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -3835,7 +3942,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2692 "Python/bytecodes.c"
+ #line 2714 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3861,7 +3968,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3865 "Python/generated_cases.c.h"
+ #line 3972 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -3869,7 +3976,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2720 "Python/bytecodes.c"
+ #line 2742 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3905,7 +4012,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3909 "Python/generated_cases.c.h"
+ #line 4016 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -3913,7 +4020,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2758 "Python/bytecodes.c"
+ #line 2780 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3923,7 +4030,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 3927 "Python/generated_cases.c.h"
+ #line 4034 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3936,7 +4043,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2770 "Python/bytecodes.c"
+ #line 2792 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3947,7 +4054,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3951 "Python/generated_cases.c.h"
+ #line 4058 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3961,7 +4068,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2784 "Python/bytecodes.c"
+ #line 2806 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3972,7 +4079,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3976 "Python/generated_cases.c.h"
+ #line 4083 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3986,7 +4093,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2798 "Python/bytecodes.c"
+ #line 2820 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4008,7 +4115,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4012 "Python/generated_cases.c.h"
+ #line 4119 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4022,7 +4129,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2823 "Python/bytecodes.c"
+ #line 2845 "Python/bytecodes.c"
/* Builtin METH_O functions */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4050,7 +4157,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4054 "Python/generated_cases.c.h"
+ #line 4161 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4064,7 +4171,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2854 "Python/bytecodes.c"
+ #line 2876 "Python/bytecodes.c"
/* Builtin METH_FASTCALL functions, without keywords */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4096,7 +4203,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 4100 "Python/generated_cases.c.h"
+ #line 4207 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4110,7 +4217,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2889 "Python/bytecodes.c"
+ #line 2911 "Python/bytecodes.c"
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
int is_meth = method != NULL;
int total_args = oparg;
@@ -4142,7 +4249,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4146 "Python/generated_cases.c.h"
+ #line 4253 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4156,7 +4263,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2924 "Python/bytecodes.c"
+ #line 2946 "Python/bytecodes.c"
assert(kwnames == NULL);
/* len(o) */
int is_meth = method != NULL;
@@ -4181,7 +4288,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4185 "Python/generated_cases.c.h"
+ #line 4292 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4194,7 +4301,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2951 "Python/bytecodes.c"
+ #line 2973 "Python/bytecodes.c"
assert(kwnames == NULL);
/* isinstance(o, o2) */
int is_meth = method != NULL;
@@ -4221,7 +4328,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4225 "Python/generated_cases.c.h"
+ #line 4332 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4233,7 +4340,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *self = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2981 "Python/bytecodes.c"
+ #line 3003 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
assert(method != NULL);
@@ -4251,14 +4358,14 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4255 "Python/generated_cases.c.h"
+ #line 4362 "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 3001 "Python/bytecodes.c"
+ #line 3023 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4289,7 +4396,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4293 "Python/generated_cases.c.h"
+ #line 4400 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4302,7 +4409,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3035 "Python/bytecodes.c"
+ #line 3057 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4331,7 +4438,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4335 "Python/generated_cases.c.h"
+ #line 4442 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4344,7 +4451,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3067 "Python/bytecodes.c"
+ #line 3089 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 0 || oparg == 1);
int is_meth = method != NULL;
@@ -4373,7 +4480,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4377 "Python/generated_cases.c.h"
+ #line 4484 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4386,7 +4493,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3099 "Python/bytecodes.c"
+ #line 3121 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4414,7 +4521,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4418 "Python/generated_cases.c.h"
+ #line 4525 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4424,9 +4531,9 @@
}
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
- #line 3130 "Python/bytecodes.c"
+ #line 3152 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4430 "Python/generated_cases.c.h"
+ #line 4537 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4435,7 +4542,7 @@
PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
PyObject *result;
- #line 3134 "Python/bytecodes.c"
+ #line 3156 "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));
@@ -4497,14 +4604,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4501 "Python/generated_cases.c.h"
+ #line 4608 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
- #line 3196 "Python/bytecodes.c"
+ #line 3218 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- #line 4508 "Python/generated_cases.c.h"
+ #line 4615 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4519,7 +4626,7 @@
PyObject *kwdefaults = (oparg & 0x02) ? stack_pointer[-(1 + ((oparg & 0x08) ? 1 : 0) + ((oparg & 0x04) ? 1 : 0) + ((oparg & 0x02) ? 1 : 0))] : NULL;
PyObject *defaults = (oparg & 0x01) ? stack_pointer[-(1 + ((oparg & 0x08) ? 1 : 0) + ((oparg & 0x04) ? 1 : 0) + ((oparg & 0x02) ? 1 : 0) + ((oparg & 0x01) ? 1 : 0))] : NULL;
PyObject *func;
- #line 3206 "Python/bytecodes.c"
+ #line 3228 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -4548,14 +4655,14 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4552 "Python/generated_cases.c.h"
+ #line 4659 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 0x01) ? 1 : 0) + ((oparg & 0x02) ? 1 : 0) + ((oparg & 0x04) ? 1 : 0) + ((oparg & 0x08) ? 1 : 0));
stack_pointer[-1] = func;
DISPATCH();
}
TARGET(RETURN_GENERATOR) {
- #line 3237 "Python/bytecodes.c"
+ #line 3259 "Python/bytecodes.c"
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4576,7 +4683,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4580 "Python/generated_cases.c.h"
+ #line 4687 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4584,15 +4691,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3260 "Python/bytecodes.c"
+ #line 3282 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4590 "Python/generated_cases.c.h"
+ #line 4697 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3262 "Python/bytecodes.c"
+ #line 3284 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 4596 "Python/generated_cases.c.h"
+ #line 4703 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4603,7 +4710,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 3266 "Python/bytecodes.c"
+ #line 3288 "Python/bytecodes.c"
/* Handles f-string value formatting. */
PyObject *(*conv_fn)(PyObject *);
int which_conversion = oparg & FVC_MASK;
@@ -4638,7 +4745,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 4642 "Python/generated_cases.c.h"
+ #line 4749 "Python/generated_cases.c.h"
STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0));
stack_pointer[-1] = result;
DISPATCH();
@@ -4647,10 +4754,10 @@
TARGET(COPY) {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3303 "Python/bytecodes.c"
+ #line 3325 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4654 "Python/generated_cases.c.h"
+ #line 4761 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4662,7 +4769,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3308 "Python/bytecodes.c"
+ #line 3330 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4677,12 +4784,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4681 "Python/generated_cases.c.h"
+ #line 4788 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3323 "Python/bytecodes.c"
+ #line 3345 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4686 "Python/generated_cases.c.h"
+ #line 4793 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4692,16 +4799,16 @@
TARGET(SWAP) {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3328 "Python/bytecodes.c"
+ #line 3350 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4698 "Python/generated_cases.c.h"
+ #line 4805 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
}
TARGET(INSTRUMENTED_INSTRUCTION) {
- #line 3332 "Python/bytecodes.c"
+ #line 3354 "Python/bytecodes.c"
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, next_instr-1);
if (next_opcode < 0) goto error;
@@ -4713,26 +4820,26 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 4717 "Python/generated_cases.c.h"
+ #line 4824 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
- #line 3346 "Python/bytecodes.c"
+ #line 3368 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
- #line 4723 "Python/generated_cases.c.h"
+ #line 4830 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
- #line 3350 "Python/bytecodes.c"
+ #line 3372 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr-oparg, PY_MONITORING_EVENT_JUMP);
- #line 4730 "Python/generated_cases.c.h"
+ #line 4837 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
- #line 3355 "Python/bytecodes.c"
+ #line 3377 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4741,12 +4848,12 @@
assert(err == 0 || err == 1);
int offset = err*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4745 "Python/generated_cases.c.h"
+ #line 4852 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
- #line 3366 "Python/bytecodes.c"
+ #line 3388 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4755,12 +4862,12 @@
assert(err == 0 || err == 1);
int offset = (1-err)*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4759 "Python/generated_cases.c.h"
+ #line 4866 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
- #line 3377 "Python/bytecodes.c"
+ #line 3399 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4772,12 +4879,12 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4776 "Python/generated_cases.c.h"
+ #line 4883 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
- #line 3391 "Python/bytecodes.c"
+ #line 3413 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4789,30 +4896,30 @@
offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4793 "Python/generated_cases.c.h"
+ #line 4900 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(EXTENDED_ARG) {
- #line 3405 "Python/bytecodes.c"
+ #line 3427 "Python/bytecodes.c"
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 4804 "Python/generated_cases.c.h"
+ #line 4911 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
- #line 3413 "Python/bytecodes.c"
+ #line 3435 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 4811 "Python/generated_cases.c.h"
+ #line 4918 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
- #line 3418 "Python/bytecodes.c"
+ #line 3440 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 4818 "Python/generated_cases.c.h"
+ #line 4925 "Python/generated_cases.c.h"
}
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index 53fbaa3e317e..75c7dc1218f9 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -42,7 +42,7 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
case PUSH_NULL:
return 0;
case END_FOR:
- return 1+1;
+ return 2;
case INSTRUMENTED_END_FOR:
return 2;
case END_SEND:
@@ -57,20 +57,20 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
return 1;
case BINARY_OP_MULTIPLY_INT:
return 2;
- case BINARY_OP_MULTIPLY_FLOAT:
+ case BINARY_OP_ADD_INT:
return 2;
case BINARY_OP_SUBTRACT_INT:
return 2;
+ case BINARY_OP_MULTIPLY_FLOAT:
+ return 2;
+ case BINARY_OP_ADD_FLOAT:
+ return 2;
case BINARY_OP_SUBTRACT_FLOAT:
return 2;
case BINARY_OP_ADD_UNICODE:
return 2;
case BINARY_OP_INPLACE_ADD_UNICODE:
return 2;
- case BINARY_OP_ADD_FLOAT:
- return 2;
- case BINARY_OP_ADD_INT:
- return 2;
case BINARY_SUBSCR:
return 2;
case BINARY_SLICE:
@@ -164,7 +164,7 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
case LOAD_LOCALS:
return 0;
case LOAD_NAME:
- return 0+1;
+ return 0;
case LOAD_FROM_DICT_OR_GLOBALS:
return 1;
case LOAD_GLOBAL:
@@ -438,7 +438,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
case PUSH_NULL:
return 1;
case END_FOR:
- return 0+0;
+ return 0;
case INSTRUMENTED_END_FOR:
return 0;
case END_SEND:
@@ -453,20 +453,20 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
return 1;
case BINARY_OP_MULTIPLY_INT:
return 1;
- case BINARY_OP_MULTIPLY_FLOAT:
+ case BINARY_OP_ADD_INT:
return 1;
case BINARY_OP_SUBTRACT_INT:
return 1;
+ case BINARY_OP_MULTIPLY_FLOAT:
+ return 1;
+ case BINARY_OP_ADD_FLOAT:
+ return 1;
case BINARY_OP_SUBTRACT_FLOAT:
return 1;
case BINARY_OP_ADD_UNICODE:
return 1;
case BINARY_OP_INPLACE_ADD_UNICODE:
return 0;
- case BINARY_OP_ADD_FLOAT:
- return 1;
- case BINARY_OP_ADD_INT:
- return 1;
case BINARY_SUBSCR:
return 1;
case BINARY_SLICE:
@@ -560,7 +560,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
case LOAD_LOCALS:
return 1;
case LOAD_NAME:
- return 1+1;
+ return 1;
case LOAD_FROM_DICT_OR_GLOBALS:
return 1;
case LOAD_GLOBAL:
@@ -828,14 +828,14 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
[UNARY_NEGATIVE] = { true, INSTR_FMT_IX },
[UNARY_NOT] = { true, INSTR_FMT_IX },
[UNARY_INVERT] = { true, INSTR_FMT_IX },
- [BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IXC },
- [BINARY_OP_MULTIPLY_FLOAT] = { true, INSTR_FMT_IXC },
- [BINARY_OP_SUBTRACT_INT] = { true, INSTR_FMT_IXC },
- [BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IXC },
- [BINARY_OP_ADD_UNICODE] = { true, INSTR_FMT_IXC },
- [BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IX },
- [BINARY_OP_ADD_FLOAT] = { true, INSTR_FMT_IXC },
- [BINARY_OP_ADD_INT] = { true, INSTR_FMT_IXC },
+ [BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IBC },
+ [BINARY_OP_ADD_INT] = { true, INSTR_FMT_IBC },
+ [BINARY_OP_SUBTRACT_INT] = { true, INSTR_FMT_IBC },
+ [BINARY_OP_MULTIPLY_FLOAT] = { true, INSTR_FMT_IBC },
+ [BINARY_OP_ADD_FLOAT] = { true, INSTR_FMT_IBC },
+ [BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IBC },
+ [BINARY_OP_ADD_UNICODE] = { true, INSTR_FMT_IBC },
+ [BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IB },
[BINARY_SUBSCR] = { true, INSTR_FMT_IXC },
[BINARY_SLICE] = { true, INSTR_FMT_IX },
[STORE_SLICE] = { true, INSTR_FMT_IX },
diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
index 62ddeac0265a..22184d5051e7 100644
--- a/Tools/cases_generator/generate_cases.py
+++ b/Tools/cases_generator/generate_cases.py
@@ -489,6 +489,7 @@ class MacroInstruction(SuperOrMacroInstruction):
macro: parser.Macro
parts: list[Component | parser.CacheEffect]
+ predicted: bool = False
@dataclasses.dataclass
@@ -633,8 +634,8 @@ def analyze(self) -> None:
Raises SystemExit if there is an error.
"""
- self.find_predictions()
self.analyze_supers_and_macros()
+ self.find_predictions()
self.map_families()
self.check_families()
@@ -648,6 +649,8 @@ def find_predictions(self) -> None:
for target in targets:
if target_instr := self.instrs.get(target):
target_instr.predicted = True
+ elif target_macro := self.macro_instrs.get(target):
+ target_macro.predicted = True
else:
self.error(
f"Unknown instruction {target!r} predicted in {instr.name!r}",
@@ -896,6 +899,7 @@ def effect_str(effects: list[StackEffect]) -> str:
pushed = ""
case parser.Super():
instr = self.super_instrs[thing.name]
+ # TODO: Same as for Macro below, if needed.
popped = "+".join(
effect_str(comp.instr.input_effects) for comp in instr.parts
)
@@ -905,12 +909,30 @@ def effect_str(effects: list[StackEffect]) -> str:
case parser.Macro():
instr = self.macro_instrs[thing.name]
parts = [comp for comp in instr.parts if isinstance(comp, Component)]
- popped = "+".join(
- effect_str(comp.instr.input_effects) for comp in parts
- )
- pushed = "+".join(
- effect_str(comp.instr.output_effects) for comp in parts
- )
+ # Note: stack_analysis() already verifies that macro components
+ # have no variable-sized stack effects.
+ low = 0
+ sp = 0
+ high = 0
+ for comp in parts:
+ for effect in comp.instr.input_effects:
+ assert not effect.cond, effect
+ assert not effect.size, effect
+ sp -= 1
+ low = min(low, sp)
+ for effect in comp.instr.output_effects:
+ assert not effect.cond, effect
+ assert not effect.size, effect
+ sp += 1
+ high = max(sp, high)
+ if high != max(0, sp):
+ # If you get this, intermediate stack growth occurs,
+ # and stack size calculations may go awry.
+ # E.g. [push, pop]. The fix would be for stack size
+ # calculations to use the micro ops.
+ self.error("Macro has virtual stack growth", thing)
+ popped = str(-low)
+ pushed = str(sp - low)
case _:
typing.assert_never(thing)
return instr, popped, pushed
@@ -1152,6 +1174,9 @@ def wrap_super_or_macro(self, up: SuperOrMacroInstruction):
# outer block, rather than trusting the compiler to optimize it.
self.out.emit("")
with self.out.block(f"TARGET({up.name})"):
+ match up:
+ case MacroInstruction(predicted=True, name=name):
+ self.out.emit(f"PREDICTED({name});")
for i, var in reversed(list(enumerate(up.stack))):
src = None
if i < up.initial_sp:
More information about the Python-checkins
mailing list