[Python-checkins] gh-103865: add monitoring support to LOAD_SUPER_ATTR (#103866)
carljm
webhook-mailer at python.org
Tue May 16 12:29:08 EDT 2023
https://github.com/python/cpython/commit/f40890b124a330b589c8093127be1274e15dbd7f
commit: f40890b124a330b589c8093127be1274e15dbd7f
branch: main
author: Carl Meyer <carl at oddbird.net>
committer: carljm <carl at oddbird.net>
date: 2023-05-16T10:29:00-06:00
summary:
gh-103865: add monitoring support to LOAD_SUPER_ATTR (#103866)
files:
M Include/internal/pycore_opcode.h
M Include/opcode.h
M Lib/opcode.py
M Lib/test/test_monitoring.py
M Python/bytecodes.c
M Python/compile.c
M Python/generated_cases.c.h
M Python/instrumentation.c
M Python/opcode_metadata.h
M Python/opcode_targets.h
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index c2fa5692dbe4..15d96503830f 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -138,6 +138,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
[INSTRUMENTED_JUMP_BACKWARD] = INSTRUMENTED_JUMP_BACKWARD,
[INSTRUMENTED_JUMP_FORWARD] = INSTRUMENTED_JUMP_FORWARD,
[INSTRUMENTED_LINE] = INSTRUMENTED_LINE,
+ [INSTRUMENTED_LOAD_SUPER_ATTR] = INSTRUMENTED_LOAD_SUPER_ATTR,
[INSTRUMENTED_POP_JUMP_IF_FALSE] = INSTRUMENTED_POP_JUMP_IF_FALSE,
[INSTRUMENTED_POP_JUMP_IF_NONE] = INSTRUMENTED_POP_JUMP_IF_NONE,
[INSTRUMENTED_POP_JUMP_IF_NOT_NONE] = INSTRUMENTED_POP_JUMP_IF_NOT_NONE,
@@ -481,7 +482,7 @@ static const char *const _PyOpcode_OpName[267] = {
[234] = "<234>",
[235] = "<235>",
[236] = "<236>",
- [237] = "<237>",
+ [INSTRUMENTED_LOAD_SUPER_ATTR] = "INSTRUMENTED_LOAD_SUPER_ATTR",
[INSTRUMENTED_POP_JUMP_IF_NONE] = "INSTRUMENTED_POP_JUMP_IF_NONE",
[INSTRUMENTED_POP_JUMP_IF_NOT_NONE] = "INSTRUMENTED_POP_JUMP_IF_NOT_NONE",
[INSTRUMENTED_RESUME] = "INSTRUMENTED_RESUME",
@@ -577,7 +578,6 @@ static const char *const _PyOpcode_OpName[267] = {
case 234: \
case 235: \
case 236: \
- case 237: \
case 255: \
;
diff --git a/Include/opcode.h b/Include/opcode.h
index dea7687c39da..9806511ba428 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -120,7 +120,8 @@ extern "C" {
#define CALL_INTRINSIC_2 174
#define LOAD_FROM_DICT_OR_GLOBALS 175
#define LOAD_FROM_DICT_OR_DEREF 176
-#define MIN_INSTRUMENTED_OPCODE 238
+#define MIN_INSTRUMENTED_OPCODE 237
+#define INSTRUMENTED_LOAD_SUPER_ATTR 237
#define INSTRUMENTED_POP_JUMP_IF_NONE 238
#define INSTRUMENTED_POP_JUMP_IF_NOT_NONE 239
#define INSTRUMENTED_RESUME 240
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 97d0a654a03a..6bb2f1c140b1 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -233,8 +233,9 @@ def pseudo_op(name, op, real_ops):
hasfree.append(176)
# Instrumented instructions
-MIN_INSTRUMENTED_OPCODE = 238
+MIN_INSTRUMENTED_OPCODE = 237
+def_op('INSTRUMENTED_LOAD_SUPER_ATTR', 237)
def_op('INSTRUMENTED_POP_JUMP_IF_NONE', 238)
def_op('INSTRUMENTED_POP_JUMP_IF_NOT_NONE', 239)
def_op('INSTRUMENTED_RESUME', 240)
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
index 06e54fa2965f..46b817d74f09 100644
--- a/Lib/test/test_monitoring.py
+++ b/Lib/test/test_monitoring.py
@@ -1,9 +1,11 @@
"""Test suite for the sys.monitoring."""
import collections
+import dis
import functools
import operator
import sys
+import textwrap
import types
import unittest
@@ -506,7 +508,7 @@ def test_lines_single(self):
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
start = LineMonitoringTest.test_lines_single.__code__.co_firstlineno
- self.assertEqual(events, [start+7, 14, start+8])
+ self.assertEqual(events, [start+7, 16, start+8])
finally:
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
@@ -524,7 +526,7 @@ def test_lines_loop(self):
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
start = LineMonitoringTest.test_lines_loop.__code__.co_firstlineno
- self.assertEqual(events, [start+7, 21, 22, 21, 22, 21, start+8])
+ self.assertEqual(events, [start+7, 23, 24, 23, 24, 23, start+8])
finally:
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
@@ -546,7 +548,7 @@ def test_lines_two(self):
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
sys.monitoring.register_callback(TEST_TOOL2, E.LINE, None)
start = LineMonitoringTest.test_lines_two.__code__.co_firstlineno
- expected = [start+10, 14, start+11]
+ expected = [start+10, 16, start+11]
self.assertEqual(events, expected)
self.assertEqual(events2, expected)
finally:
@@ -1177,6 +1179,221 @@ def func():
('return', None),
('line', 'check_events', 11)])
+class TestLoadSuperAttr(CheckEvents):
+ RECORDERS = CallRecorder, LineRecorder, CRaiseRecorder, CReturnRecorder
+
+ def _exec(self, co):
+ d = {}
+ exec(co, d, d)
+ return d
+
+ def _exec_super(self, codestr, optimized=False):
+ # The compiler checks for statically visible shadowing of the name
+ # `super`, and declines to emit `LOAD_SUPER_ATTR` if shadowing is found.
+ # So inserting `super = super` prevents the compiler from emitting
+ # `LOAD_SUPER_ATTR`, and allows us to test that monitoring events for
+ # `LOAD_SUPER_ATTR` are equivalent to those we'd get from the
+ # un-optimized `LOAD_GLOBAL super; CALL; LOAD_ATTR` form.
+ assignment = "x = 1" if optimized else "super = super"
+ codestr = f"{assignment}\n{textwrap.dedent(codestr)}"
+ co = compile(codestr, "<string>", "exec")
+ # validate that we really do have a LOAD_SUPER_ATTR, only when optimized
+ self.assertEqual(self._has_load_super_attr(co), optimized)
+ return self._exec(co)
+
+ def _has_load_super_attr(self, co):
+ has = any(instr.opname == "LOAD_SUPER_ATTR" for instr in dis.get_instructions(co))
+ if not has:
+ has = any(
+ isinstance(c, types.CodeType) and self._has_load_super_attr(c)
+ for c in co.co_consts
+ )
+ return has
+
+ def _super_method_call(self, optimized=False):
+ codestr = """
+ class A:
+ def method(self, x):
+ return x
+
+ class B(A):
+ def method(self, x):
+ return super(
+ ).method(
+ x
+ )
+
+ b = B()
+ def f():
+ return b.method(1)
+ """
+ d = self._exec_super(codestr, optimized)
+ expected = [
+ ('line', 'check_events', 10),
+ ('call', 'f', sys.monitoring.MISSING),
+ ('line', 'f', 1),
+ ('call', 'method', d["b"]),
+ ('line', 'method', 1),
+ ('call', 'super', sys.monitoring.MISSING),
+ ('C return', 'super', sys.monitoring.MISSING),
+ ('line', 'method', 2),
+ ('line', 'method', 3),
+ ('line', 'method', 2),
+ ('call', 'method', 1),
+ ('line', 'method', 1),
+ ('line', 'method', 1),
+ ('line', 'check_events', 11),
+ ('call', 'set_events', 2),
+ ]
+ return d["f"], expected
+
+ def test_method_call(self):
+ nonopt_func, nonopt_expected = self._super_method_call(optimized=False)
+ opt_func, opt_expected = self._super_method_call(optimized=True)
+
+ self.check_events(nonopt_func, recorders=self.RECORDERS, expected=nonopt_expected)
+ self.check_events(opt_func, recorders=self.RECORDERS, expected=opt_expected)
+
+ def _super_method_call_error(self, optimized=False):
+ codestr = """
+ class A:
+ def method(self, x):
+ return x
+
+ class B(A):
+ def method(self, x):
+ return super(
+ x,
+ self,
+ ).method(
+ x
+ )
+
+ b = B()
+ def f():
+ try:
+ return b.method(1)
+ except TypeError:
+ pass
+ else:
+ assert False, "should have raised TypeError"
+ """
+ d = self._exec_super(codestr, optimized)
+ expected = [
+ ('line', 'check_events', 10),
+ ('call', 'f', sys.monitoring.MISSING),
+ ('line', 'f', 1),
+ ('line', 'f', 2),
+ ('call', 'method', d["b"]),
+ ('line', 'method', 1),
+ ('line', 'method', 2),
+ ('line', 'method', 3),
+ ('line', 'method', 1),
+ ('call', 'super', 1),
+ ('C raise', 'super', 1),
+ ('line', 'f', 3),
+ ('line', 'f', 4),
+ ('line', 'check_events', 11),
+ ('call', 'set_events', 2),
+ ]
+ return d["f"], expected
+
+ def test_method_call_error(self):
+ nonopt_func, nonopt_expected = self._super_method_call_error(optimized=False)
+ opt_func, opt_expected = self._super_method_call_error(optimized=True)
+
+ self.check_events(nonopt_func, recorders=self.RECORDERS, expected=nonopt_expected)
+ self.check_events(opt_func, recorders=self.RECORDERS, expected=opt_expected)
+
+ def _super_attr(self, optimized=False):
+ codestr = """
+ class A:
+ x = 1
+
+ class B(A):
+ def method(self):
+ return super(
+ ).x
+
+ b = B()
+ def f():
+ return b.method()
+ """
+ d = self._exec_super(codestr, optimized)
+ expected = [
+ ('line', 'check_events', 10),
+ ('call', 'f', sys.monitoring.MISSING),
+ ('line', 'f', 1),
+ ('call', 'method', d["b"]),
+ ('line', 'method', 1),
+ ('call', 'super', sys.monitoring.MISSING),
+ ('C return', 'super', sys.monitoring.MISSING),
+ ('line', 'method', 2),
+ ('line', 'method', 1),
+ ('line', 'check_events', 11),
+ ('call', 'set_events', 2)
+ ]
+ return d["f"], expected
+
+ def test_attr(self):
+ nonopt_func, nonopt_expected = self._super_attr(optimized=False)
+ opt_func, opt_expected = self._super_attr(optimized=True)
+
+ self.check_events(nonopt_func, recorders=self.RECORDERS, expected=nonopt_expected)
+ self.check_events(opt_func, recorders=self.RECORDERS, expected=opt_expected)
+
+ def test_vs_other_type_call(self):
+ code_template = textwrap.dedent("""
+ class C:
+ def method(self):
+ return {cls}().__repr__{call}
+ c = C()
+ def f():
+ return c.method()
+ """)
+
+ def get_expected(name, call_method, ns):
+ repr_arg = 0 if name == "int" else sys.monitoring.MISSING
+ return [
+ ('line', 'check_events', 10),
+ ('call', 'f', sys.monitoring.MISSING),
+ ('line', 'f', 1),
+ ('call', 'method', ns["c"]),
+ ('line', 'method', 1),
+ ('call', name, sys.monitoring.MISSING),
+ ('C return', name, sys.monitoring.MISSING),
+ *(
+ [
+ ('call', '__repr__', repr_arg),
+ ('C return', '__repr__', repr_arg),
+ ] if call_method else []
+ ),
+ ('line', 'check_events', 11),
+ ('call', 'set_events', 2),
+ ]
+
+ for call_method in [True, False]:
+ with self.subTest(call_method=call_method):
+ call_str = "()" if call_method else ""
+ code_super = code_template.format(cls="super", call=call_str)
+ code_int = code_template.format(cls="int", call=call_str)
+ co_super = compile(code_super, '<string>', 'exec')
+ self.assertTrue(self._has_load_super_attr(co_super))
+ ns_super = self._exec(co_super)
+ ns_int = self._exec(code_int)
+
+ self.check_events(
+ ns_super["f"],
+ recorders=self.RECORDERS,
+ expected=get_expected("super", call_method, ns_super)
+ )
+ self.check_events(
+ ns_int["f"],
+ recorders=self.RECORDERS,
+ expected=get_expected("int", call_method, ns_int)
+ )
+
+
class TestSetGetEvents(MonitoringTestBase, unittest.TestCase):
def test_global(self):
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 1b8820f94dbc..b38d37a7773b 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -1582,6 +1582,14 @@ dummy_func(
PREDICT(JUMP_BACKWARD);
}
+ inst(INSTRUMENTED_LOAD_SUPER_ATTR, (unused/9, unused, unused, unused -- unused if (oparg & 1), unused)) {
+ _PySuperAttrCache *cache = (_PySuperAttrCache *)next_instr;
+ // cancel out the decrement that will happen in LOAD_SUPER_ATTR; we
+ // don't want to specialize instrumented instructions
+ INCREMENT_ADAPTIVE_COUNTER(cache->counter);
+ GO_TO_INSTRUCTION(LOAD_SUPER_ATTR);
+ }
+
family(load_super_attr, INLINE_CACHE_ENTRIES_LOAD_SUPER_ATTR) = {
LOAD_SUPER_ATTR,
LOAD_SUPER_ATTR_ATTR,
@@ -1602,10 +1610,34 @@ dummy_func(
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
+ if (opcode == INSTRUMENTED_LOAD_SUPER_ATTR) {
+ PyObject *arg = oparg & 2 ? class : &_PyInstrumentation_MISSING;
+ int err = _Py_call_instrumentation_2args(
+ tstate, PY_MONITORING_EVENT_CALL,
+ frame, next_instr-1, global_super, arg);
+ ERROR_IF(err, error);
+ }
+
// we make no attempt to optimize here; specializations should
// handle any case whose performance we care about
PyObject *stack[] = {class, self};
PyObject *super = PyObject_Vectorcall(global_super, stack, oparg & 2, NULL);
+ if (opcode == INSTRUMENTED_LOAD_SUPER_ATTR) {
+ PyObject *arg = oparg & 2 ? class : &_PyInstrumentation_MISSING;
+ if (super == NULL) {
+ _Py_call_instrumentation_exc2(
+ tstate, PY_MONITORING_EVENT_C_RAISE,
+ frame, next_instr-1, global_super, arg);
+ }
+ else {
+ int err = _Py_call_instrumentation_2args(
+ tstate, PY_MONITORING_EVENT_C_RETURN,
+ frame, next_instr-1, global_super, arg);
+ if (err < 0) {
+ Py_CLEAR(super);
+ }
+ }
+ }
DECREF_INPUTS();
ERROR_IF(super == NULL, error);
res = PyObject_GetAttr(super, name);
diff --git a/Python/compile.c b/Python/compile.c
index 7adbf9208989..60c845a821b6 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4846,6 +4846,8 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e)
int opcode = asdl_seq_LEN(meth->v.Attribute.value->v.Call.args) ?
LOAD_SUPER_METHOD : LOAD_ZERO_SUPER_METHOD;
ADDOP_NAME(c, loc, opcode, meth->v.Attribute.attr, names);
+ loc = update_start_location_to_match_attr(c, loc, meth);
+ ADDOP(c, loc, NOP);
} else {
VISIT(c, expr, meth->v.Attribute.value);
loc = update_start_location_to_match_attr(c, loc, meth);
@@ -6079,6 +6081,8 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
int opcode = asdl_seq_LEN(e->v.Attribute.value->v.Call.args) ?
LOAD_SUPER_ATTR : LOAD_ZERO_SUPER_ATTR;
ADDOP_NAME(c, loc, opcode, e->v.Attribute.attr, names);
+ loc = update_start_location_to_match_attr(c, loc, e);
+ ADDOP(c, loc, NOP);
return SUCCESS;
}
VISIT(c, expr, e->v.Attribute.value);
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index fa4ff5ccee78..bd1f2988e2f1 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -2291,6 +2291,16 @@
DISPATCH();
}
+ TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) {
+ #line 1586 "Python/bytecodes.c"
+ _PySuperAttrCache *cache = (_PySuperAttrCache *)next_instr;
+ // cancel out the decrement that will happen in LOAD_SUPER_ATTR; we
+ // don't want to specialize instrumented instructions
+ INCREMENT_ADAPTIVE_COUNTER(cache->counter);
+ GO_TO_INSTRUCTION(LOAD_SUPER_ATTR);
+ #line 2302 "Python/generated_cases.c.h"
+ }
+
TARGET(LOAD_SUPER_ATTR) {
PREDICTED(LOAD_SUPER_ATTR);
static_assert(INLINE_CACHE_ENTRIES_LOAD_SUPER_ATTR == 1, "incorrect cache size");
@@ -2299,7 +2309,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1592 "Python/bytecodes.c"
+ #line 1600 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2);
int load_method = oparg & 1;
#if ENABLE_SPECIALIZATION
@@ -2313,20 +2323,44 @@
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
+ if (opcode == INSTRUMENTED_LOAD_SUPER_ATTR) {
+ PyObject *arg = oparg & 2 ? class : &_PyInstrumentation_MISSING;
+ int err = _Py_call_instrumentation_2args(
+ tstate, PY_MONITORING_EVENT_CALL,
+ frame, next_instr-1, global_super, arg);
+ if (err) goto pop_3_error;
+ }
+
// we make no attempt to optimize here; specializations should
// handle any case whose performance we care about
PyObject *stack[] = {class, self};
PyObject *super = PyObject_Vectorcall(global_super, stack, oparg & 2, NULL);
- #line 2321 "Python/generated_cases.c.h"
+ if (opcode == INSTRUMENTED_LOAD_SUPER_ATTR) {
+ PyObject *arg = oparg & 2 ? class : &_PyInstrumentation_MISSING;
+ if (super == NULL) {
+ _Py_call_instrumentation_exc2(
+ tstate, PY_MONITORING_EVENT_C_RAISE,
+ frame, next_instr-1, global_super, arg);
+ }
+ else {
+ int err = _Py_call_instrumentation_2args(
+ tstate, PY_MONITORING_EVENT_C_RETURN,
+ frame, next_instr-1, global_super, arg);
+ if (err < 0) {
+ Py_CLEAR(super);
+ }
+ }
+ }
+ #line 2355 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1610 "Python/bytecodes.c"
+ #line 1642 "Python/bytecodes.c"
if (super == NULL) goto pop_3_error;
res = PyObject_GetAttr(super, name);
Py_DECREF(super);
if (res == NULL) goto pop_3_error;
- #line 2330 "Python/generated_cases.c.h"
+ #line 2364 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2341,20 +2375,20 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1617 "Python/bytecodes.c"
+ #line 1649 "Python/bytecodes.c"
assert(!(oparg & 1));
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
STAT_INC(LOAD_SUPER_ATTR, hit);
PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2);
res = _PySuper_Lookup((PyTypeObject *)class, self, name, NULL);
- #line 2352 "Python/generated_cases.c.h"
+ #line 2386 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1624 "Python/bytecodes.c"
+ #line 1656 "Python/bytecodes.c"
if (res == NULL) goto pop_3_error;
- #line 2358 "Python/generated_cases.c.h"
+ #line 2392 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2369,7 +2403,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2;
PyObject *res;
- #line 1628 "Python/bytecodes.c"
+ #line 1660 "Python/bytecodes.c"
assert(oparg & 1);
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -2390,7 +2424,7 @@
res = res2;
res2 = NULL;
}
- #line 2394 "Python/generated_cases.c.h"
+ #line 2428 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
stack_pointer[-2] = res2;
@@ -2404,7 +2438,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *res2 = NULL;
PyObject *res;
- #line 1665 "Python/bytecodes.c"
+ #line 1697 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2438,9 +2472,9 @@
NULL | meth | arg1 | ... | argN
*/
- #line 2442 "Python/generated_cases.c.h"
+ #line 2476 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1699 "Python/bytecodes.c"
+ #line 1731 "Python/bytecodes.c"
if (meth == NULL) goto pop_1_error;
res2 = NULL;
res = meth;
@@ -2449,12 +2483,12 @@
else {
/* Classic, pushes one value. */
res = PyObject_GetAttr(owner, name);
- #line 2453 "Python/generated_cases.c.h"
+ #line 2487 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1708 "Python/bytecodes.c"
+ #line 1740 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
}
- #line 2458 "Python/generated_cases.c.h"
+ #line 2492 "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; }
@@ -2468,7 +2502,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1713 "Python/bytecodes.c"
+ #line 1745 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2481,7 +2515,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2485 "Python/generated_cases.c.h"
+ #line 2519 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2496,7 +2530,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1729 "Python/bytecodes.c"
+ #line 1761 "Python/bytecodes.c"
DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
assert(dict != NULL);
@@ -2509,7 +2543,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2513 "Python/generated_cases.c.h"
+ #line 2547 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2524,7 +2558,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1745 "Python/bytecodes.c"
+ #line 1777 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2551,7 +2585,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2555 "Python/generated_cases.c.h"
+ #line 2589 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2566,7 +2600,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1775 "Python/bytecodes.c"
+ #line 1807 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2576,7 +2610,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2580 "Python/generated_cases.c.h"
+ #line 2614 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2591,7 +2625,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 1788 "Python/bytecodes.c"
+ #line 1820 "Python/bytecodes.c"
DEOPT_IF(!PyType_Check(cls), LOAD_ATTR);
DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version,
@@ -2603,7 +2637,7 @@
res = descr;
assert(res != NULL);
Py_INCREF(res);
- #line 2607 "Python/generated_cases.c.h"
+ #line 2641 "Python/generated_cases.c.h"
Py_DECREF(cls);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2617,7 +2651,7 @@
uint32_t type_version = read_u32(&next_instr[1].cache);
uint32_t func_version = read_u32(&next_instr[3].cache);
PyObject *fget = read_obj(&next_instr[5].cache);
- #line 1803 "Python/bytecodes.c"
+ #line 1835 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
@@ -2641,7 +2675,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2645 "Python/generated_cases.c.h"
+ #line 2679 "Python/generated_cases.c.h"
}
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
@@ -2649,7 +2683,7 @@
uint32_t type_version = read_u32(&next_instr[1].cache);
uint32_t func_version = read_u32(&next_instr[3].cache);
PyObject *getattribute = read_obj(&next_instr[5].cache);
- #line 1829 "Python/bytecodes.c"
+ #line 1861 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR);
@@ -2675,7 +2709,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2679 "Python/generated_cases.c.h"
+ #line 2713 "Python/generated_cases.c.h"
}
TARGET(STORE_ATTR_INSTANCE_VALUE) {
@@ -2683,7 +2717,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 1857 "Python/bytecodes.c"
+ #line 1889 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2701,7 +2735,7 @@
Py_DECREF(old_value);
}
Py_DECREF(owner);
- #line 2705 "Python/generated_cases.c.h"
+ #line 2739 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2712,7 +2746,7 @@
PyObject *value = stack_pointer[-2];
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t hint = read_u16(&next_instr[3].cache);
- #line 1877 "Python/bytecodes.c"
+ #line 1909 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2751,7 +2785,7 @@
/* PEP 509 */
dict->ma_version_tag = new_version;
Py_DECREF(owner);
- #line 2755 "Python/generated_cases.c.h"
+ #line 2789 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2762,7 +2796,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 1918 "Python/bytecodes.c"
+ #line 1950 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2772,7 +2806,7 @@
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
- #line 2776 "Python/generated_cases.c.h"
+ #line 2810 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2784,7 +2818,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 1937 "Python/bytecodes.c"
+ #line 1969 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2797,12 +2831,12 @@
#endif /* ENABLE_SPECIALIZATION */
assert((oparg >> 4) <= Py_GE);
res = PyObject_RichCompare(left, right, oparg>>4);
- #line 2801 "Python/generated_cases.c.h"
+ #line 2835 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 1950 "Python/bytecodes.c"
+ #line 1982 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2806 "Python/generated_cases.c.h"
+ #line 2840 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2813,7 +2847,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 1954 "Python/bytecodes.c"
+ #line 1986 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2825,7 +2859,7 @@
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
Py_INCREF(res);
- #line 2829 "Python/generated_cases.c.h"
+ #line 2863 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2836,7 +2870,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 1969 "Python/bytecodes.c"
+ #line 2001 "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);
@@ -2852,7 +2886,7 @@
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
Py_INCREF(res);
- #line 2856 "Python/generated_cases.c.h"
+ #line 2890 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2863,7 +2897,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 1988 "Python/bytecodes.c"
+ #line 2020 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2876,7 +2910,7 @@
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
Py_INCREF(res);
- #line 2880 "Python/generated_cases.c.h"
+ #line 2914 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2887,14 +2921,14 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2003 "Python/bytecodes.c"
+ #line 2035 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 2893 "Python/generated_cases.c.h"
+ #line 2927 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2005 "Python/bytecodes.c"
+ #line 2037 "Python/bytecodes.c"
b = Py_NewRef(res ? Py_True : Py_False);
- #line 2898 "Python/generated_cases.c.h"
+ #line 2932 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2904,15 +2938,15 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2009 "Python/bytecodes.c"
+ #line 2041 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 2910 "Python/generated_cases.c.h"
+ #line 2944 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2011 "Python/bytecodes.c"
+ #line 2043 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = Py_NewRef((res^oparg) ? Py_True : Py_False);
- #line 2916 "Python/generated_cases.c.h"
+ #line 2950 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2923,12 +2957,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2016 "Python/bytecodes.c"
+ #line 2048 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 2929 "Python/generated_cases.c.h"
+ #line 2963 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2018 "Python/bytecodes.c"
+ #line 2050 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -2936,10 +2970,10 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 2940 "Python/generated_cases.c.h"
+ #line 2974 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2026 "Python/bytecodes.c"
+ #line 2058 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -2948,7 +2982,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 2952 "Python/generated_cases.c.h"
+ #line 2986 "Python/generated_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
DISPATCH();
@@ -2958,21 +2992,21 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2037 "Python/bytecodes.c"
+ #line 2069 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 2965 "Python/generated_cases.c.h"
+ #line 2999 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2040 "Python/bytecodes.c"
+ #line 2072 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 2972 "Python/generated_cases.c.h"
+ #line 3006 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2045 "Python/bytecodes.c"
+ #line 2077 "Python/bytecodes.c"
b = Py_NewRef(res ? Py_True : Py_False);
- #line 2976 "Python/generated_cases.c.h"
+ #line 3010 "Python/generated_cases.c.h"
stack_pointer[-1] = b;
DISPATCH();
}
@@ -2981,15 +3015,15 @@
PyObject *fromlist = stack_pointer[-1];
PyObject *level = stack_pointer[-2];
PyObject *res;
- #line 2049 "Python/bytecodes.c"
+ #line 2081 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_name(tstate, frame, name, fromlist, level);
- #line 2988 "Python/generated_cases.c.h"
+ #line 3022 "Python/generated_cases.c.h"
Py_DECREF(level);
Py_DECREF(fromlist);
- #line 2052 "Python/bytecodes.c"
+ #line 2084 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2993 "Python/generated_cases.c.h"
+ #line 3027 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -2998,29 +3032,29 @@
TARGET(IMPORT_FROM) {
PyObject *from = stack_pointer[-1];
PyObject *res;
- #line 2056 "Python/bytecodes.c"
+ #line 2088 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- #line 3006 "Python/generated_cases.c.h"
+ #line 3040 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
}
TARGET(JUMP_FORWARD) {
- #line 2062 "Python/bytecodes.c"
+ #line 2094 "Python/bytecodes.c"
JUMPBY(oparg);
- #line 3015 "Python/generated_cases.c.h"
+ #line 3049 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(JUMP_BACKWARD) {
PREDICTED(JUMP_BACKWARD);
- #line 2066 "Python/bytecodes.c"
+ #line 2098 "Python/bytecodes.c"
assert(oparg < INSTR_OFFSET());
JUMPBY(-oparg);
- #line 3024 "Python/generated_cases.c.h"
+ #line 3058 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
@@ -3028,7 +3062,7 @@
TARGET(POP_JUMP_IF_FALSE) {
PREDICTED(POP_JUMP_IF_FALSE);
PyObject *cond = stack_pointer[-1];
- #line 2072 "Python/bytecodes.c"
+ #line 2104 "Python/bytecodes.c"
if (Py_IsTrue(cond)) {
_Py_DECREF_NO_DEALLOC(cond);
}
@@ -3038,9 +3072,9 @@
}
else {
int err = PyObject_IsTrue(cond);
- #line 3042 "Python/generated_cases.c.h"
+ #line 3076 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2082 "Python/bytecodes.c"
+ #line 2114 "Python/bytecodes.c"
if (err == 0) {
JUMPBY(oparg);
}
@@ -3048,14 +3082,14 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3052 "Python/generated_cases.c.h"
+ #line 3086 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_TRUE) {
PyObject *cond = stack_pointer[-1];
- #line 2092 "Python/bytecodes.c"
+ #line 2124 "Python/bytecodes.c"
if (Py_IsFalse(cond)) {
_Py_DECREF_NO_DEALLOC(cond);
}
@@ -3065,9 +3099,9 @@
}
else {
int err = PyObject_IsTrue(cond);
- #line 3069 "Python/generated_cases.c.h"
+ #line 3103 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2102 "Python/bytecodes.c"
+ #line 2134 "Python/bytecodes.c"
if (err > 0) {
JUMPBY(oparg);
}
@@ -3075,67 +3109,67 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3079 "Python/generated_cases.c.h"
+ #line 3113 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NOT_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2112 "Python/bytecodes.c"
+ #line 2144 "Python/bytecodes.c"
if (!Py_IsNone(value)) {
- #line 3088 "Python/generated_cases.c.h"
+ #line 3122 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2114 "Python/bytecodes.c"
+ #line 2146 "Python/bytecodes.c"
JUMPBY(oparg);
}
else {
_Py_DECREF_NO_DEALLOC(value);
}
- #line 3096 "Python/generated_cases.c.h"
+ #line 3130 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2122 "Python/bytecodes.c"
+ #line 2154 "Python/bytecodes.c"
if (Py_IsNone(value)) {
_Py_DECREF_NO_DEALLOC(value);
JUMPBY(oparg);
}
else {
- #line 3109 "Python/generated_cases.c.h"
+ #line 3143 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2128 "Python/bytecodes.c"
+ #line 2160 "Python/bytecodes.c"
}
- #line 3113 "Python/generated_cases.c.h"
+ #line 3147 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
- #line 2132 "Python/bytecodes.c"
+ #line 2164 "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 3126 "Python/generated_cases.c.h"
+ #line 3160 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(GET_LEN) {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2141 "Python/bytecodes.c"
+ #line 2173 "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 3139 "Python/generated_cases.c.h"
+ #line 3173 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3146,16 +3180,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2149 "Python/bytecodes.c"
+ #line 2181 "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 3155 "Python/generated_cases.c.h"
+ #line 3189 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2154 "Python/bytecodes.c"
+ #line 2186 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -3163,7 +3197,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_NewRef(Py_None); // Failure!
}
- #line 3167 "Python/generated_cases.c.h"
+ #line 3201 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3172,10 +3206,10 @@
TARGET(MATCH_MAPPING) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2164 "Python/bytecodes.c"
+ #line 2196 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = Py_NewRef(match ? Py_True : Py_False);
- #line 3179 "Python/generated_cases.c.h"
+ #line 3213 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3185,10 +3219,10 @@
TARGET(MATCH_SEQUENCE) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2170 "Python/bytecodes.c"
+ #line 2202 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = Py_NewRef(match ? Py_True : Py_False);
- #line 3192 "Python/generated_cases.c.h"
+ #line 3226 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3199,11 +3233,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2176 "Python/bytecodes.c"
+ #line 2208 "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 3207 "Python/generated_cases.c.h"
+ #line 3241 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3212,14 +3246,14 @@
TARGET(GET_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2182 "Python/bytecodes.c"
+ #line 2214 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3219 "Python/generated_cases.c.h"
+ #line 3253 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2185 "Python/bytecodes.c"
+ #line 2217 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3223 "Python/generated_cases.c.h"
+ #line 3257 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3227,7 +3261,7 @@
TARGET(GET_YIELD_FROM_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2189 "Python/bytecodes.c"
+ #line 2221 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -3250,11 +3284,11 @@
if (iter == NULL) {
goto error;
}
- #line 3254 "Python/generated_cases.c.h"
+ #line 3288 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2212 "Python/bytecodes.c"
+ #line 2244 "Python/bytecodes.c"
}
- #line 3258 "Python/generated_cases.c.h"
+ #line 3292 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
PREDICT(LOAD_CONST);
DISPATCH();
@@ -3265,7 +3299,7 @@
static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2231 "Python/bytecodes.c"
+ #line 2263 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3296,7 +3330,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3300 "Python/generated_cases.c.h"
+ #line 3334 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3304,7 +3338,7 @@
}
TARGET(INSTRUMENTED_FOR_ITER) {
- #line 2264 "Python/bytecodes.c"
+ #line 2296 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr-1;
_Py_CODEUNIT *target;
PyObject *iter = TOP();
@@ -3330,14 +3364,14 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3334 "Python/generated_cases.c.h"
+ #line 3368 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(FOR_ITER_LIST) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2292 "Python/bytecodes.c"
+ #line 2324 "Python/bytecodes.c"
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
_PyListIterObject *it = (_PyListIterObject *)iter;
STAT_INC(FOR_ITER, hit);
@@ -3357,7 +3391,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3361 "Python/generated_cases.c.h"
+ #line 3395 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3367,7 +3401,7 @@
TARGET(FOR_ITER_TUPLE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2314 "Python/bytecodes.c"
+ #line 2346 "Python/bytecodes.c"
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3387,7 +3421,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3391 "Python/generated_cases.c.h"
+ #line 3425 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3397,7 +3431,7 @@
TARGET(FOR_ITER_RANGE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2336 "Python/bytecodes.c"
+ #line 2368 "Python/bytecodes.c"
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3415,7 +3449,7 @@
if (next == NULL) {
goto error;
}
- #line 3419 "Python/generated_cases.c.h"
+ #line 3453 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3424,7 +3458,7 @@
TARGET(FOR_ITER_GEN) {
PyObject *iter = stack_pointer[-1];
- #line 2356 "Python/bytecodes.c"
+ #line 2388 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3440,14 +3474,14 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3444 "Python/generated_cases.c.h"
+ #line 3478 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2374 "Python/bytecodes.c"
+ #line 2406 "Python/bytecodes.c"
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
@@ -3470,16 +3504,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3474 "Python/generated_cases.c.h"
+ #line 3508 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2397 "Python/bytecodes.c"
+ #line 2429 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3483 "Python/generated_cases.c.h"
+ #line 3517 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3491,7 +3525,7 @@
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2407 "Python/bytecodes.c"
+ #line 2439 "Python/bytecodes.c"
/* pop the context manager, push its __exit__ and the
* value returned from calling its __enter__
*/
@@ -3517,16 +3551,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3521 "Python/generated_cases.c.h"
+ #line 3555 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2433 "Python/bytecodes.c"
+ #line 2465 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3530 "Python/generated_cases.c.h"
+ #line 3564 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3538,7 +3572,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2442 "Python/bytecodes.c"
+ #line 2474 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -3559,7 +3593,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3563 "Python/generated_cases.c.h"
+ #line 3597 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3568,7 +3602,7 @@
TARGET(PUSH_EXC_INFO) {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2465 "Python/bytecodes.c"
+ #line 2497 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -3578,7 +3612,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3582 "Python/generated_cases.c.h"
+ #line 3616 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3592,7 +3626,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 2477 "Python/bytecodes.c"
+ #line 2509 "Python/bytecodes.c"
/* Cached method object */
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3609,7 +3643,7 @@
assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
assert(oparg & 1);
- #line 3613 "Python/generated_cases.c.h"
+ #line 3647 "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; }
@@ -3623,7 +3657,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2496 "Python/bytecodes.c"
+ #line 2528 "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);
@@ -3633,7 +3667,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3637 "Python/generated_cases.c.h"
+ #line 3671 "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; }
@@ -3647,7 +3681,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2508 "Python/bytecodes.c"
+ #line 2540 "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;
@@ -3661,7 +3695,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3665 "Python/generated_cases.c.h"
+ #line 3699 "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; }
@@ -3670,16 +3704,16 @@
}
TARGET(KW_NAMES) {
- #line 2524 "Python/bytecodes.c"
+ #line 2556 "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 3678 "Python/generated_cases.c.h"
+ #line 3712 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_CALL) {
- #line 2530 "Python/bytecodes.c"
+ #line 2562 "Python/bytecodes.c"
int is_meth = PEEK(oparg+2) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -3692,7 +3726,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3696 "Python/generated_cases.c.h"
+ #line 3730 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3702,7 +3736,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2575 "Python/bytecodes.c"
+ #line 2607 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3784,7 +3818,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3788 "Python/generated_cases.c.h"
+ #line 3822 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3796,7 +3830,7 @@
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2663 "Python/bytecodes.c"
+ #line 2695 "Python/bytecodes.c"
DEOPT_IF(method != NULL, CALL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
STAT_INC(CALL, hit);
@@ -3806,7 +3840,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 3810 "Python/generated_cases.c.h"
+ #line 3844 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -3815,7 +3849,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2675 "Python/bytecodes.c"
+ #line 2707 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3841,7 +3875,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3845 "Python/generated_cases.c.h"
+ #line 3879 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -3849,7 +3883,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2703 "Python/bytecodes.c"
+ #line 2735 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3885,7 +3919,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3889 "Python/generated_cases.c.h"
+ #line 3923 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -3893,7 +3927,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2741 "Python/bytecodes.c"
+ #line 2773 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3903,7 +3937,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 3907 "Python/generated_cases.c.h"
+ #line 3941 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3916,7 +3950,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2753 "Python/bytecodes.c"
+ #line 2785 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3927,7 +3961,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3931 "Python/generated_cases.c.h"
+ #line 3965 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3941,7 +3975,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2767 "Python/bytecodes.c"
+ #line 2799 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3952,7 +3986,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3956 "Python/generated_cases.c.h"
+ #line 3990 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3966,7 +4000,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2781 "Python/bytecodes.c"
+ #line 2813 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3988,7 +4022,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3992 "Python/generated_cases.c.h"
+ #line 4026 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4002,7 +4036,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2806 "Python/bytecodes.c"
+ #line 2838 "Python/bytecodes.c"
/* Builtin METH_O functions */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4030,7 +4064,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4034 "Python/generated_cases.c.h"
+ #line 4068 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4044,7 +4078,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2837 "Python/bytecodes.c"
+ #line 2869 "Python/bytecodes.c"
/* Builtin METH_FASTCALL functions, without keywords */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4076,7 +4110,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 4080 "Python/generated_cases.c.h"
+ #line 4114 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4090,7 +4124,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2872 "Python/bytecodes.c"
+ #line 2904 "Python/bytecodes.c"
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
int is_meth = method != NULL;
int total_args = oparg;
@@ -4122,7 +4156,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4126 "Python/generated_cases.c.h"
+ #line 4160 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4136,7 +4170,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2907 "Python/bytecodes.c"
+ #line 2939 "Python/bytecodes.c"
assert(kwnames == NULL);
/* len(o) */
int is_meth = method != NULL;
@@ -4161,7 +4195,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4165 "Python/generated_cases.c.h"
+ #line 4199 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4174,7 +4208,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2934 "Python/bytecodes.c"
+ #line 2966 "Python/bytecodes.c"
assert(kwnames == NULL);
/* isinstance(o, o2) */
int is_meth = method != NULL;
@@ -4201,7 +4235,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4205 "Python/generated_cases.c.h"
+ #line 4239 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4213,7 +4247,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *self = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2964 "Python/bytecodes.c"
+ #line 2996 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
assert(method != NULL);
@@ -4231,14 +4265,14 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4235 "Python/generated_cases.c.h"
+ #line 4269 "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 2984 "Python/bytecodes.c"
+ #line 3016 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4269,7 +4303,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4273 "Python/generated_cases.c.h"
+ #line 4307 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4282,7 +4316,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3018 "Python/bytecodes.c"
+ #line 3050 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4311,7 +4345,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4315 "Python/generated_cases.c.h"
+ #line 4349 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4324,7 +4358,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3050 "Python/bytecodes.c"
+ #line 3082 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 0 || oparg == 1);
int is_meth = method != NULL;
@@ -4353,7 +4387,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4357 "Python/generated_cases.c.h"
+ #line 4391 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4366,7 +4400,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3082 "Python/bytecodes.c"
+ #line 3114 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4394,7 +4428,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4398 "Python/generated_cases.c.h"
+ #line 4432 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4404,9 +4438,9 @@
}
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
- #line 3113 "Python/bytecodes.c"
+ #line 3145 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4410 "Python/generated_cases.c.h"
+ #line 4444 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4415,7 +4449,7 @@
PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
PyObject *result;
- #line 3117 "Python/bytecodes.c"
+ #line 3149 "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));
@@ -4477,14 +4511,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4481 "Python/generated_cases.c.h"
+ #line 4515 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
- #line 3179 "Python/bytecodes.c"
+ #line 3211 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- #line 4488 "Python/generated_cases.c.h"
+ #line 4522 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4499,7 +4533,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 3189 "Python/bytecodes.c"
+ #line 3221 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -4528,14 +4562,14 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4532 "Python/generated_cases.c.h"
+ #line 4566 "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 3220 "Python/bytecodes.c"
+ #line 3252 "Python/bytecodes.c"
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4556,7 +4590,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4560 "Python/generated_cases.c.h"
+ #line 4594 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4564,15 +4598,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3243 "Python/bytecodes.c"
+ #line 3275 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4570 "Python/generated_cases.c.h"
+ #line 4604 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3245 "Python/bytecodes.c"
+ #line 3277 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 4576 "Python/generated_cases.c.h"
+ #line 4610 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4583,7 +4617,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 3249 "Python/bytecodes.c"
+ #line 3281 "Python/bytecodes.c"
/* Handles f-string value formatting. */
PyObject *(*conv_fn)(PyObject *);
int which_conversion = oparg & FVC_MASK;
@@ -4618,7 +4652,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 4622 "Python/generated_cases.c.h"
+ #line 4656 "Python/generated_cases.c.h"
STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0));
stack_pointer[-1] = result;
DISPATCH();
@@ -4627,10 +4661,10 @@
TARGET(COPY) {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3286 "Python/bytecodes.c"
+ #line 3318 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4634 "Python/generated_cases.c.h"
+ #line 4668 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4642,7 +4676,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3291 "Python/bytecodes.c"
+ #line 3323 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4657,12 +4691,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4661 "Python/generated_cases.c.h"
+ #line 4695 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3306 "Python/bytecodes.c"
+ #line 3338 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4666 "Python/generated_cases.c.h"
+ #line 4700 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4672,16 +4706,16 @@
TARGET(SWAP) {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3311 "Python/bytecodes.c"
+ #line 3343 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4678 "Python/generated_cases.c.h"
+ #line 4712 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
}
TARGET(INSTRUMENTED_INSTRUCTION) {
- #line 3315 "Python/bytecodes.c"
+ #line 3347 "Python/bytecodes.c"
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, next_instr-1);
if (next_opcode < 0) goto error;
@@ -4693,26 +4727,26 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 4697 "Python/generated_cases.c.h"
+ #line 4731 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
- #line 3329 "Python/bytecodes.c"
+ #line 3361 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
- #line 4703 "Python/generated_cases.c.h"
+ #line 4737 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
- #line 3333 "Python/bytecodes.c"
+ #line 3365 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr-oparg, PY_MONITORING_EVENT_JUMP);
- #line 4710 "Python/generated_cases.c.h"
+ #line 4744 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
- #line 3338 "Python/bytecodes.c"
+ #line 3370 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4721,12 +4755,12 @@
assert(err == 0 || err == 1);
int offset = err*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4725 "Python/generated_cases.c.h"
+ #line 4759 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
- #line 3349 "Python/bytecodes.c"
+ #line 3381 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4735,12 +4769,12 @@
assert(err == 0 || err == 1);
int offset = (1-err)*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4739 "Python/generated_cases.c.h"
+ #line 4773 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
- #line 3360 "Python/bytecodes.c"
+ #line 3392 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4753,12 +4787,12 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4757 "Python/generated_cases.c.h"
+ #line 4791 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
- #line 3375 "Python/bytecodes.c"
+ #line 3407 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4771,30 +4805,30 @@
offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4775 "Python/generated_cases.c.h"
+ #line 4809 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(EXTENDED_ARG) {
- #line 3390 "Python/bytecodes.c"
+ #line 3422 "Python/bytecodes.c"
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 4786 "Python/generated_cases.c.h"
+ #line 4820 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
- #line 3398 "Python/bytecodes.c"
+ #line 3430 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 4793 "Python/generated_cases.c.h"
+ #line 4827 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
- #line 3403 "Python/bytecodes.c"
+ #line 3435 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 4800 "Python/generated_cases.c.h"
+ #line 4834 "Python/generated_cases.c.h"
}
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
index 9152744d7c2c..c70668e8295a 100644
--- a/Python/instrumentation.c
+++ b/Python/instrumentation.c
@@ -35,6 +35,8 @@ static const int8_t EVENT_FOR_OPCODE[256] = {
[INSTRUMENTED_CALL] = PY_MONITORING_EVENT_CALL,
[CALL_FUNCTION_EX] = PY_MONITORING_EVENT_CALL,
[INSTRUMENTED_CALL_FUNCTION_EX] = PY_MONITORING_EVENT_CALL,
+ [LOAD_SUPER_ATTR] = PY_MONITORING_EVENT_CALL,
+ [INSTRUMENTED_LOAD_SUPER_ATTR] = PY_MONITORING_EVENT_CALL,
[RESUME] = -1,
[YIELD_VALUE] = PY_MONITORING_EVENT_PY_YIELD,
[INSTRUMENTED_YIELD_VALUE] = PY_MONITORING_EVENT_PY_YIELD,
@@ -74,6 +76,7 @@ static const uint8_t DE_INSTRUMENT[256] = {
[INSTRUMENTED_FOR_ITER] = FOR_ITER,
[INSTRUMENTED_END_FOR] = END_FOR,
[INSTRUMENTED_END_SEND] = END_SEND,
+ [INSTRUMENTED_LOAD_SUPER_ATTR] = LOAD_SUPER_ATTR,
};
static const uint8_t INSTRUMENTED_OPCODES[256] = {
@@ -107,6 +110,8 @@ static const uint8_t INSTRUMENTED_OPCODES[256] = {
[INSTRUMENTED_END_SEND] = INSTRUMENTED_END_SEND,
[FOR_ITER] = INSTRUMENTED_FOR_ITER,
[INSTRUMENTED_FOR_ITER] = INSTRUMENTED_FOR_ITER,
+ [LOAD_SUPER_ATTR] = INSTRUMENTED_LOAD_SUPER_ATTR,
+ [INSTRUMENTED_LOAD_SUPER_ATTR] = INSTRUMENTED_LOAD_SUPER_ATTR,
[INSTRUMENTED_LINE] = INSTRUMENTED_LINE,
[INSTRUMENTED_INSTRUCTION] = INSTRUMENTED_INSTRUCTION,
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index 601ad3874b79..53fbaa3e317e 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -211,6 +211,8 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
return 1;
case MAP_ADD:
return 2;
+ case INSTRUMENTED_LOAD_SUPER_ATTR:
+ return 3;
case LOAD_SUPER_ATTR:
return 3;
case LOAD_SUPER_ATTR_ATTR:
@@ -605,6 +607,8 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
return 0;
case MAP_ADD:
return 0;
+ case INSTRUMENTED_LOAD_SUPER_ATTR:
+ return ((oparg & 1) ? 1 : 0) + 1;
case LOAD_SUPER_ATTR:
return ((oparg & 1) ? 1 : 0) + 1;
case LOAD_SUPER_ATTR_ATTR:
@@ -902,6 +906,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
[DICT_UPDATE] = { true, INSTR_FMT_IB },
[DICT_MERGE] = { true, INSTR_FMT_IB },
[MAP_ADD] = { true, INSTR_FMT_IB },
+ [INSTRUMENTED_LOAD_SUPER_ATTR] = { true, INSTR_FMT_IBC00000000 },
[LOAD_SUPER_ATTR] = { true, INSTR_FMT_IBC },
[LOAD_SUPER_ATTR_ATTR] = { true, INSTR_FMT_IBC },
[LOAD_SUPER_ATTR_METHOD] = { true, INSTR_FMT_IBC },
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index af05a33058f3..3add06362711 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -236,7 +236,7 @@ static void *opcode_targets[256] = {
&&_unknown_opcode,
&&_unknown_opcode,
&&_unknown_opcode,
- &&_unknown_opcode,
+ &&TARGET_INSTRUMENTED_LOAD_SUPER_ATTR,
&&TARGET_INSTRUMENTED_POP_JUMP_IF_NONE,
&&TARGET_INSTRUMENTED_POP_JUMP_IF_NOT_NONE,
&&TARGET_INSTRUMENTED_RESUME,
More information about the Python-checkins
mailing list