https://github.com/python/cpython/commit/6e6855950a1891713369a6cdc84670c38d9388f0
commit: 6e6855950a1891713369a6cdc84670c38d9388f0
branch: 3.12
author: Donghee Na <[email protected]>
committer: corona10 <[email protected]>
date: 2024-08-23T01:37:40+09:00
summary:
[3.12] gh-123083: Fix a potential use-after-free in ``STORE_ATTR_WITH… (#123237)
[3.12] gh-123083: Fix a potential use-after-free in ``STORE_ATTR_WITH_HINT``
(gh-123092)
(cherry picked from commit 297f2e093ec95800ae2184330b8408c875523467)
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2024-08-17-17-26-25.gh-issue-123083.9xWLJ-.rst
M Lib/test/test_dict.py
M Python/bytecodes.c
M Python/generated_cases.c.h
diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py
index fbc6ce8282de3c..dfe17d4724cdda 100644
--- a/Lib/test/test_dict.py
+++ b/Lib/test/test_dict.py
@@ -1476,6 +1476,24 @@ def test_dict_items_result_gc_reversed(self):
gc.collect()
self.assertTrue(gc.is_tracked(next(it)))
+ def test_store_evilattr(self):
+ class EvilAttr:
+ def __init__(self, d):
+ self.d = d
+
+ def __del__(self):
+ if 'attr' in self.d:
+ del self.d['attr']
+ gc.collect()
+
+ class Obj:
+ pass
+
+ obj = Obj()
+ obj.__dict__ = {}
+ for _ in range(10):
+ obj.attr = EvilAttr(obj.__dict__)
+
def test_str_nonstr(self):
# cpython uses a different lookup function if the dict only contains
# `str` keys. Make sure the unoptimized path is used when a non-`str`
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2024-08-17-17-26-25.gh-issue-123083.9xWLJ-.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2024-08-17-17-26-25.gh-issue-123083.9xWLJ-.rst
new file mode 100644
index 00000000000000..edc3f1ab6a8e17
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2024-08-17-17-26-25.gh-issue-123083.9xWLJ-.rst
@@ -0,0 +1 @@
+Fix a potential use-after-free in ``STORE_ATTR_WITH_HINT``.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index e17b2294c24d50..b307edd57dff56 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -1999,14 +1999,15 @@ dummy_func(
new_version = _PyDict_NotifyEvent(tstate->interp,
PyDict_EVENT_MODIFIED, dict, name, value);
ep->me_value = value;
}
- Py_DECREF(old_value);
- STAT_INC(STORE_ATTR, hit);
/* Ensure dict is GC tracked if it needs to be */
if (!_PyObject_GC_IS_TRACKED(dict) &&
_PyObject_GC_MAY_BE_TRACKED(value)) {
_PyObject_GC_TRACK(dict);
}
- /* PEP 509 */
- dict->ma_version_tag = new_version;
+ dict->ma_version_tag = new_version; // PEP 509
+ // old_value should be DECREFed after GC track checking is done,
if not, it could raise a segmentation fault,
+ // when dict only holds the strong reference to value in
ep->me_value.
+ Py_DECREF(old_value);
+ STAT_INC(STORE_ATTR, hit);
Py_DECREF(owner);
}
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index a23cbd52ec3cc9..bbaf589e2ef82c 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -2762,16 +2762,17 @@
new_version = _PyDict_NotifyEvent(tstate->interp,
PyDict_EVENT_MODIFIED, dict, name, value);
ep->me_value = value;
}
- Py_DECREF(old_value);
- STAT_INC(STORE_ATTR, hit);
/* Ensure dict is GC tracked if it needs to be */
if (!_PyObject_GC_IS_TRACKED(dict) &&
_PyObject_GC_MAY_BE_TRACKED(value)) {
_PyObject_GC_TRACK(dict);
}
- /* PEP 509 */
- dict->ma_version_tag = new_version;
+ dict->ma_version_tag = new_version; // PEP 509
+ // old_value should be DECREFed after GC track checking is done,
if not, it could raise a segmentation fault,
+ // when dict only holds the strong reference to value in
ep->me_value.
+ Py_DECREF(old_value);
+ STAT_INC(STORE_ATTR, hit);
Py_DECREF(owner);
- #line 2775 "Python/generated_cases.c.h"
+ #line 2776 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2782,7 +2783,7 @@
PyObject *value = stack_pointer[-2];
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 2014 "Python/bytecodes.c"
+ #line 2015 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2792,7 +2793,7 @@
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
- #line 2796 "Python/generated_cases.c.h"
+ #line 2797 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2804,7 +2805,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2033 "Python/bytecodes.c"
+ #line 2034 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2817,12 +2818,12 @@
#endif /* ENABLE_SPECIALIZATION */
assert((oparg >> 4) <= Py_GE);
res = PyObject_RichCompare(left, right, oparg>>4);
- #line 2821 "Python/generated_cases.c.h"
+ #line 2822 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2046 "Python/bytecodes.c"
+ #line 2047 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2826 "Python/generated_cases.c.h"
+ #line 2827 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2833,7 +2834,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2050 "Python/bytecodes.c"
+ #line 2051 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2844,7 +2845,7 @@
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2848 "Python/generated_cases.c.h"
+ #line 2849 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2855,7 +2856,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2064 "Python/bytecodes.c"
+ #line 2065 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyLong_CheckExact(right), COMPARE_OP);
DEOPT_IF(!_PyLong_IsCompact((PyLongObject *)left), COMPARE_OP);
@@ -2870,7 +2871,7 @@
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2874 "Python/generated_cases.c.h"
+ #line 2875 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2881,7 +2882,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2082 "Python/bytecodes.c"
+ #line 2083 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2893,7 +2894,7 @@
assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) ==
COMPARISON_EQUALS);
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
- #line 2897 "Python/generated_cases.c.h"
+ #line 2898 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2904,14 +2905,14 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2096 "Python/bytecodes.c"
+ #line 2097 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 2910 "Python/generated_cases.c.h"
+ #line 2911 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2098 "Python/bytecodes.c"
+ #line 2099 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 2915 "Python/generated_cases.c.h"
+ #line 2916 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2921,15 +2922,15 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2102 "Python/bytecodes.c"
+ #line 2103 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 2927 "Python/generated_cases.c.h"
+ #line 2928 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2104 "Python/bytecodes.c"
+ #line 2105 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
- #line 2933 "Python/generated_cases.c.h"
+ #line 2934 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2940,12 +2941,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2109 "Python/bytecodes.c"
+ #line 2110 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 2946 "Python/generated_cases.c.h"
+ #line 2947 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2111 "Python/bytecodes.c"
+ #line 2112 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -2953,10 +2954,10 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 2957 "Python/generated_cases.c.h"
+ #line 2958 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2119 "Python/bytecodes.c"
+ #line 2120 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -2965,7 +2966,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 2969 "Python/generated_cases.c.h"
+ #line 2970 "Python/generated_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
DISPATCH();
@@ -2975,21 +2976,21 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2130 "Python/bytecodes.c"
+ #line 2131 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 2982 "Python/generated_cases.c.h"
+ #line 2983 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2133 "Python/bytecodes.c"
+ #line 2134 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 2989 "Python/generated_cases.c.h"
+ #line 2990 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2138 "Python/bytecodes.c"
+ #line 2139 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 2993 "Python/generated_cases.c.h"
+ #line 2994 "Python/generated_cases.c.h"
stack_pointer[-1] = b;
DISPATCH();
}
@@ -2998,15 +2999,15 @@
PyObject *fromlist = stack_pointer[-1];
PyObject *level = stack_pointer[-2];
PyObject *res;
- #line 2142 "Python/bytecodes.c"
+ #line 2143 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_name(tstate, frame, name, fromlist, level);
- #line 3005 "Python/generated_cases.c.h"
+ #line 3006 "Python/generated_cases.c.h"
Py_DECREF(level);
Py_DECREF(fromlist);
- #line 2145 "Python/bytecodes.c"
+ #line 2146 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 3010 "Python/generated_cases.c.h"
+ #line 3011 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3015,29 +3016,29 @@
TARGET(IMPORT_FROM) {
PyObject *from = stack_pointer[-1];
PyObject *res;
- #line 2149 "Python/bytecodes.c"
+ #line 2150 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- #line 3023 "Python/generated_cases.c.h"
+ #line 3024 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
}
TARGET(JUMP_FORWARD) {
- #line 2155 "Python/bytecodes.c"
+ #line 2156 "Python/bytecodes.c"
JUMPBY(oparg);
- #line 3032 "Python/generated_cases.c.h"
+ #line 3033 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(JUMP_BACKWARD) {
PREDICTED(JUMP_BACKWARD);
- #line 2159 "Python/bytecodes.c"
+ #line 2160 "Python/bytecodes.c"
assert(oparg < INSTR_OFFSET());
JUMPBY(-oparg);
- #line 3041 "Python/generated_cases.c.h"
+ #line 3042 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
@@ -3045,15 +3046,15 @@
TARGET(POP_JUMP_IF_FALSE) {
PREDICTED(POP_JUMP_IF_FALSE);
PyObject *cond = stack_pointer[-1];
- #line 2165 "Python/bytecodes.c"
+ #line 2166 "Python/bytecodes.c"
if (Py_IsFalse(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsTrue(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3055 "Python/generated_cases.c.h"
+ #line 3056 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2171 "Python/bytecodes.c"
+ #line 2172 "Python/bytecodes.c"
if (err == 0) {
JUMPBY(oparg);
}
@@ -3061,22 +3062,22 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3065 "Python/generated_cases.c.h"
+ #line 3066 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_TRUE) {
PyObject *cond = stack_pointer[-1];
- #line 2181 "Python/bytecodes.c"
+ #line 2182 "Python/bytecodes.c"
if (Py_IsTrue(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsFalse(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3078 "Python/generated_cases.c.h"
+ #line 3079 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2187 "Python/bytecodes.c"
+ #line 2188 "Python/bytecodes.c"
if (err > 0) {
JUMPBY(oparg);
}
@@ -3084,63 +3085,63 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3088 "Python/generated_cases.c.h"
+ #line 3089 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NOT_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2197 "Python/bytecodes.c"
+ #line 2198 "Python/bytecodes.c"
if (!Py_IsNone(value)) {
- #line 3097 "Python/generated_cases.c.h"
+ #line 3098 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2199 "Python/bytecodes.c"
+ #line 2200 "Python/bytecodes.c"
JUMPBY(oparg);
}
- #line 3102 "Python/generated_cases.c.h"
+ #line 3103 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2204 "Python/bytecodes.c"
+ #line 2205 "Python/bytecodes.c"
if (Py_IsNone(value)) {
JUMPBY(oparg);
}
else {
- #line 3114 "Python/generated_cases.c.h"
+ #line 3115 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2209 "Python/bytecodes.c"
+ #line 2210 "Python/bytecodes.c"
}
- #line 3118 "Python/generated_cases.c.h"
+ #line 3119 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
- #line 2213 "Python/bytecodes.c"
+ #line 2214 "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 3131 "Python/generated_cases.c.h"
+ #line 3132 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(GET_LEN) {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2222 "Python/bytecodes.c"
+ #line 2223 "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 3144 "Python/generated_cases.c.h"
+ #line 3145 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3151,16 +3152,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2230 "Python/bytecodes.c"
+ #line 2231 "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 3160 "Python/generated_cases.c.h"
+ #line 3161 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2235 "Python/bytecodes.c"
+ #line 2236 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -3168,7 +3169,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 3172 "Python/generated_cases.c.h"
+ #line 3173 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3177,10 +3178,10 @@
TARGET(MATCH_MAPPING) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2245 "Python/bytecodes.c"
+ #line 2246 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 3184 "Python/generated_cases.c.h"
+ #line 3185 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3190,10 +3191,10 @@
TARGET(MATCH_SEQUENCE) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2251 "Python/bytecodes.c"
+ #line 2252 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 3197 "Python/generated_cases.c.h"
+ #line 3198 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3204,11 +3205,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2257 "Python/bytecodes.c"
+ #line 2258 "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 3212 "Python/generated_cases.c.h"
+ #line 3213 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3217,14 +3218,14 @@
TARGET(GET_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2263 "Python/bytecodes.c"
+ #line 2264 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3224 "Python/generated_cases.c.h"
+ #line 3225 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2266 "Python/bytecodes.c"
+ #line 2267 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3228 "Python/generated_cases.c.h"
+ #line 3229 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3232,7 +3233,7 @@
TARGET(GET_YIELD_FROM_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2270 "Python/bytecodes.c"
+ #line 2271 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -3255,11 +3256,11 @@
if (iter == NULL) {
goto error;
}
- #line 3259 "Python/generated_cases.c.h"
+ #line 3260 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2293 "Python/bytecodes.c"
+ #line 2294 "Python/bytecodes.c"
}
- #line 3263 "Python/generated_cases.c.h"
+ #line 3264 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
PREDICT(LOAD_CONST);
DISPATCH();
@@ -3270,7 +3271,7 @@
static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache
size");
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2312 "Python/bytecodes.c"
+ #line 2313 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3301,7 +3302,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3305 "Python/generated_cases.c.h"
+ #line 3306 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3309,7 +3310,7 @@
}
TARGET(INSTRUMENTED_FOR_ITER) {
- #line 2345 "Python/bytecodes.c"
+ #line 2346 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr-1;
_Py_CODEUNIT *target;
PyObject *iter = TOP();
@@ -3335,14 +3336,14 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg +
1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3339 "Python/generated_cases.c.h"
+ #line 3340 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(FOR_ITER_LIST) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2373 "Python/bytecodes.c"
+ #line 2374 "Python/bytecodes.c"
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
_PyListIterObject *it = (_PyListIterObject *)iter;
STAT_INC(FOR_ITER, hit);
@@ -3362,7 +3363,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3366 "Python/generated_cases.c.h"
+ #line 3367 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3372,7 +3373,7 @@
TARGET(FOR_ITER_TUPLE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2395 "Python/bytecodes.c"
+ #line 2396 "Python/bytecodes.c"
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3392,7 +3393,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3396 "Python/generated_cases.c.h"
+ #line 3397 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3402,7 +3403,7 @@
TARGET(FOR_ITER_RANGE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2417 "Python/bytecodes.c"
+ #line 2418 "Python/bytecodes.c"
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3420,7 +3421,7 @@
if (next == NULL) {
goto error;
}
- #line 3424 "Python/generated_cases.c.h"
+ #line 3425 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3429,7 +3430,7 @@
TARGET(FOR_ITER_GEN) {
PyObject *iter = stack_pointer[-1];
- #line 2437 "Python/bytecodes.c"
+ #line 2438 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3445,14 +3446,14 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3449 "Python/generated_cases.c.h"
+ #line 3450 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2455 "Python/bytecodes.c"
+ #line 2456 "Python/bytecodes.c"
PyObject *enter = _PyObject_LookupSpecial(mgr,
&_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
@@ -3475,16 +3476,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3479 "Python/generated_cases.c.h"
+ #line 3480 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2478 "Python/bytecodes.c"
+ #line 2479 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3488 "Python/generated_cases.c.h"
+ #line 3489 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3496,7 +3497,7 @@
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2488 "Python/bytecodes.c"
+ #line 2489 "Python/bytecodes.c"
/* pop the context manager, push its __exit__ and the
* value returned from calling its __enter__
*/
@@ -3522,16 +3523,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3526 "Python/generated_cases.c.h"
+ #line 3527 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2514 "Python/bytecodes.c"
+ #line 2515 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3535 "Python/generated_cases.c.h"
+ #line 3536 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3543,7 +3544,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2523 "Python/bytecodes.c"
+ #line 2524 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -3569,7 +3570,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3573 "Python/generated_cases.c.h"
+ #line 3574 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3578,7 +3579,7 @@
TARGET(PUSH_EXC_INFO) {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2551 "Python/bytecodes.c"
+ #line 2552 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -3588,7 +3589,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3592 "Python/generated_cases.c.h"
+ #line 3593 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3602,7 +3603,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 2563 "Python/bytecodes.c"
+ #line 2564 "Python/bytecodes.c"
/* Cached method object */
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3619,7 +3620,7 @@
assert(_PyType_HasFeature(Py_TYPE(res2),
Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
assert(oparg & 1);
- #line 3623 "Python/generated_cases.c.h"
+ #line 3624 "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; }
@@ -3633,7 +3634,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2582 "Python/bytecodes.c"
+ #line 2583 "Python/bytecodes.c"
PyTypeObject *self_cls = Py_TYPE(self);
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
assert(self_cls->tp_dictoffset == 0);
@@ -3643,7 +3644,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3647 "Python/generated_cases.c.h"
+ #line 3648 "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; }
@@ -3657,7 +3658,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2594 "Python/bytecodes.c"
+ #line 2595 "Python/bytecodes.c"
PyTypeObject *self_cls = Py_TYPE(self);
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
Py_ssize_t dictoffset = self_cls->tp_dictoffset;
@@ -3671,7 +3672,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3675 "Python/generated_cases.c.h"
+ #line 3676 "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; }
@@ -3680,16 +3681,16 @@
}
TARGET(KW_NAMES) {
- #line 2610 "Python/bytecodes.c"
+ #line 2611 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg < PyTuple_GET_SIZE(frame->f_code->co_consts));
kwnames = GETITEM(frame->f_code->co_consts, oparg);
- #line 3688 "Python/generated_cases.c.h"
+ #line 3689 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_CALL) {
- #line 2616 "Python/bytecodes.c"
+ #line 2617 "Python/bytecodes.c"
int is_meth = PEEK(oparg+2) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -3702,7 +3703,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3706 "Python/generated_cases.c.h"
+ #line 3707 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3712,7 +3713,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2661 "Python/bytecodes.c"
+ #line 2662 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3794,7 +3795,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3798 "Python/generated_cases.c.h"
+ #line 3799 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3806,7 +3807,7 @@
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2749 "Python/bytecodes.c"
+ #line 2750 "Python/bytecodes.c"
DEOPT_IF(method != NULL, CALL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
STAT_INC(CALL, hit);
@@ -3816,7 +3817,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 3820 "Python/generated_cases.c.h"
+ #line 3821 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -3825,7 +3826,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2761 "Python/bytecodes.c"
+ #line 2762 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3851,7 +3852,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3855 "Python/generated_cases.c.h"
+ #line 3856 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -3859,7 +3860,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2789 "Python/bytecodes.c"
+ #line 2790 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3895,7 +3896,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3899 "Python/generated_cases.c.h"
+ #line 3900 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -3903,7 +3904,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2827 "Python/bytecodes.c"
+ #line 2828 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3913,7 +3914,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 3917 "Python/generated_cases.c.h"
+ #line 3918 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3926,7 +3927,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2839 "Python/bytecodes.c"
+ #line 2840 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3937,7 +3938,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3941 "Python/generated_cases.c.h"
+ #line 3942 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3951,7 +3952,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2853 "Python/bytecodes.c"
+ #line 2854 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3962,7 +3963,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3966 "Python/generated_cases.c.h"
+ #line 3967 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3976,7 +3977,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2867 "Python/bytecodes.c"
+ #line 2868 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3998,7 +3999,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4002 "Python/generated_cases.c.h"
+ #line 4003 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4012,7 +4013,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2892 "Python/bytecodes.c"
+ #line 2893 "Python/bytecodes.c"
/* Builtin METH_O functions */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4040,7 +4041,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4044 "Python/generated_cases.c.h"
+ #line 4045 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4054,7 +4055,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2923 "Python/bytecodes.c"
+ #line 2924 "Python/bytecodes.c"
/* Builtin METH_FASTCALL functions, without keywords */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4086,7 +4087,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 4090 "Python/generated_cases.c.h"
+ #line 4091 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4100,7 +4101,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2958 "Python/bytecodes.c"
+ #line 2959 "Python/bytecodes.c"
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
int is_meth = method != NULL;
int total_args = oparg;
@@ -4132,7 +4133,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4136 "Python/generated_cases.c.h"
+ #line 4137 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4146,7 +4147,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2993 "Python/bytecodes.c"
+ #line 2994 "Python/bytecodes.c"
assert(kwnames == NULL);
/* len(o) */
int is_meth = method != NULL;
@@ -4171,7 +4172,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4175 "Python/generated_cases.c.h"
+ #line 4176 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4184,7 +4185,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3020 "Python/bytecodes.c"
+ #line 3021 "Python/bytecodes.c"
assert(kwnames == NULL);
/* isinstance(o, o2) */
int is_meth = method != NULL;
@@ -4211,7 +4212,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4215 "Python/generated_cases.c.h"
+ #line 4216 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4223,7 +4224,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *self = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 3050 "Python/bytecodes.c"
+ #line 3051 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
PyInterpreterState *interp = _PyInterpreterState_GET();
@@ -4241,14 +4242,14 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4245 "Python/generated_cases.c.h"
+ #line 4246 "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 3070 "Python/bytecodes.c"
+ #line 3071 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4279,7 +4280,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4283 "Python/generated_cases.c.h"
+ #line 4284 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4292,7 +4293,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3104 "Python/bytecodes.c"
+ #line 3105 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4321,7 +4322,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4325 "Python/generated_cases.c.h"
+ #line 4326 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4334,7 +4335,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3136 "Python/bytecodes.c"
+ #line 3137 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 0 || oparg == 1);
int is_meth = method != NULL;
@@ -4363,7 +4364,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4367 "Python/generated_cases.c.h"
+ #line 4368 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4376,7 +4377,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3168 "Python/bytecodes.c"
+ #line 3169 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4404,7 +4405,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4408 "Python/generated_cases.c.h"
+ #line 4409 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4414,9 +4415,9 @@
}
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
- #line 3199 "Python/bytecodes.c"
+ #line 3200 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4420 "Python/generated_cases.c.h"
+ #line 4421 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4425,7 +4426,7 @@
PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
PyObject *result;
- #line 3203 "Python/bytecodes.c"
+ #line 3204 "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));
@@ -4487,14 +4488,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4491 "Python/generated_cases.c.h"
+ #line 4492 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
- #line 3265 "Python/bytecodes.c"
+ #line 3266 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto
pop_3_error; }
- #line 4498 "Python/generated_cases.c.h"
+ #line 4499 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4509,7 +4510,7 @@
PyObject *kwdefaults = (oparg & 0x02) ? stack_pointer[-(1 +
((oparg & 0x08) ? 1 : 0) + ((oparg & 0x04) ? 1 : 0) + ((oparg & 0x02) ? 1 :
0))] : NULL;
PyObject *defaults = (oparg & 0x01) ? stack_pointer[-(1 + ((oparg
& 0x08) ? 1 : 0) + ((oparg & 0x04) ? 1 : 0) + ((oparg & 0x02) ? 1 : 0) +
((oparg & 0x01) ? 1 : 0))] : NULL;
PyObject *func;
- #line 3275 "Python/bytecodes.c"
+ #line 3276 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -4538,14 +4539,14 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4542 "Python/generated_cases.c.h"
+ #line 4543 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 0x01) ? 1 : 0) + ((oparg & 0x02) ? 1 : 0) +
((oparg & 0x04) ? 1 : 0) + ((oparg & 0x08) ? 1 : 0));
stack_pointer[-1] = func;
DISPATCH();
}
TARGET(RETURN_GENERATOR) {
- #line 3306 "Python/bytecodes.c"
+ #line 3307 "Python/bytecodes.c"
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4566,7 +4567,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4570 "Python/generated_cases.c.h"
+ #line 4571 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4574,15 +4575,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3329 "Python/bytecodes.c"
+ #line 3330 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4580 "Python/generated_cases.c.h"
+ #line 4581 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3331 "Python/bytecodes.c"
+ #line 3332 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto
pop_2_error; }
- #line 4586 "Python/generated_cases.c.h"
+ #line 4587 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4593,7 +4594,7 @@
PyObject *fmt_spec = ((oparg & FVS_MASK) == FVS_HAVE_SPEC) ?
stack_pointer[-((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0))] : NULL;
PyObject *value = stack_pointer[-(1 + (((oparg & FVS_MASK) ==
FVS_HAVE_SPEC) ? 1 : 0))];
PyObject *result;
- #line 3335 "Python/bytecodes.c"
+ #line 3336 "Python/bytecodes.c"
/* Handles f-string value formatting. */
PyObject *(*conv_fn)(PyObject *);
int which_conversion = oparg & FVC_MASK;
@@ -4628,7 +4629,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 4632 "Python/generated_cases.c.h"
+ #line 4633 "Python/generated_cases.c.h"
STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0));
stack_pointer[-1] = result;
DISPATCH();
@@ -4637,10 +4638,10 @@
TARGET(COPY) {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3372 "Python/bytecodes.c"
+ #line 3373 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4644 "Python/generated_cases.c.h"
+ #line 4645 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4652,7 +4653,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3377 "Python/bytecodes.c"
+ #line 3378 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4667,12 +4668,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4671 "Python/generated_cases.c.h"
+ #line 4672 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3392 "Python/bytecodes.c"
+ #line 3393 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4676 "Python/generated_cases.c.h"
+ #line 4677 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4682,16 +4683,16 @@
TARGET(SWAP) {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3397 "Python/bytecodes.c"
+ #line 3398 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4688 "Python/generated_cases.c.h"
+ #line 4689 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
}
TARGET(INSTRUMENTED_INSTRUCTION) {
- #line 3401 "Python/bytecodes.c"
+ #line 3402 "Python/bytecodes.c"
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, next_instr-1);
if (next_opcode < 0) goto error;
@@ -4703,26 +4704,26 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 4707 "Python/generated_cases.c.h"
+ #line 4708 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
- #line 3415 "Python/bytecodes.c"
+ #line 3416 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg,
PY_MONITORING_EVENT_JUMP);
- #line 4713 "Python/generated_cases.c.h"
+ #line 4714 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
- #line 3419 "Python/bytecodes.c"
+ #line 3420 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr-oparg,
PY_MONITORING_EVENT_JUMP);
- #line 4720 "Python/generated_cases.c.h"
+ #line 4721 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
- #line 3424 "Python/bytecodes.c"
+ #line 3425 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4731,12 +4732,12 @@
assert(err == 0 || err == 1);
int offset = err*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset,
PY_MONITORING_EVENT_BRANCH);
- #line 4735 "Python/generated_cases.c.h"
+ #line 4736 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
- #line 3435 "Python/bytecodes.c"
+ #line 3436 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4745,12 +4746,12 @@
assert(err == 0 || err == 1);
int offset = (1-err)*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset,
PY_MONITORING_EVENT_BRANCH);
- #line 4749 "Python/generated_cases.c.h"
+ #line 4750 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
- #line 3446 "Python/bytecodes.c"
+ #line 3447 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4762,12 +4763,12 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset,
PY_MONITORING_EVENT_BRANCH);
- #line 4766 "Python/generated_cases.c.h"
+ #line 4767 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
- #line 3460 "Python/bytecodes.c"
+ #line 3461 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4779,30 +4780,30 @@
offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset,
PY_MONITORING_EVENT_BRANCH);
- #line 4783 "Python/generated_cases.c.h"
+ #line 4784 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(EXTENDED_ARG) {
- #line 3474 "Python/bytecodes.c"
+ #line 3475 "Python/bytecodes.c"
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 4794 "Python/generated_cases.c.h"
+ #line 4795 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
- #line 3482 "Python/bytecodes.c"
+ #line 3483 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 4801 "Python/generated_cases.c.h"
+ #line 4802 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
- #line 3487 "Python/bytecodes.c"
+ #line 3488 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 4808 "Python/generated_cases.c.h"
+ #line 4809 "Python/generated_cases.c.h"
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
