[Python-checkins] gh-87849: fix SEND specialization family definition (GH-104268)
markshannon
webhook-mailer at python.org
Thu May 11 07:52:14 EDT 2023
https://github.com/python/cpython/commit/167072938342981b96d06d739cd97185207b64dd
commit: 167072938342981b96d06d739cd97185207b64dd
branch: main
author: Carl Meyer <carl at oddbird.net>
committer: markshannon <mark at hotpy.org>
date: 2023-05-11T12:52:06+01:00
summary:
gh-87849: fix SEND specialization family definition (GH-104268)
files:
M Python/bytecodes.c
M Python/generated_cases.c.h
M Python/opcode_metadata.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 82c100444183..1c09dc6be3d6 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -813,7 +813,7 @@ dummy_func(
PREDICT(LOAD_CONST);
}
- family(for_iter, INLINE_CACHE_ENTRIES_FOR_ITER) = {
+ family(send, INLINE_CACHE_ENTRIES_SEND) = {
SEND,
SEND_GEN,
};
@@ -866,7 +866,7 @@ dummy_func(
Py_DECREF(v);
}
- inst(SEND_GEN, (unused/1, receiver, v -- receiver)) {
+ inst(SEND_GEN, (unused/1, receiver, v -- receiver, unused)) {
PyGenObject *gen = (PyGenObject *)receiver;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type &&
Py_TYPE(gen) != &PyCoro_Type, SEND);
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 819c857c3c01..a86b895dd43d 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -1139,6 +1139,7 @@
TARGET(SEND) {
PREDICTED(SEND);
+ static_assert(INLINE_CACHE_ENTRIES_SEND == 1, "incorrect cache size");
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
PyObject *retval;
@@ -1188,7 +1189,7 @@
}
}
Py_DECREF(v);
- #line 1192 "Python/generated_cases.c.h"
+ #line 1193 "Python/generated_cases.c.h"
stack_pointer[-1] = retval;
next_instr += 1;
DISPATCH();
@@ -1212,7 +1213,7 @@
tstate->exc_info = &gen->gi_exc_state;
JUMPBY(INLINE_CACHE_ENTRIES_SEND);
DISPATCH_INLINED(gen_frame);
- #line 1216 "Python/generated_cases.c.h"
+ #line 1217 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_YIELD_VALUE) {
@@ -1234,7 +1235,7 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1238 "Python/generated_cases.c.h"
+ #line 1239 "Python/generated_cases.c.h"
}
TARGET(YIELD_VALUE) {
@@ -1255,7 +1256,7 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1259 "Python/generated_cases.c.h"
+ #line 1260 "Python/generated_cases.c.h"
}
TARGET(POP_EXCEPT) {
@@ -1263,7 +1264,7 @@
#line 924 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
Py_XSETREF(exc_info->exc_value, exc_value);
- #line 1267 "Python/generated_cases.c.h"
+ #line 1268 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1289,7 +1290,7 @@
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
- #line 1293 "Python/generated_cases.c.h"
+ #line 1294 "Python/generated_cases.c.h"
}
TARGET(END_ASYNC_FOR) {
@@ -1298,7 +1299,7 @@
#line 949 "Python/bytecodes.c"
assert(exc && PyExceptionInstance_Check(exc));
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
- #line 1302 "Python/generated_cases.c.h"
+ #line 1303 "Python/generated_cases.c.h"
Py_DECREF(awaitable);
Py_DECREF(exc);
#line 952 "Python/bytecodes.c"
@@ -1308,7 +1309,7 @@
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
}
- #line 1312 "Python/generated_cases.c.h"
+ #line 1313 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -1324,7 +1325,7 @@
assert(exc_value && PyExceptionInstance_Check(exc_value));
if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) {
value = Py_NewRef(((PyStopIterationObject *)exc_value)->value);
- #line 1328 "Python/generated_cases.c.h"
+ #line 1329 "Python/generated_cases.c.h"
Py_DECREF(sub_iter);
Py_DECREF(last_sent_val);
Py_DECREF(exc_value);
@@ -1335,7 +1336,7 @@
_PyErr_SetRaisedException(tstate, Py_NewRef(exc_value));
goto exception_unwind;
}
- #line 1339 "Python/generated_cases.c.h"
+ #line 1340 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
stack_pointer[-2] = none;
@@ -1346,7 +1347,7 @@
PyObject *value;
#line 975 "Python/bytecodes.c"
value = Py_NewRef(PyExc_AssertionError);
- #line 1350 "Python/generated_cases.c.h"
+ #line 1351 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -1376,7 +1377,7 @@
if (true) goto error;
}
}
- #line 1380 "Python/generated_cases.c.h"
+ #line 1381 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = bc;
DISPATCH();
@@ -1391,7 +1392,7 @@
if (ns == NULL) {
_PyErr_Format(tstate, PyExc_SystemError,
"no locals found when storing %R", name);
- #line 1395 "Python/generated_cases.c.h"
+ #line 1396 "Python/generated_cases.c.h"
Py_DECREF(v);
#line 1010 "Python/bytecodes.c"
if (true) goto pop_1_error;
@@ -1400,11 +1401,11 @@
err = PyDict_SetItem(ns, name, v);
else
err = PyObject_SetItem(ns, name, v);
- #line 1404 "Python/generated_cases.c.h"
+ #line 1405 "Python/generated_cases.c.h"
Py_DECREF(v);
#line 1017 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1408 "Python/generated_cases.c.h"
+ #line 1409 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1427,7 +1428,7 @@
name);
goto error;
}
- #line 1431 "Python/generated_cases.c.h"
+ #line 1432 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1448,11 +1449,11 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject **top = stack_pointer + oparg - 1;
int res = unpack_iterable(tstate, seq, oparg, -1, top);
- #line 1452 "Python/generated_cases.c.h"
+ #line 1453 "Python/generated_cases.c.h"
Py_DECREF(seq);
#line 1060 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1456 "Python/generated_cases.c.h"
+ #line 1457 "Python/generated_cases.c.h"
STACK_SHRINK(1);
STACK_GROW(oparg);
next_instr += 1;
@@ -1469,7 +1470,7 @@
STAT_INC(UNPACK_SEQUENCE, hit);
values[0] = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
values[1] = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
- #line 1473 "Python/generated_cases.c.h"
+ #line 1474 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1488,7 +1489,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1492 "Python/generated_cases.c.h"
+ #line 1493 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1507,7 +1508,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1511 "Python/generated_cases.c.h"
+ #line 1512 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1521,11 +1522,11 @@
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 1525 "Python/generated_cases.c.h"
+ #line 1526 "Python/generated_cases.c.h"
Py_DECREF(seq);
#line 1100 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1529 "Python/generated_cases.c.h"
+ #line 1530 "Python/generated_cases.c.h"
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
DISPATCH();
}
@@ -1552,12 +1553,12 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyObject_SetAttr(owner, name, v);
- #line 1556 "Python/generated_cases.c.h"
+ #line 1557 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(owner);
#line 1127 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 1561 "Python/generated_cases.c.h"
+ #line 1562 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -1568,11 +1569,11 @@
#line 1131 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
- #line 1572 "Python/generated_cases.c.h"
+ #line 1573 "Python/generated_cases.c.h"
Py_DECREF(owner);
#line 1134 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1576 "Python/generated_cases.c.h"
+ #line 1577 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1582,11 +1583,11 @@
#line 1138 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
- #line 1586 "Python/generated_cases.c.h"
+ #line 1587 "Python/generated_cases.c.h"
Py_DECREF(v);
#line 1141 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1590 "Python/generated_cases.c.h"
+ #line 1591 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1604,7 +1605,7 @@
}
goto error;
}
- #line 1608 "Python/generated_cases.c.h"
+ #line 1609 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1669,7 +1670,7 @@
}
}
}
- #line 1673 "Python/generated_cases.c.h"
+ #line 1674 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = v;
DISPATCH();
@@ -1732,7 +1733,7 @@
}
}
null = NULL;
- #line 1736 "Python/generated_cases.c.h"
+ #line 1737 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = v;
@@ -1757,7 +1758,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1761 "Python/generated_cases.c.h"
+ #line 1762 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1787,7 +1788,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1791 "Python/generated_cases.c.h"
+ #line 1792 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1801,7 +1802,7 @@
PyObject *v = GETLOCAL(oparg);
if (v == NULL) goto unbound_local_error;
SETLOCAL(oparg, NULL);
- #line 1805 "Python/generated_cases.c.h"
+ #line 1806 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1815,7 +1816,7 @@
goto resume_with_error;
}
SETLOCAL(oparg, cell);
- #line 1819 "Python/generated_cases.c.h"
+ #line 1820 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1831,7 +1832,7 @@
}
PyCell_SET(cell, NULL);
Py_DECREF(oldobj);
- #line 1835 "Python/generated_cases.c.h"
+ #line 1836 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1869,7 +1870,7 @@
}
Py_INCREF(value);
}
- #line 1873 "Python/generated_cases.c.h"
+ #line 1874 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -1885,7 +1886,7 @@
if (true) goto error;
}
Py_INCREF(value);
- #line 1889 "Python/generated_cases.c.h"
+ #line 1890 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -1898,7 +1899,7 @@
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
Py_XDECREF(oldobj);
- #line 1902 "Python/generated_cases.c.h"
+ #line 1903 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1915,7 +1916,7 @@
PyObject *o = PyTuple_GET_ITEM(closure, i);
frame->localsplus[offset + i] = Py_NewRef(o);
}
- #line 1919 "Python/generated_cases.c.h"
+ #line 1920 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1924,13 +1925,13 @@
PyObject *str;
#line 1404 "Python/bytecodes.c"
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
- #line 1928 "Python/generated_cases.c.h"
+ #line 1929 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
#line 1406 "Python/bytecodes.c"
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 1934 "Python/generated_cases.c.h"
+ #line 1935 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = str;
@@ -1943,7 +1944,7 @@
#line 1410 "Python/bytecodes.c"
tup = _PyTuple_FromArraySteal(values, oparg);
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 1947 "Python/generated_cases.c.h"
+ #line 1948 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = tup;
@@ -1956,7 +1957,7 @@
#line 1415 "Python/bytecodes.c"
list = _PyList_FromArraySteal(values, oparg);
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 1960 "Python/generated_cases.c.h"
+ #line 1961 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = list;
@@ -1977,13 +1978,13 @@
"Value after * must be an iterable, not %.200s",
Py_TYPE(iterable)->tp_name);
}
- #line 1981 "Python/generated_cases.c.h"
+ #line 1982 "Python/generated_cases.c.h"
Py_DECREF(iterable);
#line 1431 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
Py_DECREF(none_val);
- #line 1987 "Python/generated_cases.c.h"
+ #line 1988 "Python/generated_cases.c.h"
Py_DECREF(iterable);
STACK_SHRINK(1);
DISPATCH();
@@ -1994,11 +1995,11 @@
PyObject *set = stack_pointer[-(2 + (oparg-1))];
#line 1438 "Python/bytecodes.c"
int err = _PySet_Update(set, iterable);
- #line 1998 "Python/generated_cases.c.h"
+ #line 1999 "Python/generated_cases.c.h"
Py_DECREF(iterable);
#line 1440 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
- #line 2002 "Python/generated_cases.c.h"
+ #line 2003 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2021,7 +2022,7 @@
Py_DECREF(set);
if (true) { STACK_SHRINK(oparg); goto error; }
}
- #line 2025 "Python/generated_cases.c.h"
+ #line 2026 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = set;
@@ -2039,13 +2040,13 @@
if (map == NULL)
goto error;
- #line 2043 "Python/generated_cases.c.h"
+ #line 2044 "Python/generated_cases.c.h"
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
#line 1469 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
- #line 2049 "Python/generated_cases.c.h"
+ #line 2050 "Python/generated_cases.c.h"
STACK_SHRINK(oparg*2);
STACK_GROW(1);
stack_pointer[-1] = map;
@@ -2093,7 +2094,7 @@
Py_DECREF(ann_dict);
}
}
- #line 2097 "Python/generated_cases.c.h"
+ #line 2098 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -2111,14 +2112,14 @@
map = _PyDict_FromItems(
&PyTuple_GET_ITEM(keys, 0), 1,
values, 1, oparg);
- #line 2115 "Python/generated_cases.c.h"
+ #line 2116 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
#line 1525 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
- #line 2122 "Python/generated_cases.c.h"
+ #line 2123 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
stack_pointer[-1] = map;
DISPATCH();
@@ -2134,12 +2135,12 @@
"'%.200s' object is not a mapping",
Py_TYPE(update)->tp_name);
}
- #line 2138 "Python/generated_cases.c.h"
+ #line 2139 "Python/generated_cases.c.h"
Py_DECREF(update);
#line 1537 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2143 "Python/generated_cases.c.h"
+ #line 2144 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2152,12 +2153,12 @@
if (_PyDict_MergeEx(dict, update, 2) < 0) {
format_kwargs_error(tstate, PEEK(3 + oparg), update);
- #line 2156 "Python/generated_cases.c.h"
+ #line 2157 "Python/generated_cases.c.h"
Py_DECREF(update);
#line 1548 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2161 "Python/generated_cases.c.h"
+ #line 2162 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
PREDICT(CALL_FUNCTION_EX);
@@ -2173,7 +2174,7 @@
/* 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 2177 "Python/generated_cases.c.h"
+ #line 2178 "Python/generated_cases.c.h"
STACK_SHRINK(2);
PREDICT(JUMP_BACKWARD);
DISPATCH();
@@ -2205,7 +2206,7 @@
// handle any case whose performance we care about
PyObject *stack[] = {class, self};
PyObject *super = PyObject_Vectorcall(global_super, stack, oparg & 2, NULL);
- #line 2209 "Python/generated_cases.c.h"
+ #line 2210 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
@@ -2214,7 +2215,7 @@
res = PyObject_GetAttr(super, name);
Py_DECREF(super);
if (res == NULL) goto pop_3_error;
- #line 2218 "Python/generated_cases.c.h"
+ #line 2219 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2243,7 +2244,7 @@
Py_INCREF(res2);
Py_DECREF(global_super);
Py_DECREF(class);
- #line 2247 "Python/generated_cases.c.h"
+ #line 2248 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
stack_pointer[-2] = res2;
@@ -2291,7 +2292,7 @@
NULL | meth | arg1 | ... | argN
*/
- #line 2295 "Python/generated_cases.c.h"
+ #line 2296 "Python/generated_cases.c.h"
Py_DECREF(owner);
#line 1655 "Python/bytecodes.c"
if (meth == NULL) goto pop_1_error;
@@ -2302,12 +2303,12 @@
else {
/* Classic, pushes one value. */
res = PyObject_GetAttr(owner, name);
- #line 2306 "Python/generated_cases.c.h"
+ #line 2307 "Python/generated_cases.c.h"
Py_DECREF(owner);
#line 1664 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
}
- #line 2311 "Python/generated_cases.c.h"
+ #line 2312 "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; }
@@ -2334,7 +2335,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2338 "Python/generated_cases.c.h"
+ #line 2339 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2362,7 +2363,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2366 "Python/generated_cases.c.h"
+ #line 2367 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2404,7 +2405,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2408 "Python/generated_cases.c.h"
+ #line 2409 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2429,7 +2430,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2433 "Python/generated_cases.c.h"
+ #line 2434 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2456,7 +2457,7 @@
res = descr;
assert(res != NULL);
Py_INCREF(res);
- #line 2460 "Python/generated_cases.c.h"
+ #line 2461 "Python/generated_cases.c.h"
Py_DECREF(cls);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2494,7 +2495,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2498 "Python/generated_cases.c.h"
+ #line 2499 "Python/generated_cases.c.h"
}
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
@@ -2528,7 +2529,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2532 "Python/generated_cases.c.h"
+ #line 2533 "Python/generated_cases.c.h"
}
TARGET(STORE_ATTR_INSTANCE_VALUE) {
@@ -2554,7 +2555,7 @@
Py_DECREF(old_value);
}
Py_DECREF(owner);
- #line 2558 "Python/generated_cases.c.h"
+ #line 2559 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2604,7 +2605,7 @@
/* PEP 509 */
dict->ma_version_tag = new_version;
Py_DECREF(owner);
- #line 2608 "Python/generated_cases.c.h"
+ #line 2609 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2625,7 +2626,7 @@
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
- #line 2629 "Python/generated_cases.c.h"
+ #line 2630 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2650,12 +2651,12 @@
#endif /* ENABLE_SPECIALIZATION */
assert((oparg >> 4) <= Py_GE);
res = PyObject_RichCompare(left, right, oparg>>4);
- #line 2654 "Python/generated_cases.c.h"
+ #line 2655 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
#line 1906 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2659 "Python/generated_cases.c.h"
+ #line 2660 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2678,7 +2679,7 @@
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
Py_INCREF(res);
- #line 2682 "Python/generated_cases.c.h"
+ #line 2683 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2705,7 +2706,7 @@
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
Py_INCREF(res);
- #line 2709 "Python/generated_cases.c.h"
+ #line 2710 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2729,7 +2730,7 @@
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
Py_INCREF(res);
- #line 2733 "Python/generated_cases.c.h"
+ #line 2734 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2742,12 +2743,12 @@
PyObject *b;
#line 1959 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 2746 "Python/generated_cases.c.h"
+ #line 2747 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
#line 1961 "Python/bytecodes.c"
b = Py_NewRef(res ? Py_True : Py_False);
- #line 2751 "Python/generated_cases.c.h"
+ #line 2752 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2759,13 +2760,13 @@
PyObject *b;
#line 1965 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 2763 "Python/generated_cases.c.h"
+ #line 2764 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
#line 1967 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = Py_NewRef((res^oparg) ? Py_True : Py_False);
- #line 2769 "Python/generated_cases.c.h"
+ #line 2770 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2778,7 +2779,7 @@
PyObject *match;
#line 1972 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 2782 "Python/generated_cases.c.h"
+ #line 2783 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
#line 1974 "Python/bytecodes.c"
@@ -2789,7 +2790,7 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 2793 "Python/generated_cases.c.h"
+ #line 2794 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
#line 1982 "Python/bytecodes.c"
@@ -2801,7 +2802,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 2805 "Python/generated_cases.c.h"
+ #line 2806 "Python/generated_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
DISPATCH();
@@ -2814,18 +2815,18 @@
#line 1993 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 2818 "Python/generated_cases.c.h"
+ #line 2819 "Python/generated_cases.c.h"
Py_DECREF(right);
#line 1996 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 2825 "Python/generated_cases.c.h"
+ #line 2826 "Python/generated_cases.c.h"
Py_DECREF(right);
#line 2001 "Python/bytecodes.c"
b = Py_NewRef(res ? Py_True : Py_False);
- #line 2829 "Python/generated_cases.c.h"
+ #line 2830 "Python/generated_cases.c.h"
stack_pointer[-1] = b;
DISPATCH();
}
@@ -2837,12 +2838,12 @@
#line 2005 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_name(tstate, frame, name, fromlist, level);
- #line 2841 "Python/generated_cases.c.h"
+ #line 2842 "Python/generated_cases.c.h"
Py_DECREF(level);
Py_DECREF(fromlist);
#line 2008 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2846 "Python/generated_cases.c.h"
+ #line 2847 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -2855,7 +2856,7 @@
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- #line 2859 "Python/generated_cases.c.h"
+ #line 2860 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -2864,7 +2865,7 @@
TARGET(JUMP_FORWARD) {
#line 2018 "Python/bytecodes.c"
JUMPBY(oparg);
- #line 2868 "Python/generated_cases.c.h"
+ #line 2869 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -2873,7 +2874,7 @@
#line 2022 "Python/bytecodes.c"
assert(oparg < INSTR_OFFSET());
JUMPBY(-oparg);
- #line 2877 "Python/generated_cases.c.h"
+ #line 2878 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
@@ -2891,7 +2892,7 @@
}
else {
int err = PyObject_IsTrue(cond);
- #line 2895 "Python/generated_cases.c.h"
+ #line 2896 "Python/generated_cases.c.h"
Py_DECREF(cond);
#line 2038 "Python/bytecodes.c"
if (err == 0) {
@@ -2901,7 +2902,7 @@
if (err < 0) goto pop_1_error;
}
}
- #line 2905 "Python/generated_cases.c.h"
+ #line 2906 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2918,7 +2919,7 @@
}
else {
int err = PyObject_IsTrue(cond);
- #line 2922 "Python/generated_cases.c.h"
+ #line 2923 "Python/generated_cases.c.h"
Py_DECREF(cond);
#line 2058 "Python/bytecodes.c"
if (err > 0) {
@@ -2928,7 +2929,7 @@
if (err < 0) goto pop_1_error;
}
}
- #line 2932 "Python/generated_cases.c.h"
+ #line 2933 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2937,7 +2938,7 @@
PyObject *value = stack_pointer[-1];
#line 2068 "Python/bytecodes.c"
if (!Py_IsNone(value)) {
- #line 2941 "Python/generated_cases.c.h"
+ #line 2942 "Python/generated_cases.c.h"
Py_DECREF(value);
#line 2070 "Python/bytecodes.c"
JUMPBY(oparg);
@@ -2945,7 +2946,7 @@
else {
_Py_DECREF_NO_DEALLOC(value);
}
- #line 2949 "Python/generated_cases.c.h"
+ #line 2950 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2958,11 +2959,11 @@
JUMPBY(oparg);
}
else {
- #line 2962 "Python/generated_cases.c.h"
+ #line 2963 "Python/generated_cases.c.h"
Py_DECREF(value);
#line 2084 "Python/bytecodes.c"
}
- #line 2966 "Python/generated_cases.c.h"
+ #line 2967 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2975,7 +2976,7 @@
* (see bpo-30039).
*/
JUMPBY(-oparg);
- #line 2979 "Python/generated_cases.c.h"
+ #line 2980 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -2988,7 +2989,7 @@
if (len_i < 0) goto error;
len_o = PyLong_FromSsize_t(len_i);
if (len_o == NULL) goto error;
- #line 2992 "Python/generated_cases.c.h"
+ #line 2993 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3004,7 +3005,7 @@
// None on failure.
assert(PyTuple_CheckExact(names));
attrs = match_class(tstate, subject, type, oparg, names);
- #line 3008 "Python/generated_cases.c.h"
+ #line 3009 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
@@ -3016,7 +3017,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_NewRef(Py_None); // Failure!
}
- #line 3020 "Python/generated_cases.c.h"
+ #line 3021 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3028,7 +3029,7 @@
#line 2120 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = Py_NewRef(match ? Py_True : Py_False);
- #line 3032 "Python/generated_cases.c.h"
+ #line 3033 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3041,7 +3042,7 @@
#line 2126 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = Py_NewRef(match ? Py_True : Py_False);
- #line 3045 "Python/generated_cases.c.h"
+ #line 3046 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3056,7 +3057,7 @@
// On successful match, PUSH(values). Otherwise, PUSH(None).
values_or_none = match_keys(tstate, subject, keys);
if (values_or_none == NULL) goto error;
- #line 3060 "Python/generated_cases.c.h"
+ #line 3061 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3068,11 +3069,11 @@
#line 2138 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3072 "Python/generated_cases.c.h"
+ #line 3073 "Python/generated_cases.c.h"
Py_DECREF(iterable);
#line 2141 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3076 "Python/generated_cases.c.h"
+ #line 3077 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3103,11 +3104,11 @@
if (iter == NULL) {
goto error;
}
- #line 3107 "Python/generated_cases.c.h"
+ #line 3108 "Python/generated_cases.c.h"
Py_DECREF(iterable);
#line 2168 "Python/bytecodes.c"
}
- #line 3111 "Python/generated_cases.c.h"
+ #line 3112 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
PREDICT(LOAD_CONST);
DISPATCH();
@@ -3149,7 +3150,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3153 "Python/generated_cases.c.h"
+ #line 3154 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3183,7 +3184,7 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3187 "Python/generated_cases.c.h"
+ #line 3188 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -3210,7 +3211,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3214 "Python/generated_cases.c.h"
+ #line 3215 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3240,7 +3241,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3244 "Python/generated_cases.c.h"
+ #line 3245 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3268,7 +3269,7 @@
if (next == NULL) {
goto error;
}
- #line 3272 "Python/generated_cases.c.h"
+ #line 3273 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3292,7 +3293,7 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3296 "Python/generated_cases.c.h"
+ #line 3297 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
@@ -3322,7 +3323,7 @@
Py_DECREF(enter);
goto error;
}
- #line 3326 "Python/generated_cases.c.h"
+ #line 3327 "Python/generated_cases.c.h"
Py_DECREF(mgr);
#line 2352 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
@@ -3331,7 +3332,7 @@
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3335 "Python/generated_cases.c.h"
+ #line 3336 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3369,7 +3370,7 @@
Py_DECREF(enter);
goto error;
}
- #line 3373 "Python/generated_cases.c.h"
+ #line 3374 "Python/generated_cases.c.h"
Py_DECREF(mgr);
#line 2388 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
@@ -3378,7 +3379,7 @@
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3382 "Python/generated_cases.c.h"
+ #line 3383 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3411,7 +3412,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3415 "Python/generated_cases.c.h"
+ #line 3416 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3430,7 +3431,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3434 "Python/generated_cases.c.h"
+ #line 3435 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3461,7 +3462,7 @@
assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
assert(oparg & 1);
- #line 3465 "Python/generated_cases.c.h"
+ #line 3466 "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; }
@@ -3485,7 +3486,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3489 "Python/generated_cases.c.h"
+ #line 3490 "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; }
@@ -3513,7 +3514,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3517 "Python/generated_cases.c.h"
+ #line 3518 "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; }
@@ -3526,7 +3527,7 @@
assert(kwnames == NULL);
assert(oparg < PyTuple_GET_SIZE(frame->f_code->co_consts));
kwnames = GETITEM(frame->f_code->co_consts, oparg);
- #line 3530 "Python/generated_cases.c.h"
+ #line 3531 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -3544,7 +3545,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3548 "Python/generated_cases.c.h"
+ #line 3549 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3636,7 +3637,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3640 "Python/generated_cases.c.h"
+ #line 3641 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3658,7 +3659,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 3662 "Python/generated_cases.c.h"
+ #line 3663 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -3693,7 +3694,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3697 "Python/generated_cases.c.h"
+ #line 3698 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -3737,7 +3738,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3741 "Python/generated_cases.c.h"
+ #line 3742 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -3755,7 +3756,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 3759 "Python/generated_cases.c.h"
+ #line 3760 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3779,7 +3780,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3783 "Python/generated_cases.c.h"
+ #line 3784 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3804,7 +3805,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3808 "Python/generated_cases.c.h"
+ #line 3809 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3840,7 +3841,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3844 "Python/generated_cases.c.h"
+ #line 3845 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3882,7 +3883,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3886 "Python/generated_cases.c.h"
+ #line 3887 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3928,7 +3929,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 3932 "Python/generated_cases.c.h"
+ #line 3933 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3974,7 +3975,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3978 "Python/generated_cases.c.h"
+ #line 3979 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4013,7 +4014,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4017 "Python/generated_cases.c.h"
+ #line 4018 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4053,7 +4054,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4057 "Python/generated_cases.c.h"
+ #line 4058 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4083,7 +4084,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4087 "Python/generated_cases.c.h"
+ #line 4088 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
@@ -4121,7 +4122,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4125 "Python/generated_cases.c.h"
+ #line 4126 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4163,7 +4164,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4167 "Python/generated_cases.c.h"
+ #line 4168 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4205,7 +4206,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4209 "Python/generated_cases.c.h"
+ #line 4210 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4246,7 +4247,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4250 "Python/generated_cases.c.h"
+ #line 4251 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4258,7 +4259,7 @@
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
#line 3068 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4262 "Python/generated_cases.c.h"
+ #line 4263 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4329,14 +4330,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4333 "Python/generated_cases.c.h"
+ #line 4334 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
#line 3134 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- #line 4340 "Python/generated_cases.c.h"
+ #line 4341 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4380,7 +4381,7 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4384 "Python/generated_cases.c.h"
+ #line 4385 "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();
@@ -4408,7 +4409,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4412 "Python/generated_cases.c.h"
+ #line 4413 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4418,13 +4419,13 @@
PyObject *slice;
#line 3198 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4422 "Python/generated_cases.c.h"
+ #line 4423 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
#line 3200 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 4428 "Python/generated_cases.c.h"
+ #line 4429 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4470,7 +4471,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 4474 "Python/generated_cases.c.h"
+ #line 4475 "Python/generated_cases.c.h"
STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0));
stack_pointer[-1] = result;
DISPATCH();
@@ -4482,7 +4483,7 @@
#line 3241 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4486 "Python/generated_cases.c.h"
+ #line 4487 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4509,12 +4510,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4513 "Python/generated_cases.c.h"
+ #line 4514 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
#line 3261 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4518 "Python/generated_cases.c.h"
+ #line 4519 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4526,7 +4527,7 @@
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
#line 3266 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4530 "Python/generated_cases.c.h"
+ #line 4531 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
@@ -4553,7 +4554,7 @@
}
opcode = original_opcode;
DISPATCH_GOTO();
- #line 4557 "Python/generated_cases.c.h"
+ #line 4558 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_INSTRUCTION) {
@@ -4569,20 +4570,20 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 4573 "Python/generated_cases.c.h"
+ #line 4574 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
#line 3306 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
- #line 4579 "Python/generated_cases.c.h"
+ #line 4580 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
#line 3310 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr-oparg, PY_MONITORING_EVENT_JUMP);
- #line 4586 "Python/generated_cases.c.h"
+ #line 4587 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
@@ -4597,7 +4598,7 @@
assert(err == 0 || err == 1);
int offset = err*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4601 "Python/generated_cases.c.h"
+ #line 4602 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -4611,7 +4612,7 @@
assert(err == 0 || err == 1);
int offset = (1-err)*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4615 "Python/generated_cases.c.h"
+ #line 4616 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -4629,7 +4630,7 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4633 "Python/generated_cases.c.h"
+ #line 4634 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -4647,7 +4648,7 @@
offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4651 "Python/generated_cases.c.h"
+ #line 4652 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -4658,19 +4659,19 @@
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 4662 "Python/generated_cases.c.h"
+ #line 4663 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
#line 3375 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 4669 "Python/generated_cases.c.h"
+ #line 4670 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
#line 3380 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 4676 "Python/generated_cases.c.h"
+ #line 4677 "Python/generated_cases.c.h"
}
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index c1a6ed4c18ab..670290e2f3f9 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -512,7 +512,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
case SEND:
return 2;
case SEND_GEN:
- return 1;
+ return 2;
case INSTRUMENTED_YIELD_VALUE:
return 1;
case YIELD_VALUE:
More information about the Python-checkins
mailing list