diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 0848bbfd203ec4..bac6c0f85d0bd7 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2282,22 +2282,20 @@ dummy_func(
JUMPBY(oparg * Py_IsTrue(cond));
}
- inst(POP_JUMP_IF_NOT_NONE, (value -- )) {
- if (!Py_IsNone(value)) {
- DECREF_INPUTS();
- JUMPBY(oparg);
- }
- }
-
- inst(POP_JUMP_IF_NONE, (value -- )) {
+ op(IS_NONE, (value -- b)) {
if (Py_IsNone(value)) {
- JUMPBY(oparg);
+ b = Py_True;
}
else {
+ b = Py_False;
DECREF_INPUTS();
}
}
+ macro(POP_JUMP_IF_NONE) = IS_NONE + POP_JUMP_IF_TRUE;
+
+ macro(POP_JUMP_IF_NOT_NONE) = IS_NONE + POP_JUMP_IF_FALSE;
+
inst(JUMP_BACKWARD_NO_INTERRUPT, (--)) {
/* This bytecode is used in the `yield from` or `await` loop.
* If there is an interrupt, we want it handled in the innermost
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index eccb30348173af..02333a40cb65a0 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1899,16 +1899,34 @@
break;
}
+ case IS_NONE: {
+ PyObject *value = stack_pointer[-1];
+ PyObject *b;
+ #line 2286 "Python/bytecodes.c"
+ if (Py_IsNone(value)) {
+ b = Py_True;
+ }
+ else {
+ b = Py_False;
+ #line 1912 "Python/executor_cases.c.h"
+ Py_DECREF(value);
+ #line 2292 "Python/bytecodes.c"
+ }
+ #line 1916 "Python/executor_cases.c.h"
+ stack_pointer[-1] = b;
+ break;
+ }
+
case GET_LEN: {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2311 "Python/bytecodes.c"
+ #line 2309 "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 1912 "Python/executor_cases.c.h"
+ #line 1930 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
break;
@@ -1919,16 +1937,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2319 "Python/bytecodes.c"
+ #line 2317 "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 1928 "Python/executor_cases.c.h"
+ #line 1946 "Python/executor_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2324 "Python/bytecodes.c"
+ #line 2322 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -1936,7 +1954,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 1940 "Python/executor_cases.c.h"
+ #line 1958 "Python/executor_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
break;
@@ -1945,10 +1963,10 @@
case MATCH_MAPPING: {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2334 "Python/bytecodes.c"
+ #line 2332 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 1952 "Python/executor_cases.c.h"
+ #line 1970 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
break;
@@ -1957,10 +1975,10 @@
case MATCH_SEQUENCE: {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2339 "Python/bytecodes.c"
+ #line 2337 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 1964 "Python/executor_cases.c.h"
+ #line 1982 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
break;
@@ -1970,11 +1988,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2344 "Python/bytecodes.c"
+ #line 2342 "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 1978 "Python/executor_cases.c.h"
+ #line 1996 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
break;
@@ -1983,14 +2001,14 @@
case GET_ITER: {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2350 "Python/bytecodes.c"
+ #line 2348 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 1990 "Python/executor_cases.c.h"
+ #line 2008 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 2353 "Python/bytecodes.c"
+ #line 2351 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 1994 "Python/executor_cases.c.h"
+ #line 2012 "Python/executor_cases.c.h"
stack_pointer[-1] = iter;
break;
}
@@ -1998,7 +2016,7 @@
case GET_YIELD_FROM_ITER: {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2357 "Python/bytecodes.c"
+ #line 2355 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -2021,11 +2039,11 @@
if (iter == NULL) {
goto error;
}
- #line 2025 "Python/executor_cases.c.h"
+ #line 2043 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 2380 "Python/bytecodes.c"
+ #line 2378 "Python/bytecodes.c"
}
- #line 2029 "Python/executor_cases.c.h"
+ #line 2047 "Python/executor_cases.c.h"
stack_pointer[-1] = iter;
break;
}
@@ -2035,7 +2053,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2612 "Python/bytecodes.c"
+ #line 2610 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -2056,7 +2074,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 2060 "Python/executor_cases.c.h"
+ #line 2078 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
break;
@@ -2065,7 +2083,7 @@
case PUSH_EXC_INFO: {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2651 "Python/bytecodes.c"
+ #line 2649 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -2075,7 +2093,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 2079 "Python/executor_cases.c.h"
+ #line 2097 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -2084,7 +2102,7 @@
case EXIT_INIT_CHECK: {
PyObject *should_be_none = stack_pointer[-1];
- #line 3050 "Python/bytecodes.c"
+ #line 3048 "Python/bytecodes.c"
assert(STACK_LEVEL() == 2);
if (should_be_none != Py_None) {
PyErr_Format(PyExc_TypeError,
@@ -2092,7 +2110,7 @@
Py_TYPE(should_be_none)->tp_name);
goto error;
}
- #line 2096 "Python/executor_cases.c.h"
+ #line 2114 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
@@ -2100,7 +2118,7 @@
case MAKE_FUNCTION: {
PyObject *codeobj = stack_pointer[-1];
PyObject *func;
- #line 3464 "Python/bytecodes.c"
+ #line 3462 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -2112,7 +2130,7 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 2116 "Python/executor_cases.c.h"
+ #line 2134 "Python/executor_cases.c.h"
stack_pointer[-1] = func;
break;
}
@@ -2120,7 +2138,7 @@
case SET_FUNCTION_ATTRIBUTE: {
PyObject *func = stack_pointer[-1];
PyObject *attr = stack_pointer[-2];
- #line 3478 "Python/bytecodes.c"
+ #line 3476 "Python/bytecodes.c"
assert(PyFunction_Check(func));
PyFunctionObject *func_obj = (PyFunctionObject *)func;
switch(oparg) {
@@ -2145,7 +2163,7 @@
default:
Py_UNREACHABLE();
}
- #line 2149 "Python/executor_cases.c.h"
+ #line 2167 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = func;
break;
@@ -2156,15 +2174,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3528 "Python/bytecodes.c"
+ #line 3526 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 2162 "Python/executor_cases.c.h"
+ #line 2180 "Python/executor_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3530 "Python/bytecodes.c"
+ #line 3528 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 2168 "Python/executor_cases.c.h"
+ #line 2186 "Python/executor_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -2174,14 +2192,14 @@
case CONVERT_VALUE: {
PyObject *value = stack_pointer[-1];
PyObject *result;
- #line 3534 "Python/bytecodes.c"
+ #line 3532 "Python/bytecodes.c"
convertion_func_ptr conv_fn;
assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
conv_fn = CONVERSION_FUNCTIONS[oparg];
result = conv_fn(value);
Py_DECREF(value);
if (result == NULL) goto pop_1_error;
- #line 2185 "Python/executor_cases.c.h"
+ #line 2203 "Python/executor_cases.c.h"
stack_pointer[-1] = result;
break;
}
@@ -2189,7 +2207,7 @@
case FORMAT_SIMPLE: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 3543 "Python/bytecodes.c"
+ #line 3541 "Python/bytecodes.c"
/* If value is a unicode object, then we know the result
* of format(value) is value itself. */
if (!PyUnicode_CheckExact(value)) {
@@ -2200,7 +2218,7 @@
else {
res = value;
}
- #line 2204 "Python/executor_cases.c.h"
+ #line 2222 "Python/executor_cases.c.h"
stack_pointer[-1] = res;
break;
}
@@ -2209,12 +2227,12 @@
PyObject *fmt_spec = stack_pointer[-1];
PyObject *value = stack_pointer[-2];
PyObject *res;
- #line 3556 "Python/bytecodes.c"
+ #line 3554 "Python/bytecodes.c"
res = PyObject_Format(value, fmt_spec);
Py_DECREF(value);
Py_DECREF(fmt_spec);
if (res == NULL) goto pop_2_error;
- #line 2218 "Python/executor_cases.c.h"
+ #line 2236 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -2223,10 +2241,10 @@
case COPY: {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3563 "Python/bytecodes.c"
+ #line 3561 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 2230 "Python/executor_cases.c.h"
+ #line 2248 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
break;
@@ -2237,7 +2255,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3568 "Python/bytecodes.c"
+ #line 3566 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2252,12 +2270,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 2256 "Python/executor_cases.c.h"
+ #line 2274 "Python/executor_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3583 "Python/bytecodes.c"
+ #line 3581 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2261 "Python/executor_cases.c.h"
+ #line 2279 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -2266,9 +2284,9 @@
case SWAP: {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3588 "Python/bytecodes.c"
+ #line 3586 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 2272 "Python/executor_cases.c.h"
+ #line 2290 "Python/executor_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
break;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 11823cf9cd293c..3adc32c74f03ca 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -3243,58 +3243,86 @@
DISPATCH();
}
- TARGET(POP_JUMP_IF_NOT_NONE) {
- PyObject *value = stack_pointer[-1];
- #line 2286 "Python/bytecodes.c"
- if (!Py_IsNone(value)) {
- #line 3251 "Python/generated_cases.c.h"
- Py_DECREF(value);
- #line 2288 "Python/bytecodes.c"
- JUMPBY(oparg);
+ TARGET(POP_JUMP_IF_NONE) {
+ PyObject *_tmp_1 = stack_pointer[-1];
+ {
+ PyObject *value = _tmp_1;
+ PyObject *b;
+ #line 2286 "Python/bytecodes.c"
+ if (Py_IsNone(value)) {
+ b = Py_True;
+ }
+ else {
+ b = Py_False;
+ #line 3258 "Python/generated_cases.c.h"
+ Py_DECREF(value);
+ #line 2292 "Python/bytecodes.c"
+ }
+ #line 3262 "Python/generated_cases.c.h"
+ _tmp_1 = b;
+ }
+ {
+ PyObject *cond = _tmp_1;
+ #line 2281 "Python/bytecodes.c"
+ assert(PyBool_Check(cond));
+ JUMPBY(oparg * Py_IsTrue(cond));
+ #line 3270 "Python/generated_cases.c.h"
}
- #line 3256 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
- TARGET(POP_JUMP_IF_NONE) {
- PyObject *value = stack_pointer[-1];
- #line 2293 "Python/bytecodes.c"
- if (Py_IsNone(value)) {
- JUMPBY(oparg);
+ TARGET(POP_JUMP_IF_NOT_NONE) {
+ PyObject *_tmp_1 = stack_pointer[-1];
+ {
+ PyObject *value = _tmp_1;
+ PyObject *b;
+ #line 2286 "Python/bytecodes.c"
+ if (Py_IsNone(value)) {
+ b = Py_True;
+ }
+ else {
+ b = Py_False;
+ #line 3287 "Python/generated_cases.c.h"
+ Py_DECREF(value);
+ #line 2292 "Python/bytecodes.c"
+ }
+ #line 3291 "Python/generated_cases.c.h"
+ _tmp_1 = b;
}
- else {
- #line 3268 "Python/generated_cases.c.h"
- Py_DECREF(value);
- #line 2298 "Python/bytecodes.c"
+ {
+ PyObject *cond = _tmp_1;
+ #line 2276 "Python/bytecodes.c"
+ assert(PyBool_Check(cond));
+ JUMPBY(oparg * Py_IsFalse(cond));
+ #line 3299 "Python/generated_cases.c.h"
}
- #line 3272 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
- #line 2302 "Python/bytecodes.c"
+ #line 2300 "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 3285 "Python/generated_cases.c.h"
+ #line 3313 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(GET_LEN) {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2311 "Python/bytecodes.c"
+ #line 2309 "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 3298 "Python/generated_cases.c.h"
+ #line 3326 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3305,16 +3333,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2319 "Python/bytecodes.c"
+ #line 2317 "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 3314 "Python/generated_cases.c.h"
+ #line 3342 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2324 "Python/bytecodes.c"
+ #line 2322 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -3322,7 +3350,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 3326 "Python/generated_cases.c.h"
+ #line 3354 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3331,10 +3359,10 @@
TARGET(MATCH_MAPPING) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2334 "Python/bytecodes.c"
+ #line 2332 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 3338 "Python/generated_cases.c.h"
+ #line 3366 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3343,10 +3371,10 @@
TARGET(MATCH_SEQUENCE) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2339 "Python/bytecodes.c"
+ #line 2337 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 3350 "Python/generated_cases.c.h"
+ #line 3378 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3356,11 +3384,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2344 "Python/bytecodes.c"
+ #line 2342 "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 3364 "Python/generated_cases.c.h"
+ #line 3392 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3369,14 +3397,14 @@
TARGET(GET_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2350 "Python/bytecodes.c"
+ #line 2348 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3376 "Python/generated_cases.c.h"
+ #line 3404 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2353 "Python/bytecodes.c"
+ #line 2351 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3380 "Python/generated_cases.c.h"
+ #line 3408 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3384,7 +3412,7 @@
TARGET(GET_YIELD_FROM_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2357 "Python/bytecodes.c"
+ #line 2355 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -3407,11 +3435,11 @@
if (iter == NULL) {
goto error;
}
- #line 3411 "Python/generated_cases.c.h"
+ #line 3439 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2380 "Python/bytecodes.c"
+ #line 2378 "Python/bytecodes.c"
}
- #line 3415 "Python/generated_cases.c.h"
+ #line 3443 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3421,7 +3449,7 @@
static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2398 "Python/bytecodes.c"
+ #line 2396 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3453,7 +3481,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3457 "Python/generated_cases.c.h"
+ #line 3485 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3461,7 +3489,7 @@
}
TARGET(INSTRUMENTED_FOR_ITER) {
- #line 2432 "Python/bytecodes.c"
+ #line 2430 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr-1;
_Py_CODEUNIT *target;
PyObject *iter = TOP();
@@ -3487,14 +3515,14 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3491 "Python/generated_cases.c.h"
+ #line 3519 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(FOR_ITER_LIST) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2460 "Python/bytecodes.c"
+ #line 2458 "Python/bytecodes.c"
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
_PyListIterObject *it = (_PyListIterObject *)iter;
STAT_INC(FOR_ITER, hit);
@@ -3515,7 +3543,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3519 "Python/generated_cases.c.h"
+ #line 3547 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3525,7 +3553,7 @@
TARGET(FOR_ITER_TUPLE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2483 "Python/bytecodes.c"
+ #line 2481 "Python/bytecodes.c"
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3546,7 +3574,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3550 "Python/generated_cases.c.h"
+ #line 3578 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3556,7 +3584,7 @@
TARGET(FOR_ITER_RANGE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2506 "Python/bytecodes.c"
+ #line 2504 "Python/bytecodes.c"
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3575,7 +3603,7 @@
if (next == NULL) {
goto error;
}
- #line 3579 "Python/generated_cases.c.h"
+ #line 3607 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3584,7 +3612,7 @@
TARGET(FOR_ITER_GEN) {
PyObject *iter = stack_pointer[-1];
- #line 2527 "Python/bytecodes.c"
+ #line 2525 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3600,14 +3628,14 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3604 "Python/generated_cases.c.h"
+ #line 3632 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2545 "Python/bytecodes.c"
+ #line 2543 "Python/bytecodes.c"
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
@@ -3630,16 +3658,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3634 "Python/generated_cases.c.h"
+ #line 3662 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2568 "Python/bytecodes.c"
+ #line 2566 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3643 "Python/generated_cases.c.h"
+ #line 3671 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3650,7 +3678,7 @@
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2577 "Python/bytecodes.c"
+ #line 2575 "Python/bytecodes.c"
/* pop the context manager, push its __exit__ and the
* value returned from calling its __enter__
*/
@@ -3676,16 +3704,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3680 "Python/generated_cases.c.h"
+ #line 3708 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2603 "Python/bytecodes.c"
+ #line 2601 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3689 "Python/generated_cases.c.h"
+ #line 3717 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3697,7 +3725,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2612 "Python/bytecodes.c"
+ #line 2610 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -3718,7 +3746,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3722 "Python/generated_cases.c.h"
+ #line 3750 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3727,7 +3755,7 @@
TARGET(PUSH_EXC_INFO) {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2651 "Python/bytecodes.c"
+ #line 2649 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -3737,7 +3765,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3741 "Python/generated_cases.c.h"
+ #line 3769 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3751,7 +3779,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 2663 "Python/bytecodes.c"
+ #line 2661 "Python/bytecodes.c"
assert(oparg & 1);
/* Cached method object */
PyTypeObject *self_cls = Py_TYPE(self);
@@ -3768,7 +3796,7 @@
res2 = Py_NewRef(descr);
assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
- #line 3772 "Python/generated_cases.c.h"
+ #line 3800 "Python/generated_cases.c.h"
STACK_GROW((1 ? 1 : 0));
stack_pointer[-1] = res;
if (1) { stack_pointer[-(1 + (1 ? 1 : 0))] = res2; }
@@ -3782,7 +3810,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2682 "Python/bytecodes.c"
+ #line 2680 "Python/bytecodes.c"
assert(oparg & 1);
PyTypeObject *self_cls = Py_TYPE(self);
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
@@ -3792,7 +3820,7 @@
assert(_PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR));
res2 = Py_NewRef(descr);
res = self;
- #line 3796 "Python/generated_cases.c.h"
+ #line 3824 "Python/generated_cases.c.h"
STACK_GROW((1 ? 1 : 0));
stack_pointer[-1] = res;
if (1) { stack_pointer[-(1 + (1 ? 1 : 0))] = res2; }
@@ -3807,7 +3835,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 2694 "Python/bytecodes.c"
+ #line 2692 "Python/bytecodes.c"
assert((oparg & 1) == 0);
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3820,11 +3848,11 @@
keys_version, LOAD_ATTR);
STAT_INC(LOAD_ATTR, hit);
assert(descr != NULL);
- #line 3824 "Python/generated_cases.c.h"
+ #line 3852 "Python/generated_cases.c.h"
Py_DECREF(self);
- #line 2707 "Python/bytecodes.c"
+ #line 2705 "Python/bytecodes.c"
res = Py_NewRef(descr);
- #line 3828 "Python/generated_cases.c.h"
+ #line 3856 "Python/generated_cases.c.h"
STACK_GROW((0 ? 1 : 0));
stack_pointer[-1] = res;
if (0) { stack_pointer[-(1 + (0 ? 1 : 0))] = res2; }
@@ -3838,7 +3866,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2711 "Python/bytecodes.c"
+ #line 2709 "Python/bytecodes.c"
assert((oparg & 1) == 0);
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3846,11 +3874,11 @@
assert(self_cls->tp_dictoffset == 0);
STAT_INC(LOAD_ATTR, hit);
assert(descr != NULL);
- #line 3850 "Python/generated_cases.c.h"
+ #line 3878 "Python/generated_cases.c.h"
Py_DECREF(self);
- #line 2719 "Python/bytecodes.c"
+ #line 2717 "Python/bytecodes.c"
res = Py_NewRef(descr);
- #line 3854 "Python/generated_cases.c.h"
+ #line 3882 "Python/generated_cases.c.h"
STACK_GROW((0 ? 1 : 0));
stack_pointer[-1] = res;
if (0) { stack_pointer[-(1 + (0 ? 1 : 0))] = res2; }
@@ -3864,7 +3892,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2723 "Python/bytecodes.c"
+ #line 2721 "Python/bytecodes.c"
assert(oparg & 1);
PyTypeObject *self_cls = Py_TYPE(self);
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
@@ -3878,7 +3906,7 @@
assert(_PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR));
res2 = Py_NewRef(descr);
res = self;
- #line 3882 "Python/generated_cases.c.h"
+ #line 3910 "Python/generated_cases.c.h"
STACK_GROW((1 ? 1 : 0));
stack_pointer[-1] = res;
if (1) { stack_pointer[-(1 + (1 ? 1 : 0))] = res2; }
@@ -3887,16 +3915,16 @@
}
TARGET(KW_NAMES) {
- #line 2739 "Python/bytecodes.c"
+ #line 2737 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
- #line 3895 "Python/generated_cases.c.h"
+ #line 3923 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_CALL) {
- #line 2745 "Python/bytecodes.c"
+ #line 2743 "Python/bytecodes.c"
int is_meth = PEEK(oparg+2) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -3909,7 +3937,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3913 "Python/generated_cases.c.h"
+ #line 3941 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3919,7 +3947,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2791 "Python/bytecodes.c"
+ #line 2789 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4001,7 +4029,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4005 "Python/generated_cases.c.h"
+ #line 4033 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4013,7 +4041,7 @@
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2879 "Python/bytecodes.c"
+ #line 2877 "Python/bytecodes.c"
DEOPT_IF(method != NULL, CALL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
STAT_INC(CALL, hit);
@@ -4023,7 +4051,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 4027 "Python/generated_cases.c.h"
+ #line 4055 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -4032,7 +4060,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2891 "Python/bytecodes.c"
+ #line 2889 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -4058,7 +4086,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 4062 "Python/generated_cases.c.h"
+ #line 4090 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -4066,7 +4094,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2919 "Python/bytecodes.c"
+ #line 2917 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -4102,7 +4130,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 4106 "Python/generated_cases.c.h"
+ #line 4134 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -4110,7 +4138,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2957 "Python/bytecodes.c"
+ #line 2955 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4120,7 +4148,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 4124 "Python/generated_cases.c.h"
+ #line 4152 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4133,7 +4161,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2969 "Python/bytecodes.c"
+ #line 2967 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4144,7 +4172,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4148 "Python/generated_cases.c.h"
+ #line 4176 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4158,7 +4186,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2983 "Python/bytecodes.c"
+ #line 2981 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4169,7 +4197,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4173 "Python/generated_cases.c.h"
+ #line 4201 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4182,7 +4210,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
- #line 2997 "Python/bytecodes.c"
+ #line 2995 "Python/bytecodes.c"
/* This instruction does the following:
* 1. Creates the object (by calling ``object.__new__``)
* 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
@@ -4233,12 +4261,12 @@
* as it will be checked after start_frame */
tstate->py_recursion_remaining--;
goto start_frame;
- #line 4237 "Python/generated_cases.c.h"
+ #line 4265 "Python/generated_cases.c.h"
}
TARGET(EXIT_INIT_CHECK) {
PyObject *should_be_none = stack_pointer[-1];
- #line 3050 "Python/bytecodes.c"
+ #line 3048 "Python/bytecodes.c"
assert(STACK_LEVEL() == 2);
if (should_be_none != Py_None) {
PyErr_Format(PyExc_TypeError,
@@ -4246,7 +4274,7 @@
Py_TYPE(should_be_none)->tp_name);
goto error;
}
- #line 4250 "Python/generated_cases.c.h"
+ #line 4278 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -4256,7 +4284,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3060 "Python/bytecodes.c"
+ #line 3058 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4278,7 +4306,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4282 "Python/generated_cases.c.h"
+ #line 4310 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4292,7 +4320,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3085 "Python/bytecodes.c"
+ #line 3083 "Python/bytecodes.c"
/* Builtin METH_O functions */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4320,7 +4348,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4324 "Python/generated_cases.c.h"
+ #line 4352 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4334,7 +4362,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3116 "Python/bytecodes.c"
+ #line 3114 "Python/bytecodes.c"
/* Builtin METH_FASTCALL functions, without keywords */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4366,7 +4394,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 4370 "Python/generated_cases.c.h"
+ #line 4398 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4380,7 +4408,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3151 "Python/bytecodes.c"
+ #line 3149 "Python/bytecodes.c"
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
int is_meth = method != NULL;
int total_args = oparg;
@@ -4412,7 +4440,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4416 "Python/generated_cases.c.h"
+ #line 4444 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4426,7 +4454,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3186 "Python/bytecodes.c"
+ #line 3184 "Python/bytecodes.c"
assert(kwnames == NULL);
/* len(o) */
int is_meth = method != NULL;
@@ -4451,7 +4479,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4455 "Python/generated_cases.c.h"
+ #line 4483 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4464,7 +4492,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3213 "Python/bytecodes.c"
+ #line 3211 "Python/bytecodes.c"
assert(kwnames == NULL);
/* isinstance(o, o2) */
int is_meth = method != NULL;
@@ -4491,7 +4519,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4495 "Python/generated_cases.c.h"
+ #line 4523 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4503,7 +4531,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *self = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 3243 "Python/bytecodes.c"
+ #line 3241 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
assert(method != NULL);
@@ -4521,14 +4549,14 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4525 "Python/generated_cases.c.h"
+ #line 4553 "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 3263 "Python/bytecodes.c"
+ #line 3261 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4559,7 +4587,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4563 "Python/generated_cases.c.h"
+ #line 4591 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4572,7 +4600,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3297 "Python/bytecodes.c"
+ #line 3295 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4601,7 +4629,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4605 "Python/generated_cases.c.h"
+ #line 4633 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4614,7 +4642,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3329 "Python/bytecodes.c"
+ #line 3327 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 0 || oparg == 1);
int is_meth = method != NULL;
@@ -4643,7 +4671,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4647 "Python/generated_cases.c.h"
+ #line 4675 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4656,7 +4684,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3361 "Python/bytecodes.c"
+ #line 3359 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4684,7 +4712,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4688 "Python/generated_cases.c.h"
+ #line 4716 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4694,9 +4722,9 @@
}
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
- #line 3392 "Python/bytecodes.c"
+ #line 3390 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4700 "Python/generated_cases.c.h"
+ #line 4728 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4705,7 +4733,7 @@
PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
PyObject *result;
- #line 3396 "Python/bytecodes.c"
+ #line 3394 "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));
@@ -4767,14 +4795,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4771 "Python/generated_cases.c.h"
+ #line 4799 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
- #line 3458 "Python/bytecodes.c"
+ #line 3456 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- #line 4778 "Python/generated_cases.c.h"
+ #line 4806 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4785,7 +4813,7 @@
TARGET(MAKE_FUNCTION) {
PyObject *codeobj = stack_pointer[-1];
PyObject *func;
- #line 3464 "Python/bytecodes.c"
+ #line 3462 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -4797,7 +4825,7 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4801 "Python/generated_cases.c.h"
+ #line 4829 "Python/generated_cases.c.h"
stack_pointer[-1] = func;
DISPATCH();
}
@@ -4805,7 +4833,7 @@
TARGET(SET_FUNCTION_ATTRIBUTE) {
PyObject *func = stack_pointer[-1];
PyObject *attr = stack_pointer[-2];
- #line 3478 "Python/bytecodes.c"
+ #line 3476 "Python/bytecodes.c"
assert(PyFunction_Check(func));
PyFunctionObject *func_obj = (PyFunctionObject *)func;
switch(oparg) {
@@ -4830,14 +4858,14 @@
default:
Py_UNREACHABLE();
}
- #line 4834 "Python/generated_cases.c.h"
+ #line 4862 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = func;
DISPATCH();
}
TARGET(RETURN_GENERATOR) {
- #line 3505 "Python/bytecodes.c"
+ #line 3503 "Python/bytecodes.c"
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4858,7 +4886,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4862 "Python/generated_cases.c.h"
+ #line 4890 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4866,15 +4894,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3528 "Python/bytecodes.c"
+ #line 3526 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4872 "Python/generated_cases.c.h"
+ #line 4900 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3530 "Python/bytecodes.c"
+ #line 3528 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 4878 "Python/generated_cases.c.h"
+ #line 4906 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4884,14 +4912,14 @@
TARGET(CONVERT_VALUE) {
PyObject *value = stack_pointer[-1];
PyObject *result;
- #line 3534 "Python/bytecodes.c"
+ #line 3532 "Python/bytecodes.c"
convertion_func_ptr conv_fn;
assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
conv_fn = CONVERSION_FUNCTIONS[oparg];
result = conv_fn(value);
Py_DECREF(value);
if (result == NULL) goto pop_1_error;
- #line 4895 "Python/generated_cases.c.h"
+ #line 4923 "Python/generated_cases.c.h"
stack_pointer[-1] = result;
DISPATCH();
}
@@ -4899,7 +4927,7 @@
TARGET(FORMAT_SIMPLE) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 3543 "Python/bytecodes.c"
+ #line 3541 "Python/bytecodes.c"
/* If value is a unicode object, then we know the result
* of format(value) is value itself. */
if (!PyUnicode_CheckExact(value)) {
@@ -4910,7 +4938,7 @@
else {
res = value;
}
- #line 4914 "Python/generated_cases.c.h"
+ #line 4942 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -4919,12 +4947,12 @@
PyObject *fmt_spec = stack_pointer[-1];
PyObject *value = stack_pointer[-2];
PyObject *res;
- #line 3556 "Python/bytecodes.c"
+ #line 3554 "Python/bytecodes.c"
res = PyObject_Format(value, fmt_spec);
Py_DECREF(value);
Py_DECREF(fmt_spec);
if (res == NULL) goto pop_2_error;
- #line 4928 "Python/generated_cases.c.h"
+ #line 4956 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -4933,10 +4961,10 @@
TARGET(COPY) {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3563 "Python/bytecodes.c"
+ #line 3561 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4940 "Python/generated_cases.c.h"
+ #line 4968 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4948,7 +4976,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3568 "Python/bytecodes.c"
+ #line 3566 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4963,12 +4991,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4967 "Python/generated_cases.c.h"
+ #line 4995 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3583 "Python/bytecodes.c"
+ #line 3581 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4972 "Python/generated_cases.c.h"
+ #line 5000 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4978,16 +5006,16 @@
TARGET(SWAP) {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3588 "Python/bytecodes.c"
+ #line 3586 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4984 "Python/generated_cases.c.h"
+ #line 5012 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
}
TARGET(INSTRUMENTED_INSTRUCTION) {
- #line 3592 "Python/bytecodes.c"
+ #line 3590 "Python/bytecodes.c"
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, next_instr-1);
if (next_opcode < 0) goto error;
@@ -4999,48 +5027,48 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 5003 "Python/generated_cases.c.h"
+ #line 5031 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
- #line 3606 "Python/bytecodes.c"
+ #line 3604 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
- #line 5009 "Python/generated_cases.c.h"
+ #line 5037 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
- #line 3610 "Python/bytecodes.c"
+ #line 3608 "Python/bytecodes.c"
CHECK_EVAL_BREAKER();
INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
- #line 5017 "Python/generated_cases.c.h"
+ #line 5045 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
- #line 3615 "Python/bytecodes.c"
+ #line 3613 "Python/bytecodes.c"
PyObject *cond = POP();
assert(PyBool_Check(cond));
_Py_CODEUNIT *here = next_instr - 1;
int offset = Py_IsTrue(cond) * oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 5028 "Python/generated_cases.c.h"
+ #line 5056 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
- #line 3623 "Python/bytecodes.c"
+ #line 3621 "Python/bytecodes.c"
PyObject *cond = POP();
assert(PyBool_Check(cond));
_Py_CODEUNIT *here = next_instr - 1;
int offset = Py_IsFalse(cond) * oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 5039 "Python/generated_cases.c.h"
+ #line 5067 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
- #line 3631 "Python/bytecodes.c"
+ #line 3629 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -5052,12 +5080,12 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 5056 "Python/generated_cases.c.h"
+ #line 5084 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
- #line 3645 "Python/bytecodes.c"
+ #line 3643 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -5069,30 +5097,30 @@
offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 5073 "Python/generated_cases.c.h"
+ #line 5101 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(EXTENDED_ARG) {
- #line 3659 "Python/bytecodes.c"
+ #line 3657 "Python/bytecodes.c"
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 5084 "Python/generated_cases.c.h"
+ #line 5112 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
- #line 3667 "Python/bytecodes.c"
+ #line 3665 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 5091 "Python/generated_cases.c.h"
+ #line 5119 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
- #line 3672 "Python/bytecodes.c"
+ #line 3670 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 5098 "Python/generated_cases.c.h"
+ #line 5126 "Python/generated_cases.c.h"
}
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index 64923e61fa4590..ce2384ee2e4833 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -35,6 +35,7 @@
#define _BINARY_OP_ADD_UNICODE 313
#define _LOAD_LOCALS 314
#define _LOAD_FROM_DICT_OR_GLOBALS 315
+#define IS_NONE 316
#ifndef NEED_OPCODE_METADATA
extern int _PyOpcode_num_popped(int opcode, int oparg, bool jump);
@@ -328,10 +329,10 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
return 1;
case POP_JUMP_IF_TRUE:
return 1;
- case POP_JUMP_IF_NOT_NONE:
- return 1;
case POP_JUMP_IF_NONE:
return 1;
+ case POP_JUMP_IF_NOT_NONE:
+ return 1;
case JUMP_BACKWARD_NO_INTERRUPT:
return 0;
case GET_LEN:
@@ -772,10 +773,10 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
return 0;
case POP_JUMP_IF_TRUE:
return 0;
- case POP_JUMP_IF_NOT_NONE:
- return 0;
case POP_JUMP_IF_NONE:
return 0;
+ case POP_JUMP_IF_NOT_NONE:
+ return 0;
case JUMP_BACKWARD_NO_INTERRUPT:
return 0;
case GET_LEN:
@@ -1104,8 +1105,8 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[512] = {
[ENTER_EXECUTOR] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_JUMP_FLAG },
[POP_JUMP_IF_FALSE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_JUMP_FLAG },
[POP_JUMP_IF_TRUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_JUMP_FLAG },
- [POP_JUMP_IF_NOT_NONE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_JUMP_FLAG },
[POP_JUMP_IF_NONE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_JUMP_FLAG },
+ [POP_JUMP_IF_NOT_NONE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_JUMP_FLAG },
[JUMP_BACKWARD_NO_INTERRUPT] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_JUMP_FLAG },
[GET_LEN] = { true, INSTR_FMT_IX, 0 },
[MATCH_CLASS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
@@ -1310,6 +1311,7 @@ const char * const _PyOpcode_uop_name[512] = {
[313] = "_BINARY_OP_ADD_UNICODE",
[314] = "_LOAD_LOCALS",
[315] = "_LOAD_FROM_DICT_OR_GLOBALS",
+ [316] = "IS_NONE",
};
#endif // NEED_OPCODE_METADATA
#endif
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy