diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index fa0e23a6c96939..7e893542422d35 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -1158,6 +1158,14 @@ iterations of the loop.
.. versionadded:: 3.11
+.. opcode:: POSTCALL
+
+ Suffixes :opcode:`CALL`. Logically this is a no op.
+ It exists to enable effective specialization of calls.
+
+ .. versionadded:: 3.11
+
+
.. opcode:: PUSH_NULL
Pushes a ``NULL`` to the stack.
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
index b018dabf9d862f..11e001b1b467a1 100644
--- a/Include/cpython/object.h
+++ b/Include/cpython/object.h
@@ -234,6 +234,7 @@ struct _typeobject {
* by code other than the specializer and interpreter. */
struct _specialization_cache {
PyObject *getitem;
+ PyObject *init;
};
/* The *real* layout of a type object when allocated on the heap */
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 8c868bcd5b5cbe..a925aebb654368 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -82,6 +82,7 @@ typedef struct {
typedef struct {
_Py_CODEUNIT counter;
+ _Py_CODEUNIT type_version[2];
} _PyPrecallCache;
#define INLINE_CACHE_ENTRIES_PRECALL CACHE_ENTRIES(_PyPrecallCache)
diff --git a/Include/internal/pycore_typeobject.h b/Include/internal/pycore_typeobject.h
index c480a3a57b436c..393ea3859bc07e 100644
--- a/Include/internal/pycore_typeobject.h
+++ b/Include/internal/pycore_typeobject.h
@@ -43,6 +43,8 @@ extern PyStatus _PyTypes_InitSlotDefs(void);
extern void _PyStaticType_Dealloc(PyTypeObject *type);
+extern PyObject *_PyObject_New_Vector(PyTypeObject *type,
+ PyObject *const *args, Py_ssize_t nargs, PyObject *kwds);
#ifdef __cplusplus
}
diff --git a/Include/opcode.h b/Include/opcode.h
index ff3ffddda2147f..9e79fd706766bd 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -10,6 +10,7 @@ extern "C" {
#define CACHE 0
#define POP_TOP 1
#define PUSH_NULL 2
+#define POSTCALL 3
#define NOP 9
#define UNARY_POSITIVE 10
#define UNARY_NEGATIVE 11
@@ -114,76 +115,77 @@ extern "C" {
#define PRECALL 166
#define CALL 171
#define KW_NAMES 172
-#define BINARY_OP_ADAPTIVE 3
-#define BINARY_OP_ADD_FLOAT 4
-#define BINARY_OP_ADD_INT 5
-#define BINARY_OP_ADD_UNICODE 6
-#define BINARY_OP_INPLACE_ADD_UNICODE 7
-#define BINARY_OP_MULTIPLY_FLOAT 8
-#define BINARY_OP_MULTIPLY_INT 13
-#define BINARY_OP_SUBTRACT_FLOAT 14
-#define BINARY_OP_SUBTRACT_INT 16
-#define BINARY_SUBSCR_ADAPTIVE 17
-#define BINARY_SUBSCR_DICT 18
-#define BINARY_SUBSCR_GETITEM 19
-#define BINARY_SUBSCR_LIST_INT 20
-#define BINARY_SUBSCR_TUPLE_INT 21
-#define CALL_ADAPTIVE 22
-#define CALL_PY_EXACT_ARGS 23
-#define CALL_PY_WITH_DEFAULTS 24
-#define COMPARE_OP_ADAPTIVE 26
-#define COMPARE_OP_FLOAT_JUMP 27
-#define COMPARE_OP_INT_JUMP 28
-#define COMPARE_OP_STR_JUMP 29
-#define JUMP_BACKWARD_QUICK 34
-#define LOAD_ATTR_ADAPTIVE 38
-#define LOAD_ATTR_INSTANCE_VALUE 39
-#define LOAD_ATTR_MODULE 40
-#define LOAD_ATTR_SLOT 41
-#define LOAD_ATTR_WITH_HINT 42
-#define LOAD_CONST__LOAD_FAST 43
-#define LOAD_FAST__LOAD_CONST 44
-#define LOAD_FAST__LOAD_FAST 45
-#define LOAD_GLOBAL_ADAPTIVE 46
-#define LOAD_GLOBAL_BUILTIN 47
-#define LOAD_GLOBAL_MODULE 48
-#define LOAD_METHOD_ADAPTIVE 55
-#define LOAD_METHOD_CLASS 56
-#define LOAD_METHOD_MODULE 57
-#define LOAD_METHOD_NO_DICT 58
-#define LOAD_METHOD_WITH_DICT 59
-#define LOAD_METHOD_WITH_VALUES 62
-#define PRECALL_ADAPTIVE 63
-#define PRECALL_BOUND_METHOD 64
-#define PRECALL_BUILTIN_CLASS 65
-#define PRECALL_BUILTIN_FAST_WITH_KEYWORDS 66
-#define PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 67
-#define PRECALL_NO_KW_BUILTIN_FAST 72
-#define PRECALL_NO_KW_BUILTIN_O 73
-#define PRECALL_NO_KW_ISINSTANCE 76
-#define PRECALL_NO_KW_LEN 77
-#define PRECALL_NO_KW_LIST_APPEND 78
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST 79
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS 80
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_O 81
-#define PRECALL_NO_KW_STR_1 113
-#define PRECALL_NO_KW_TUPLE_1 121
-#define PRECALL_NO_KW_TYPE_1 127
-#define PRECALL_PYFUNC 141
-#define RESUME_QUICK 143
-#define STORE_ATTR_ADAPTIVE 150
-#define STORE_ATTR_INSTANCE_VALUE 153
-#define STORE_ATTR_SLOT 154
-#define STORE_ATTR_WITH_HINT 158
-#define STORE_FAST__LOAD_FAST 159
-#define STORE_FAST__STORE_FAST 161
-#define STORE_SUBSCR_ADAPTIVE 167
-#define STORE_SUBSCR_DICT 168
-#define STORE_SUBSCR_LIST_INT 169
-#define UNPACK_SEQUENCE_ADAPTIVE 170
-#define UNPACK_SEQUENCE_LIST 173
-#define UNPACK_SEQUENCE_TUPLE 174
-#define UNPACK_SEQUENCE_TWO_TUPLE 175
+#define BINARY_OP_ADAPTIVE 4
+#define BINARY_OP_ADD_FLOAT 5
+#define BINARY_OP_ADD_INT 6
+#define BINARY_OP_ADD_UNICODE 7
+#define BINARY_OP_INPLACE_ADD_UNICODE 8
+#define BINARY_OP_MULTIPLY_FLOAT 13
+#define BINARY_OP_MULTIPLY_INT 14
+#define BINARY_OP_SUBTRACT_FLOAT 16
+#define BINARY_OP_SUBTRACT_INT 17
+#define BINARY_SUBSCR_ADAPTIVE 18
+#define BINARY_SUBSCR_DICT 19
+#define BINARY_SUBSCR_GETITEM 20
+#define BINARY_SUBSCR_LIST_INT 21
+#define BINARY_SUBSCR_TUPLE_INT 22
+#define CALL_ADAPTIVE 23
+#define CALL_PY_EXACT_ARGS 24
+#define CALL_PY_WITH_DEFAULTS 26
+#define COMPARE_OP_ADAPTIVE 27
+#define COMPARE_OP_FLOAT_JUMP 28
+#define COMPARE_OP_INT_JUMP 29
+#define COMPARE_OP_STR_JUMP 34
+#define JUMP_BACKWARD_QUICK 38
+#define LOAD_ATTR_ADAPTIVE 39
+#define LOAD_ATTR_INSTANCE_VALUE 40
+#define LOAD_ATTR_MODULE 41
+#define LOAD_ATTR_SLOT 42
+#define LOAD_ATTR_WITH_HINT 43
+#define LOAD_CONST__LOAD_FAST 44
+#define LOAD_FAST__LOAD_CONST 45
+#define LOAD_FAST__LOAD_FAST 46
+#define LOAD_GLOBAL_ADAPTIVE 47
+#define LOAD_GLOBAL_BUILTIN 48
+#define LOAD_GLOBAL_MODULE 55
+#define LOAD_METHOD_ADAPTIVE 56
+#define LOAD_METHOD_CLASS 57
+#define LOAD_METHOD_MODULE 58
+#define LOAD_METHOD_NO_DICT 59
+#define LOAD_METHOD_WITH_DICT 62
+#define LOAD_METHOD_WITH_VALUES 63
+#define PRECALL_ADAPTIVE 64
+#define PRECALL_BOUND_METHOD 65
+#define PRECALL_BUILTIN_CLASS 66
+#define PRECALL_BUILTIN_FAST_WITH_KEYWORDS 67
+#define PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 72
+#define PRECALL_NO_KW_BUILTIN_FAST 73
+#define PRECALL_NO_KW_BUILTIN_O 76
+#define PRECALL_NO_KW_ISINSTANCE 77
+#define PRECALL_NO_KW_LEN 78
+#define PRECALL_NO_KW_LIST_APPEND 79
+#define PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST 80
+#define PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS 81
+#define PRECALL_NO_KW_METHOD_DESCRIPTOR_O 113
+#define PRECALL_NO_KW_STR_1 121
+#define PRECALL_NO_KW_TUPLE_1 127
+#define PRECALL_NO_KW_TYPE_1 141
+#define PRECALL_PYFUNC 143
+#define PRECALL_PY_CLASS 150
+#define RESUME_QUICK 153
+#define STORE_ATTR_ADAPTIVE 154
+#define STORE_ATTR_INSTANCE_VALUE 158
+#define STORE_ATTR_SLOT 159
+#define STORE_ATTR_WITH_HINT 161
+#define STORE_FAST__LOAD_FAST 167
+#define STORE_FAST__STORE_FAST 168
+#define STORE_SUBSCR_ADAPTIVE 169
+#define STORE_SUBSCR_DICT 170
+#define STORE_SUBSCR_LIST_INT 173
+#define UNPACK_SEQUENCE_ADAPTIVE 174
+#define UNPACK_SEQUENCE_LIST 175
+#define UNPACK_SEQUENCE_TUPLE 176
+#define UNPACK_SEQUENCE_TWO_TUPLE 177
#define DO_TRACING 255
extern const uint8_t _PyOpcode_Caches[256];
@@ -222,7 +224,7 @@ const uint8_t _PyOpcode_Caches[256] = {
[LOAD_GLOBAL] = 5,
[BINARY_OP] = 1,
[LOAD_METHOD] = 10,
- [PRECALL] = 1,
+ [PRECALL] = 3,
[CALL] = 4,
};
@@ -343,6 +345,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
[POP_JUMP_IF_NOT_NONE] = POP_JUMP_IF_NOT_NONE,
[POP_JUMP_IF_TRUE] = POP_JUMP_IF_TRUE,
[POP_TOP] = POP_TOP,
+ [POSTCALL] = POSTCALL,
[PRECALL] = PRECALL,
[PRECALL_ADAPTIVE] = PRECALL,
[PRECALL_BOUND_METHOD] = PRECALL,
@@ -361,6 +364,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
[PRECALL_NO_KW_TUPLE_1] = PRECALL,
[PRECALL_NO_KW_TYPE_1] = PRECALL,
[PRECALL_PYFUNC] = PRECALL,
+ [PRECALL_PY_CLASS] = PRECALL,
[PREP_RERAISE_STAR] = PREP_RERAISE_STAR,
[PRINT_EXPR] = PRINT_EXPR,
[PUSH_EXC_INFO] = PUSH_EXC_INFO,
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 45be177df76a92..04a93bb8450625 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -400,6 +400,7 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.11a6 3490 (remove JUMP_IF_NOT_EXC_MATCH, add CHECK_EXC_MATCH)
# Python 3.11a6 3491 (remove JUMP_IF_NOT_EG_MATCH, add CHECK_EG_MATCH,
# add JUMP_BACKWARD_NO_INTERRUPT, make JUMP_NO_INTERRUPT virtual)
+# Python 3.11a6 3492 (Specialize PRECALL for Python classes)
# Python 3.12 will start with magic number 3500
@@ -414,7 +415,7 @@ def _write_atomic(path, data, mode=0o666):
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.
-MAGIC_NUMBER = (3491).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3492).to_bytes(2, 'little') + b'\r\n'
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
_PYCACHE = '__pycache__'
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 97b580532cb94b..5b97f77a182362 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -60,6 +60,7 @@ def jabs_op(name, op, entries=0):
def_op('CACHE', 0)
def_op('POP_TOP', 1)
def_op('PUSH_NULL', 2)
+def_op('POSTCALL', 3)
def_op('NOP', 9)
def_op('UNARY_POSITIVE', 10)
@@ -191,7 +192,7 @@ def jabs_op(name, op, entries=0):
def_op('SET_UPDATE', 163)
def_op('DICT_MERGE', 164)
def_op('DICT_UPDATE', 165)
-def_op('PRECALL', 166, 1)
+def_op('PRECALL', 166, 3)
def_op('CALL', 171, 4)
def_op('KW_NAMES', 172)
@@ -307,6 +308,7 @@ def jabs_op(name, op, entries=0):
"PRECALL_NO_KW_TUPLE_1",
"PRECALL_NO_KW_TYPE_1",
"PRECALL_PYFUNC",
+ "PRECALL_PY_CLASS",
],
"RESUME": [
"RESUME_QUICK",
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 2f78d42cc724a6..e3d8d4e587601d 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -109,6 +109,7 @@ def _f(a):
LOAD_FAST 0 (a)
PRECALL 1
CALL 1
+ POSTCALL
POP_TOP
%3d LOAD_CONST 1 (1)
@@ -124,6 +125,7 @@ def _f(a):
LOAD_FAST 0
PRECALL 1
CALL 1
+ POSTCALL
POP_TOP
LOAD_CONST 1
RETURN_VALUE
@@ -145,11 +147,12 @@ def bug708901():
%3d PRECALL 2
CALL 2
+ POSTCALL
GET_ITER
- >> FOR_ITER 2 (to 40)
+ >> FOR_ITER 2 (to 46)
STORE_FAST 0 (res)
-%3d JUMP_BACKWARD 3 (to 34)
+%3d JUMP_BACKWARD 3 (to 40)
%3d >> LOAD_CONST 0 (None)
RETURN_VALUE
@@ -176,12 +179,14 @@ def bug1333982(x=[]):
GET_ITER
PRECALL 0
CALL 0
+ POSTCALL
%3d LOAD_CONST 3 (1)
%3d BINARY_OP 0 (+)
PRECALL 0
CALL 0
+ POSTCALL
RAISE_VARARGS 1
""" % (bug1333982.__code__.co_firstlineno,
bug1333982.__code__.co_firstlineno + 1,
@@ -317,6 +322,7 @@ def bug42562():
LOAD_CONST 0 (1)
PRECALL 1
CALL 1
+ POSTCALL
LOAD_NAME 2 (__annotations__)
LOAD_CONST 2 ('y')
STORE_SUBSCR
@@ -328,6 +334,7 @@ def bug42562():
LOAD_CONST 3 (0)
PRECALL 1
CALL 1
+ POSTCALL
STORE_SUBSCR
LOAD_NAME 1 (int)
POP_TOP
@@ -451,6 +458,7 @@ def _tryfinallyconst(b):
LOAD_FAST 1 (b)
PRECALL 0
CALL 0
+ POSTCALL
POP_TOP
RETURN_VALUE
>> PUSH_EXC_INFO
@@ -458,6 +466,7 @@ def _tryfinallyconst(b):
LOAD_FAST 1 (b)
PRECALL 0
CALL 0
+ POSTCALL
POP_TOP
RERAISE 0
>> COPY 3
@@ -481,6 +490,7 @@ def _tryfinallyconst(b):
LOAD_FAST 0 (b)
PRECALL 0
CALL 0
+ POSTCALL
POP_TOP
LOAD_CONST 1 (1)
RETURN_VALUE
@@ -489,6 +499,7 @@ def _tryfinallyconst(b):
LOAD_FAST 0 (b)
PRECALL 0
CALL 0
+ POSTCALL
POP_TOP
RERAISE 0
>> COPY 3
@@ -552,6 +563,7 @@ def foo(x):
GET_ITER
PRECALL 0
CALL 0
+ POSTCALL
RETURN_VALUE
""" % (dis_nested_0,
__file__,
@@ -1161,10 +1173,11 @@ def _prepare_test_cases():
Instruction(opname='BUILD_MAP', opcode=105, arg=0, argval=0, argrepr='', offset=42, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Hello world!', argrepr="'Hello world!'", offset=44, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='PRECALL', opcode=166, arg=7, argval=7, argrepr='', offset=46, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=7, argval=7, argrepr='', offset=50, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=60, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=62, starts_line=8, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=64, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=7, argval=7, argrepr='', offset=54, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=64, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=66, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=68, starts_line=8, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=70, starts_line=None, is_jump_target=False, positions=None),
]
expected_opinfo_f = [
@@ -1187,10 +1200,11 @@ def _prepare_test_cases():
Instruction(opname='LOAD_DEREF', opcode=137, arg=0, argval='c', argrepr='c', offset=42, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_DEREF', opcode=137, arg=1, argval='d', argrepr='d', offset=44, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='PRECALL', opcode=166, arg=4, argval=4, argrepr='', offset=46, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=4, argval=4, argrepr='', offset=50, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=60, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=62, starts_line=6, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=64, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=4, argval=4, argrepr='', offset=54, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=64, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=66, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=68, starts_line=6, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=70, starts_line=None, is_jump_target=False, positions=None),
]
expected_opinfo_inner = [
@@ -1204,10 +1218,11 @@ def _prepare_test_cases():
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='e', argrepr='e', offset=24, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='f', argrepr='f', offset=26, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='PRECALL', opcode=166, arg=6, argval=6, argrepr='', offset=28, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=6, argval=6, argrepr='', offset=32, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=42, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=44, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=46, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=6, argval=6, argrepr='', offset=36, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=46, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=48, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=50, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=52, starts_line=None, is_jump_target=False, positions=None),
]
expected_opinfo_jumpy = [
@@ -1215,133 +1230,144 @@ def _prepare_test_cases():
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='range', argrepr='NULL + range', offset=2, starts_line=3, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=10, argrepr='10', offset=14, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=16, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=20, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=30, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='FOR_ITER', opcode=93, arg=32, argval=98, argrepr='to 98', offset=32, starts_line=None, is_jump_target=True, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=34, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=36, starts_line=4, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=48, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=50, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=54, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=64, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=66, starts_line=5, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=68, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=70, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=40, argval=80, argrepr='to 80', offset=76, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_BACKWARD', opcode=140, arg=24, argval=32, argrepr='to 32', offset=78, starts_line=6, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=80, starts_line=7, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=82, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=84, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=48, argval=96, argrepr='to 96', offset=90, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=92, starts_line=8, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=16, argval=128, argrepr='to 128', offset=94, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_BACKWARD', opcode=140, arg=33, argval=32, argrepr='to 32', offset=96, starts_line=7, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=98, starts_line=10, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=110, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=112, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=116, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=126, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=128, starts_line=11, is_jump_target=True, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=102, argval=204, argrepr='to 204', offset=130, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=132, starts_line=12, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=144, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=146, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=150, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=160, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=162, starts_line=13, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=164, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BINARY_OP', opcode=122, arg=23, argval=23, argrepr='-=', offset=166, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=170, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=172, starts_line=14, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=174, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=176, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=93, argval=186, argrepr='to 186', offset=182, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_BACKWARD', opcode=140, arg=29, argval=128, argrepr='to 128', offset=184, starts_line=15, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=186, starts_line=16, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=188, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=190, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=100, argval=200, argrepr='to 200', offset=196, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=17, argval=234, argrepr='to 234', offset=198, starts_line=17, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=200, starts_line=11, is_jump_target=True, positions=None),
- Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=66, argval=132, argrepr='to 132', offset=202, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=204, starts_line=19, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=216, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=218, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=222, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=232, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=234, starts_line=20, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=236, starts_line=21, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=238, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BINARY_OP', opcode=122, arg=11, argval=11, argrepr='/', offset=240, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=244, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=246, starts_line=25, is_jump_target=False, positions=None),
- Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=248, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=250, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=252, starts_line=26, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Never reach this', argrepr="'Never reach this'", offset=264, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=266, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=270, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=280, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=282, starts_line=25, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=284, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=286, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=2, argval=2, argrepr='', offset=288, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=2, argval=2, argrepr='', offset=292, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=302, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=11, argval=328, argrepr='to 328', offset=304, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=306, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=308, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=160, argval=320, argrepr='to 320', offset=310, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=312, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=314, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=316, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=318, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=320, starts_line=None, is_jump_target=True, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=322, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=324, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=326, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=31, argval=392, argrepr='to 392', offset=328, starts_line=None, is_jump_target=True, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=330, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=332, starts_line=22, is_jump_target=False, positions=None),
- Instruction(opname='CHECK_EXC_MATCH', opcode=36, arg=None, argval=None, argrepr='', offset=344, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=192, argval=384, argrepr='to 384', offset=346, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=348, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=350, starts_line=23, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=362, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=364, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=368, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=378, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=380, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=21, argval=426, argrepr='to 426', offset=382, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=384, starts_line=22, is_jump_target=True, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=386, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=388, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=390, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=392, starts_line=28, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=404, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=24, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=34, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=36, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='FOR_ITER', opcode=93, arg=35, argval=110, argrepr='to 110', offset=38, starts_line=None, is_jump_target=True, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=40, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=42, starts_line=4, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=54, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=56, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=64, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=74, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=76, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=78, starts_line=5, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=80, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=82, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=46, argval=92, argrepr='to 92', offset=88, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_BACKWARD', opcode=140, arg=27, argval=38, argrepr='to 38', offset=90, starts_line=6, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=92, starts_line=7, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=94, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=96, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=54, argval=108, argrepr='to 108', offset=102, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=104, starts_line=8, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=19, argval=146, argrepr='to 146', offset=106, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_BACKWARD', opcode=140, arg=36, argval=38, argrepr='to 38', offset=108, starts_line=7, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=110, starts_line=10, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=122, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=124, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=132, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=142, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=144, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=146, starts_line=11, is_jump_target=True, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=114, argval=228, argrepr='to 228', offset=148, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=150, starts_line=12, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=162, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=164, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=172, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=182, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=184, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=186, starts_line=13, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=188, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BINARY_OP', opcode=122, arg=23, argval=23, argrepr='-=', offset=190, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=194, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=196, starts_line=14, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=198, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=200, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=105, argval=210, argrepr='to 210', offset=206, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_BACKWARD', opcode=140, arg=32, argval=146, argrepr='to 146', offset=208, starts_line=15, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=210, starts_line=16, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=212, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=214, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=112, argval=224, argrepr='to 224', offset=220, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=20, argval=264, argrepr='to 264', offset=222, starts_line=17, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=224, starts_line=11, is_jump_target=True, positions=None),
+ Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=75, argval=150, argrepr='to 150', offset=226, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=228, starts_line=19, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=240, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=242, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=250, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=260, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=262, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=264, starts_line=20, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=266, starts_line=21, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=268, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BINARY_OP', opcode=122, arg=11, argval=11, argrepr='/', offset=270, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=274, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=276, starts_line=25, is_jump_target=False, positions=None),
+ Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=278, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=280, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=282, starts_line=26, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Never reach this', argrepr="'Never reach this'", offset=294, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=296, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=304, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=314, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=316, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=318, starts_line=25, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=320, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=322, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=2, argval=2, argrepr='', offset=324, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=2, argval=2, argrepr='', offset=332, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=342, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=344, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=11, argval=370, argrepr='to 370', offset=346, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=348, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=350, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=181, argval=362, argrepr='to 362', offset=352, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=354, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=356, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=358, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=360, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=362, starts_line=None, is_jump_target=True, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=364, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=366, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=368, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=34, argval=440, argrepr='to 440', offset=370, starts_line=None, is_jump_target=True, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=372, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=374, starts_line=22, is_jump_target=False, positions=None),
+ Instruction(opname='CHECK_EXC_MATCH', opcode=36, arg=None, argval=None, argrepr='', offset=386, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=216, argval=432, argrepr='to 432', offset=388, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=390, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=392, starts_line=23, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=404, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=406, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=410, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=420, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=422, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=424, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=426, starts_line=23, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=428, starts_line=28, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=440, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=442, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=446, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=456, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=458, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=460, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=462, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=464, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=476, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=478, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=482, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=492, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=494, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=496, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=498, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=500, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=414, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=424, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=426, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=428, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=24, argval=480, argrepr='to 480', offset=430, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=432, starts_line=22, is_jump_target=True, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=434, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=436, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=438, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=440, starts_line=28, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=452, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=454, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=462, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=472, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=474, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=476, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=478, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=480, starts_line=23, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=482, starts_line=28, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=494, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=496, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=504, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=514, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=516, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=518, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=520, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=522, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=524, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=536, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=538, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=546, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POSTCALL', opcode=3, arg=None, argval=None, argrepr='', offset=556, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=558, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=560, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=562, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=564, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=566, starts_line=None, is_jump_target=False, positions=None),
]
# One last piece of inspect fodder to check the default line number handling
@@ -1412,6 +1438,7 @@ def test_co_positions(self):
(1, 3, 0, 1),
(1, 3, 0, 1),
(1, 3, 0, 1),
+ (1, 3, 0, 1),
(1, 3, 0, 1)
]
self.assertEqual(positions, expected)
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 445ff893ff6fcf..631cf1b55cb4fb 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -1397,7 +1397,7 @@ class C(object): pass
def func():
return sys._getframe()
x = func()
- check(x, size('3Pi3c7P2ic??2P'))
+ check(x, size('3Pi3c7P2ic??3P'))
# function
def func(): pass
check(func, size('14Pi'))
@@ -1506,7 +1506,7 @@ def delx(self): del self.__x
'10P' # PySequenceMethods
'2P' # PyBufferProcs
'6P'
- '1P' # Specializer cache
+ '2P' # Specializer cache
)
class newstyleclass(object): pass
# Separate block for PyDictKeysObject with 8 keys and 5 entries
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-06-21-50-36.bpo-46939.nlQEGG.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-06-21-50-36.bpo-46939.nlQEGG.rst
new file mode 100644
index 00000000000000..bd335216ce398d
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-06-21-50-36.bpo-46939.nlQEGG.rst
@@ -0,0 +1,2 @@
+Calls to Python classes are now specialized. Creating objects from Python
+classes should now be faster. Patch by Ken Jin.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 5de8c3d2ece439..1cc2c124c8550b 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4514,7 +4514,15 @@ object_init(PyObject *self, PyObject *args, PyObject *kwds)
static PyObject *
object_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
- if (excess_args(args, kwds)) {
+ return _PyObject_New_Vector(type, (_PyTuple_CAST(args)->ob_item),
+ PyTuple_GET_SIZE(args), kwds);
+}
+
+PyObject *
+_PyObject_New_Vector(PyTypeObject *type, PyObject *const *args,
+ Py_ssize_t nargs, PyObject *kwds)
+{
+ if (nargs || (kwds && PyDict_Check(kwds) && PyDict_GET_SIZE(kwds))) {
if (type->tp_new != object_new) {
PyErr_SetString(PyExc_TypeError,
"object.__new__() takes exactly one argument (the type to instantiate)");
diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h
index a3c09529116cc1..c1eae427bd7acb 100644
--- a/Programs/test_frozenmain.h
+++ b/Programs/test_frozenmain.h
@@ -1,46 +1,49 @@
// Auto-generated by Programs/freeze_test_frozenmain.py
unsigned char M_test_frozenmain[] = {
227,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
- 0,0,0,0,0,115,176,0,0,0,151,0,100,0,100,1,
+ 0,0,0,0,0,115,200,0,0,0,151,0,100,0,100,1,
108,0,90,0,100,0,100,1,108,1,90,1,2,0,101,2,
- 100,2,166,1,0,0,171,1,0,0,0,0,0,0,0,0,
- 1,0,2,0,101,2,100,3,101,0,106,3,0,0,0,0,
- 0,0,0,0,166,2,0,0,171,2,0,0,0,0,0,0,
- 0,0,1,0,2,0,101,1,106,4,0,0,0,0,0,0,
- 0,0,166,0,0,0,171,0,0,0,0,0,0,0,0,0,
- 100,4,25,0,0,0,0,0,0,0,0,0,90,5,100,5,
- 68,0,93,25,90,6,2,0,101,2,100,6,101,6,155,0,
- 100,7,101,5,101,6,25,0,0,0,0,0,0,0,0,0,
- 155,0,157,4,166,1,0,0,171,1,0,0,0,0,0,0,
- 0,0,1,0,140,26,100,1,83,0,41,8,233,0,0,0,
- 0,78,122,18,70,114,111,122,101,110,32,72,101,108,108,111,
- 32,87,111,114,108,100,122,8,115,121,115,46,97,114,103,118,
- 218,6,99,111,110,102,105,103,41,5,90,12,112,114,111,103,
- 114,97,109,95,110,97,109,101,218,10,101,120,101,99,117,116,
- 97,98,108,101,90,15,117,115,101,95,101,110,118,105,114,111,
- 110,109,101,110,116,90,17,99,111,110,102,105,103,117,114,101,
- 95,99,95,115,116,100,105,111,90,14,98,117,102,102,101,114,
- 101,100,95,115,116,100,105,111,122,7,99,111,110,102,105,103,
- 32,122,2,58,32,41,7,218,3,115,121,115,90,17,95,116,
- 101,115,116,105,110,116,101,114,110,97,108,99,97,112,105,218,
- 5,112,114,105,110,116,218,4,97,114,103,118,90,11,103,101,
- 116,95,99,111,110,102,105,103,115,114,2,0,0,0,218,3,
- 107,101,121,169,0,243,0,0,0,0,250,18,116,101,115,116,
- 95,102,114,111,122,101,110,109,97,105,110,46,112,121,250,8,
- 60,109,111,100,117,108,101,62,114,11,0,0,0,1,0,0,
- 0,115,18,0,0,0,2,128,8,3,8,1,22,2,34,1,
- 42,1,8,1,48,7,4,249,115,20,0,0,0,2,128,8,
- 3,8,1,22,2,34,1,42,1,2,7,4,1,2,249,52,
- 7,115,176,0,0,0,0,0,1,11,1,11,1,11,1,11,
- 1,25,1,25,1,25,1,25,1,6,1,6,7,27,1,28,
- 1,28,1,28,1,28,1,28,1,28,1,28,1,28,1,6,
- 1,6,7,17,19,22,19,27,19,27,19,27,19,27,19,27,
+ 100,2,166,1,0,0,0,0,0,0,171,1,0,0,0,0,
+ 0,0,0,0,3,0,1,0,2,0,101,2,100,3,101,0,
+ 106,3,0,0,0,0,0,0,0,0,166,2,0,0,0,0,
+ 0,0,171,2,0,0,0,0,0,0,0,0,3,0,1,0,
+ 2,0,101,1,106,4,0,0,0,0,0,0,0,0,166,0,
+ 0,0,0,0,0,0,171,0,0,0,0,0,0,0,0,0,
+ 3,0,100,4,25,0,0,0,0,0,0,0,0,0,90,5,
+ 100,5,68,0,93,28,90,6,2,0,101,2,100,6,101,6,
+ 155,0,100,7,101,5,101,6,25,0,0,0,0,0,0,0,
+ 0,0,155,0,157,4,166,1,0,0,0,0,0,0,171,1,
+ 0,0,0,0,0,0,0,0,3,0,1,0,140,29,100,1,
+ 83,0,41,8,233,0,0,0,0,78,122,18,70,114,111,122,
+ 101,110,32,72,101,108,108,111,32,87,111,114,108,100,122,8,
+ 115,121,115,46,97,114,103,118,218,6,99,111,110,102,105,103,
+ 41,5,90,12,112,114,111,103,114,97,109,95,110,97,109,101,
+ 218,10,101,120,101,99,117,116,97,98,108,101,90,15,117,115,
+ 101,95,101,110,118,105,114,111,110,109,101,110,116,90,17,99,
+ 111,110,102,105,103,117,114,101,95,99,95,115,116,100,105,111,
+ 90,14,98,117,102,102,101,114,101,100,95,115,116,100,105,111,
+ 122,7,99,111,110,102,105,103,32,122,2,58,32,41,7,218,
+ 3,115,121,115,90,17,95,116,101,115,116,105,110,116,101,114,
+ 110,97,108,99,97,112,105,218,5,112,114,105,110,116,218,4,
+ 97,114,103,118,90,11,103,101,116,95,99,111,110,102,105,103,
+ 115,114,2,0,0,0,218,3,107,101,121,169,0,243,0,0,
+ 0,0,250,18,116,101,115,116,95,102,114,111,122,101,110,109,
+ 97,105,110,46,112,121,250,8,60,109,111,100,117,108,101,62,
+ 114,11,0,0,0,1,0,0,0,115,18,0,0,0,2,128,
+ 8,3,8,1,28,2,40,1,48,1,8,1,54,7,4,249,
+ 115,20,0,0,0,2,128,8,3,8,1,28,2,40,1,48,
+ 1,2,7,4,1,2,249,58,7,115,200,0,0,0,0,0,
+ 1,11,1,11,1,11,1,11,1,25,1,25,1,25,1,25,
+ 1,6,1,6,7,27,1,28,1,28,1,28,1,28,1,28,
+ 1,28,1,28,1,28,1,28,1,28,1,28,1,6,1,6,
+ 7,17,19,22,19,27,19,27,19,27,19,27,19,27,1,28,
1,28,1,28,1,28,1,28,1,28,1,28,1,28,1,28,
- 10,39,10,27,10,39,10,39,10,39,10,39,10,39,10,41,
- 10,41,10,41,10,41,10,41,10,41,10,41,42,50,10,51,
- 10,51,10,51,10,51,10,51,1,7,12,2,1,42,1,42,
- 5,8,5,10,5,10,11,41,21,24,11,41,11,41,28,34,
- 35,38,28,39,28,39,28,39,28,39,28,39,11,41,11,41,
+ 1,28,1,28,10,39,10,27,10,39,10,39,10,39,10,39,
+ 10,39,10,41,10,41,10,41,10,41,10,41,10,41,10,41,
+ 10,41,10,41,10,41,42,50,10,51,10,51,10,51,10,51,
+ 10,51,1,7,12,2,1,42,1,42,5,8,5,10,5,10,
+ 11,41,21,24,11,41,11,41,28,34,35,38,28,39,28,39,
+ 28,39,28,39,28,39,11,41,11,41,5,42,5,42,5,42,
5,42,5,42,5,42,5,42,5,42,5,42,5,42,5,42,
5,42,1,42,1,42,114,9,0,0,0,
};
diff --git a/Python/ceval.c b/Python/ceval.c
index 487e09bc664173..ac551f9a2e7a6a 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1319,9 +1319,9 @@ eval_frame_handle_pending(PyThreadState *tstate)
#define JUMPTO(x) (next_instr = first_instr + (x))
#define JUMPBY(x) (next_instr += (x))
-// Skip from a PRECALL over a CALL to the next instruction:
+// Skip from a PRECALL over a CALL and POSTCALL to the next instruction:
#define SKIP_CALL() \
- JUMPBY(INLINE_CACHE_ENTRIES_PRECALL + 1 + INLINE_CACHE_ENTRIES_CALL)
+ JUMPBY(INLINE_CACHE_ENTRIES_PRECALL + 1 + INLINE_CACHE_ENTRIES_CALL + 1)
/* Get opcode and oparg from original instructions, not quickened form. */
#define TRACING_NEXTOPARG() do { \
@@ -4544,6 +4544,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PEEK(oparg+2) = meth;
Py_DECREF(function);
}
+ PUSH(NULL);
JUMPBY(INLINE_CACHE_ENTRIES_PRECALL);
DISPATCH();
}
@@ -4560,6 +4561,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PEEK(oparg + 1) = self;
PEEK(oparg + 2) = meth;
Py_DECREF(function);
+ PUSH(NULL);
JUMPBY(INLINE_CACHE_ENTRIES_PRECALL);
DISPATCH();
}
@@ -4569,10 +4571,71 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyObject *function = PEEK(nargs + 1);
DEOPT_IF(Py_TYPE(function) != &PyFunction_Type, PRECALL);
STAT_INC(PRECALL, hit);
+ PUSH(NULL);
JUMPBY(INLINE_CACHE_ENTRIES_PRECALL);
DISPATCH();
}
+ TARGET(PRECALL_PY_CLASS) {
+ /*
+ Before a call, the stack is:
+ meth, self, arg1, arg2, ..., argN, NULL|self (only when __init__)
+ ^TOS
+ TOS is NULL or self depending on __init__.
+
+ After the call with __init__, the stack should be:
+ NULL|self, retvalue
+ ^TOS
+
+ After the post call, the stack will become:
+ self|retvalue
+ ^TOS
+
+ CALLs that use SKIP_CALL() do not need to handle this case.
+ */
+ _PyPrecallCache *cache = (_PyPrecallCache *)next_instr;
+ int is_method = (PEEK(oparg + 2) != NULL);
+ DEOPT_IF(is_method, PRECALL);
+ PyObject *cls = PEEK(oparg + 1);
+ DEOPT_IF(!PyType_Check(cls), PRECALL);
+ PyTypeObject *cls_t = (PyTypeObject *)cls;
+ DEOPT_IF(cls_t->tp_version_tag != read_u32(cache->type_version), PRECALL);
+ assert(cls_t->tp_flags & Py_TPFLAGS_HEAPTYPE);
+ PyObject *init = ((PyHeapTypeObject *)cls_t)->_spec_cache.init;
+ assert(PyFunction_Check(init));
+ DEOPT_IF(cls_t->tp_new != PyBaseObject_Type.tp_new, PRECALL);
+ STAT_INC(PRECALL, hit);
+
+ PyObject *self = _PyObject_New_Vector(cls_t, &PEEK(oparg),
+ (Py_ssize_t)oparg, call_shape.kwnames);
+ if (self == NULL) {
+ goto error;
+ }
+ Py_INCREF(init);
+ PEEK(oparg+1) = self;
+ PEEK(oparg+2) = init;
+ Py_DECREF(cls);
+
+ /* For POSTCALL */
+ PUSH(Py_NewRef(self));
+ JUMPBY(INLINE_CACHE_ENTRIES_PRECALL);
+ DISPATCH();
+ }
+
+ TARGET(POSTCALL) {
+ /* Stack currently is self|NULL, retval */
+ /* __init__ was called, TOS should self.*/
+ if (SECOND() != NULL) {
+ Py_DECREF(POP());
+ }
+ else {
+ PyObject *tmp = POP();
+ assert(TOP() == NULL);
+ SET_TOP(tmp);
+ }
+ DISPATCH();
+ }
+
TARGET(KW_NAMES) {
assert(call_shape.kwnames == NULL);
assert(oparg < PyTuple_GET_SIZE(consts));
@@ -4582,7 +4645,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
TARGET(CALL) {
int is_meth;
+ PyObject *self_or_null;
call_function:
+ self_or_null = POP();
is_meth = is_method(stack_pointer, oparg);
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -4598,6 +4663,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
);
call_shape.kwnames = NULL;
STACK_SHRINK(2-is_meth);
+ PUSH(self_or_null);
// The frame has stolen all the arguments from the stack,
// so there is no need to clean them up.
if (new_frame == NULL) {
@@ -4606,11 +4672,12 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
_PyFrame_SetStackPointer(frame, stack_pointer);
frame->f_lasti += INLINE_CACHE_ENTRIES_CALL;
new_frame->previous = frame;
- cframe.current_frame = frame = new_frame;
+ frame = cframe.current_frame = new_frame;
CALL_STAT_INC(inlined_py_calls);
goto start_frame;
}
/* Callable is not a normal Python function */
+ assert(self_or_null == NULL);
PyObject *res;
if (cframe.use_tracing) {
res = trace_call_function(
@@ -4636,7 +4703,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
if (res == NULL) {
goto error;
}
- JUMPBY(INLINE_CACHE_ENTRIES_CALL);
+
+ /* Skip the POSTCALL too. */
+ JUMPBY(INLINE_CACHE_ENTRIES_CALL+1);
CHECK_EVAL_BREAKER();
DISPATCH();
}
@@ -4666,9 +4735,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
_PyCallCache *cache = (_PyCallCache *)next_instr;
if (cache->counter == 0) {
next_instr--;
- int is_meth = is_method(stack_pointer, oparg);
+ int is_meth = is_method(stack_pointer-1, oparg);
int nargs = oparg + is_meth;
- PyObject *callable = PEEK(nargs + 1);
+ PyObject *callable = PEEK(nargs + 2);
int err = _Py_Specialize_Call(callable, next_instr, nargs,
call_shape.kwnames);
if (err < 0) {
@@ -4686,9 +4755,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
TARGET(CALL_PY_EXACT_ARGS) {
assert(call_shape.kwnames == NULL);
_PyCallCache *cache = (_PyCallCache *)next_instr;
- int is_meth = is_method(stack_pointer, oparg);
+ int is_meth = is_method(stack_pointer-1, oparg);
int argcount = oparg + is_meth;
- PyObject *callable = PEEK(argcount + 1);
+ PyObject *callable = PEEK(argcount + 2);
DEOPT_IF(!PyFunction_Check(callable), CALL);
PyFunctionObject *func = (PyFunctionObject *)callable;
DEOPT_IF(func->func_version != read_u32(cache->func_version), CALL);
@@ -4699,6 +4768,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
if (new_frame == NULL) {
goto error;
}
+ PyObject *self_or_null = POP();
CALL_STAT_INC(inlined_py_calls);
STACK_SHRINK(argcount);
for (int i = 0; i < argcount; i++) {
@@ -4708,6 +4778,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
new_frame->localsplus[i] = NULL;
}
STACK_SHRINK(2-is_meth);
+ PUSH(self_or_null);
_PyFrame_SetStackPointer(frame, stack_pointer);
frame->f_lasti += INLINE_CACHE_ENTRIES_CALL;
new_frame->previous = frame;
@@ -4718,9 +4789,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
TARGET(CALL_PY_WITH_DEFAULTS) {
assert(call_shape.kwnames == NULL);
_PyCallCache *cache = (_PyCallCache *)next_instr;
- int is_meth = is_method(stack_pointer, oparg);
+ int is_meth = is_method(stack_pointer-1, oparg);
int argcount = oparg + is_meth;
- PyObject *callable = PEEK(argcount + 1);
+ PyObject *callable = PEEK(argcount + 2);
DEOPT_IF(!PyFunction_Check(callable), CALL);
PyFunctionObject *func = (PyFunctionObject *)callable;
DEOPT_IF(func->func_version != read_u32(cache->func_version), CALL);
@@ -4734,6 +4805,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
goto error;
}
CALL_STAT_INC(inlined_py_calls);
+ PyObject *self_or_null = POP();
STACK_SHRINK(argcount);
for (int i = 0; i < argcount; i++) {
new_frame->localsplus[i] = stack_pointer[i];
@@ -4748,6 +4820,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
new_frame->localsplus[i] = NULL;
}
STACK_SHRINK(2-is_meth);
+ PUSH(self_or_null);
_PyFrame_SetStackPointer(frame, stack_pointer);
frame->f_lasti += INLINE_CACHE_ENTRIES_CALL;
new_frame->previous = frame;
diff --git a/Python/compile.c b/Python/compile.c
index f04ba9ec50f6fd..14c3af0d1bbf61 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1077,10 +1077,12 @@ stack_effect(int opcode, int oparg, int jump)
/* Functions and calls */
case PRECALL:
- return -oparg;
+ return 1;
case KW_NAMES:
return 0;
case CALL:
+ return -1-oparg;
+ case POSTCALL:
return -1;
case CALL_FUNCTION_EX:
@@ -1909,6 +1911,7 @@ compiler_call_exit_with_nones(struct compiler *c) {
ADDOP_LOAD_CONST(c, Py_None);
ADDOP_I(c, PRECALL, 2);
ADDOP_I(c, CALL, 2);
+ ADDOP(c, POSTCALL)
return 1;
}
@@ -2287,6 +2290,7 @@ compiler_apply_decorators(struct compiler *c, asdl_expr_seq* decos)
SET_LOC(c, (expr_ty)asdl_seq_GET(decos, i));
ADDOP_I(c, PRECALL, 0);
ADDOP_I(c, CALL, 0);
+ ADDOP(c, POSTCALL)
}
c->u->u_lineno = old_lineno;
c->u->u_end_lineno = old_end_lineno;
@@ -3963,6 +3967,7 @@ compiler_assert(struct compiler *c, stmt_ty s)
VISIT(c, expr, s->v.Assert.msg);
ADDOP_I(c, PRECALL, 0);
ADDOP_I(c, CALL, 0);
+ ADDOP(c, POSTCALL)
}
ADDOP_I(c, RAISE_VARARGS, 1);
compiler_use_next_block(c, end);
@@ -4791,6 +4796,7 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e)
}
ADDOP_I(c, PRECALL, argsl + kwdsl);
ADDOP_I(c, CALL, argsl + kwdsl);
+ ADDOP(c, POSTCALL)
c->u->u_lineno = old_lineno;
return 1;
}
@@ -4856,6 +4862,7 @@ compiler_joined_str(struct compiler *c, expr_ty e)
}
ADDOP_I(c, PRECALL, 1);
ADDOP_I(c, CALL, 1);
+ ADDOP(c, POSTCALL)
}
else {
VISIT_SEQ(c, expr, e->v.JoinedStr.values);
@@ -5030,6 +5037,7 @@ compiler_call_helper(struct compiler *c,
}
ADDOP_I(c, PRECALL, n + nelts + nkwelts);
ADDOP_I(c, CALL, n + nelts + nkwelts);
+ ADDOP(c, POSTCALL)
return 1;
ex_call:
@@ -5421,6 +5429,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
ADDOP_I(c, PRECALL, 0);
ADDOP_I(c, CALL, 0);
+ ADDOP(c, POSTCALL);
if (is_async_generator && type != COMP_GENEXP) {
ADDOP_I(c, GET_AWAITABLE, 0);
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index 064aa060c84284..00cda72d3c57f7 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -2,19 +2,20 @@ static void *opcode_targets[256] = {
&&TARGET_CACHE,
&&TARGET_POP_TOP,
&&TARGET_PUSH_NULL,
+ &&TARGET_POSTCALL,
&&TARGET_BINARY_OP_ADAPTIVE,
&&TARGET_BINARY_OP_ADD_FLOAT,
&&TARGET_BINARY_OP_ADD_INT,
&&TARGET_BINARY_OP_ADD_UNICODE,
&&TARGET_BINARY_OP_INPLACE_ADD_UNICODE,
- &&TARGET_BINARY_OP_MULTIPLY_FLOAT,
&&TARGET_NOP,
&&TARGET_UNARY_POSITIVE,
&&TARGET_UNARY_NEGATIVE,
&&TARGET_UNARY_NOT,
+ &&TARGET_BINARY_OP_MULTIPLY_FLOAT,
&&TARGET_BINARY_OP_MULTIPLY_INT,
- &&TARGET_BINARY_OP_SUBTRACT_FLOAT,
&&TARGET_UNARY_INVERT,
+ &&TARGET_BINARY_OP_SUBTRACT_FLOAT,
&&TARGET_BINARY_OP_SUBTRACT_INT,
&&TARGET_BINARY_SUBSCR_ADAPTIVE,
&&TARGET_BINARY_SUBSCR_DICT,
@@ -23,20 +24,20 @@ static void *opcode_targets[256] = {
&&TARGET_BINARY_SUBSCR_TUPLE_INT,
&&TARGET_CALL_ADAPTIVE,
&&TARGET_CALL_PY_EXACT_ARGS,
- &&TARGET_CALL_PY_WITH_DEFAULTS,
&&TARGET_BINARY_SUBSCR,
+ &&TARGET_CALL_PY_WITH_DEFAULTS,
&&TARGET_COMPARE_OP_ADAPTIVE,
&&TARGET_COMPARE_OP_FLOAT_JUMP,
&&TARGET_COMPARE_OP_INT_JUMP,
- &&TARGET_COMPARE_OP_STR_JUMP,
&&TARGET_GET_LEN,
&&TARGET_MATCH_MAPPING,
&&TARGET_MATCH_SEQUENCE,
&&TARGET_MATCH_KEYS,
- &&TARGET_JUMP_BACKWARD_QUICK,
+ &&TARGET_COMPARE_OP_STR_JUMP,
&&TARGET_PUSH_EXC_INFO,
&&TARGET_CHECK_EXC_MATCH,
&&TARGET_CHECK_EG_MATCH,
+ &&TARGET_JUMP_BACKWARD_QUICK,
&&TARGET_LOAD_ATTR_ADAPTIVE,
&&TARGET_LOAD_ATTR_INSTANCE_VALUE,
&&TARGET_LOAD_ATTR_MODULE,
@@ -47,40 +48,39 @@ static void *opcode_targets[256] = {
&&TARGET_LOAD_FAST__LOAD_FAST,
&&TARGET_LOAD_GLOBAL_ADAPTIVE,
&&TARGET_LOAD_GLOBAL_BUILTIN,
- &&TARGET_LOAD_GLOBAL_MODULE,
&&TARGET_WITH_EXCEPT_START,
&&TARGET_GET_AITER,
&&TARGET_GET_ANEXT,
&&TARGET_BEFORE_ASYNC_WITH,
&&TARGET_BEFORE_WITH,
&&TARGET_END_ASYNC_FOR,
+ &&TARGET_LOAD_GLOBAL_MODULE,
&&TARGET_LOAD_METHOD_ADAPTIVE,
&&TARGET_LOAD_METHOD_CLASS,
&&TARGET_LOAD_METHOD_MODULE,
&&TARGET_LOAD_METHOD_NO_DICT,
- &&TARGET_LOAD_METHOD_WITH_DICT,
&&TARGET_STORE_SUBSCR,
&&TARGET_DELETE_SUBSCR,
+ &&TARGET_LOAD_METHOD_WITH_DICT,
&&TARGET_LOAD_METHOD_WITH_VALUES,
&&TARGET_PRECALL_ADAPTIVE,
&&TARGET_PRECALL_BOUND_METHOD,
&&TARGET_PRECALL_BUILTIN_CLASS,
&&TARGET_PRECALL_BUILTIN_FAST_WITH_KEYWORDS,
- &&TARGET_PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
&&TARGET_GET_ITER,
&&TARGET_GET_YIELD_FROM_ITER,
&&TARGET_PRINT_EXPR,
&&TARGET_LOAD_BUILD_CLASS,
+ &&TARGET_PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
&&TARGET_PRECALL_NO_KW_BUILTIN_FAST,
- &&TARGET_PRECALL_NO_KW_BUILTIN_O,
&&TARGET_LOAD_ASSERTION_ERROR,
&&TARGET_RETURN_GENERATOR,
+ &&TARGET_PRECALL_NO_KW_BUILTIN_O,
&&TARGET_PRECALL_NO_KW_ISINSTANCE,
&&TARGET_PRECALL_NO_KW_LEN,
&&TARGET_PRECALL_NO_KW_LIST_APPEND,
&&TARGET_PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST,
&&TARGET_PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS,
- &&TARGET_PRECALL_NO_KW_METHOD_DESCRIPTOR_O,
&&TARGET_LIST_TO_TUPLE,
&&TARGET_RETURN_VALUE,
&&TARGET_IMPORT_STAR,
@@ -112,7 +112,7 @@ static void *opcode_targets[256] = {
&&TARGET_JUMP_FORWARD,
&&TARGET_JUMP_IF_FALSE_OR_POP,
&&TARGET_JUMP_IF_TRUE_OR_POP,
- &&TARGET_PRECALL_NO_KW_STR_1,
+ &&TARGET_PRECALL_NO_KW_METHOD_DESCRIPTOR_O,
&&TARGET_POP_JUMP_IF_FALSE,
&&TARGET_POP_JUMP_IF_TRUE,
&&TARGET_LOAD_GLOBAL,
@@ -120,13 +120,13 @@ static void *opcode_targets[256] = {
&&TARGET_CONTAINS_OP,
&&TARGET_RERAISE,
&&TARGET_COPY,
- &&TARGET_PRECALL_NO_KW_TUPLE_1,
+ &&TARGET_PRECALL_NO_KW_STR_1,
&&TARGET_BINARY_OP,
&&TARGET_SEND,
&&TARGET_LOAD_FAST,
&&TARGET_STORE_FAST,
&&TARGET_DELETE_FAST,
- &&TARGET_PRECALL_NO_KW_TYPE_1,
+ &&TARGET_PRECALL_NO_KW_TUPLE_1,
&&TARGET_POP_JUMP_IF_NOT_NONE,
&&TARGET_POP_JUMP_IF_NONE,
&&TARGET_RAISE_VARARGS,
@@ -140,38 +140,40 @@ static void *opcode_targets[256] = {
&&TARGET_STORE_DEREF,
&&TARGET_DELETE_DEREF,
&&TARGET_JUMP_BACKWARD,
- &&TARGET_PRECALL_PYFUNC,
+ &&TARGET_PRECALL_NO_KW_TYPE_1,
&&TARGET_CALL_FUNCTION_EX,
- &&TARGET_RESUME_QUICK,
+ &&TARGET_PRECALL_PYFUNC,
&&TARGET_EXTENDED_ARG,
&&TARGET_LIST_APPEND,
&&TARGET_SET_ADD,
&&TARGET_MAP_ADD,
&&TARGET_LOAD_CLASSDEREF,
&&TARGET_COPY_FREE_VARS,
- &&TARGET_STORE_ATTR_ADAPTIVE,
+ &&TARGET_PRECALL_PY_CLASS,
&&TARGET_RESUME,
&&TARGET_MATCH_CLASS,
- &&TARGET_STORE_ATTR_INSTANCE_VALUE,
- &&TARGET_STORE_ATTR_SLOT,
+ &&TARGET_RESUME_QUICK,
+ &&TARGET_STORE_ATTR_ADAPTIVE,
&&TARGET_FORMAT_VALUE,
&&TARGET_BUILD_CONST_KEY_MAP,
&&TARGET_BUILD_STRING,
- &&TARGET_STORE_ATTR_WITH_HINT,
- &&TARGET_STORE_FAST__LOAD_FAST,
+ &&TARGET_STORE_ATTR_INSTANCE_VALUE,
+ &&TARGET_STORE_ATTR_SLOT,
&&TARGET_LOAD_METHOD,
- &&TARGET_STORE_FAST__STORE_FAST,
+ &&TARGET_STORE_ATTR_WITH_HINT,
&&TARGET_LIST_EXTEND,
&&TARGET_SET_UPDATE,
&&TARGET_DICT_MERGE,
&&TARGET_DICT_UPDATE,
&&TARGET_PRECALL,
+ &&TARGET_STORE_FAST__LOAD_FAST,
+ &&TARGET_STORE_FAST__STORE_FAST,
&&TARGET_STORE_SUBSCR_ADAPTIVE,
&&TARGET_STORE_SUBSCR_DICT,
- &&TARGET_STORE_SUBSCR_LIST_INT,
- &&TARGET_UNPACK_SEQUENCE_ADAPTIVE,
&&TARGET_CALL,
&&TARGET_KW_NAMES,
+ &&TARGET_STORE_SUBSCR_LIST_INT,
+ &&TARGET_UNPACK_SEQUENCE_ADAPTIVE,
&&TARGET_UNPACK_SEQUENCE_LIST,
&&TARGET_UNPACK_SEQUENCE_TUPLE,
&&TARGET_UNPACK_SEQUENCE_TWO_TUPLE,
@@ -252,7 +254,5 @@ static void *opcode_targets[256] = {
&&_unknown_opcode,
&&_unknown_opcode,
&&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
&&TARGET_DO_TRACING
};
diff --git a/Python/specialize.c b/Python/specialize.c
index 36b05026489cfd..1cbf5da6abc5a8 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -426,15 +426,16 @@ initial_counter_value(void) {
#define SPEC_FAIL_CALL_BAD_CALL_FLAGS 17
#define SPEC_FAIL_CALL_CLASS 18
#define SPEC_FAIL_CALL_PYTHON_CLASS 19
-#define SPEC_FAIL_CALL_METHOD_DESCRIPTOR 20
-#define SPEC_FAIL_CALL_BOUND_METHOD 21
-#define SPEC_FAIL_CALL_STR 22
-#define SPEC_FAIL_CALL_CLASS_NO_VECTORCALL 23
-#define SPEC_FAIL_CALL_CLASS_MUTABLE 24
-#define SPEC_FAIL_CALL_KWNAMES 25
-#define SPEC_FAIL_CALL_METHOD_WRAPPER 26
-#define SPEC_FAIL_CALL_OPERATOR_WRAPPER 27
-#define SPEC_FAIL_CALL_PYFUNCTION 28
+#define SPEC_FAIL_CALL_PYTHON_CLASS_NON_PY_INIT 20
+#define SPEC_FAIL_CALL_METHOD_DESCRIPTOR 21
+#define SPEC_FAIL_CALL_BOUND_METHOD 22
+#define SPEC_FAIL_CALL_STR 23
+#define SPEC_FAIL_CALL_CLASS_NO_VECTORCALL 24
+#define SPEC_FAIL_CALL_CLASS_MUTABLE 25
+#define SPEC_FAIL_CALL_KWNAMES 26
+#define SPEC_FAIL_CALL_METHOD_WRAPPER 27
+#define SPEC_FAIL_CALL_OPERATOR_WRAPPER 28
+#define SPEC_FAIL_CALL_PYFUNCTION 29
/* COMPARE_OP */
#define SPEC_FAIL_COMPARE_OP_DIFFERENT_TYPES 12
@@ -1353,7 +1354,30 @@ specialize_class_call(PyObject *callable, _Py_CODEUNIT *instr, int nargs,
assert(_Py_OPCODE(*instr) == PRECALL_ADAPTIVE);
PyTypeObject *tp = _PyType_CAST(callable);
if (tp->tp_new == PyBaseObject_Type.tp_new) {
- SPECIALIZATION_FAIL(PRECALL, SPEC_FAIL_CALL_PYTHON_CLASS);
+ _PyPrecallCache *cache = (_PyPrecallCache *)(instr + 1);
+ PyObject *descriptor = _PyType_Lookup(tp, &_Py_ID(__init__));
+ if (descriptor && Py_TYPE(descriptor) == &PyFunction_Type) {
+ if (!(tp->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
+ return -1;
+ }
+ PyFunctionObject *func = (PyFunctionObject *)descriptor;
+ PyCodeObject *fcode = (PyCodeObject *)func->func_code;
+ int kind = function_kind(fcode);
+ if (kind != SIMPLE_FUNCTION) {
+ SPECIALIZATION_FAIL(PRECALL, kind);
+ return -1;
+ }
+ if (fcode->co_flags & (CO_GENERATOR | CO_COROUTINE |
+ CO_ITERABLE_COROUTINE | CO_ASYNC_GENERATOR)) {
+ return -1;
+ }
+ assert(tp->tp_version_tag != 0);
+ write_u32(cache->type_version, tp->tp_version_tag);
+ ((PyHeapTypeObject *)tp)->_spec_cache.init = descriptor;
+ *instr = _Py_MAKECODEUNIT(PRECALL_PY_CLASS, _Py_OPARG(*instr));
+ return 0;
+ }
+ SPECIALIZATION_FAIL(PRECALL, SPEC_FAIL_CALL_PYTHON_CLASS_NON_PY_INIT);
return -1;
}
if (tp->tp_flags & Py_TPFLAGS_IMMUTABLETYPE) {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy