2022-11-04 21:40:43 -03:00
|
|
|
// This file contains instruction definitions.
|
|
|
|
// It is read by Tools/cases_generator/generate_cases.py
|
|
|
|
// to generate Python/generated_cases.c.h.
|
|
|
|
// Note that there is some dummy C code at the top and bottom of the file
|
|
|
|
// to fool text editors like VS Code into believing this is valid C code.
|
|
|
|
// The actual instruction definitions start at // BEGIN BYTECODES //.
|
|
|
|
// See Tools/cases_generator/README.md for more information.
|
|
|
|
|
2022-11-03 01:31:26 -03:00
|
|
|
#include "Python.h"
|
|
|
|
#include "pycore_abstract.h" // _PyIndex_Check()
|
|
|
|
#include "pycore_ceval.h" // _PyEval_SignalAsyncExc()
|
|
|
|
#include "pycore_code.h"
|
2023-07-22 12:04:34 -03:00
|
|
|
#include "pycore_emscripten_signal.h" // _Py_CHECK_EMSCRIPTEN_SIGNALS
|
2022-11-03 01:31:26 -03:00
|
|
|
#include "pycore_function.h"
|
2023-07-22 12:04:34 -03:00
|
|
|
#include "pycore_instruments.h"
|
2023-01-05 12:05:51 -04:00
|
|
|
#include "pycore_intrinsics.h"
|
2022-11-03 01:31:26 -03:00
|
|
|
#include "pycore_long.h" // _PyLong_GetZero()
|
|
|
|
#include "pycore_moduleobject.h" // PyModuleObject
|
2023-07-22 12:04:34 -03:00
|
|
|
#include "pycore_object.h" // _PyObject_GC_TRACK()
|
2023-07-13 21:27:35 -03:00
|
|
|
#include "pycore_opcode_metadata.h" // uop names
|
2023-06-02 11:10:45 -03:00
|
|
|
#include "pycore_opcode_utils.h" // MAKE_FUNCTION_*
|
2023-02-28 07:50:52 -04:00
|
|
|
#include "pycore_pyerrors.h" // _PyErr_GetRaisedException()
|
2022-11-03 01:31:26 -03:00
|
|
|
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
|
|
|
#include "pycore_range.h" // _PyRangeIterObject
|
2023-07-22 12:04:34 -03:00
|
|
|
#include "pycore_setobject.h" // _PySet_NextEntry()
|
2022-11-03 01:31:26 -03:00
|
|
|
#include "pycore_sliceobject.h" // _PyBuildSlice_ConsumeRefs
|
|
|
|
#include "pycore_sysmodule.h" // _PySys_Audit()
|
|
|
|
#include "pycore_tuple.h" // _PyTuple_ITEMS()
|
2023-04-24 19:22:14 -03:00
|
|
|
#include "pycore_typeobject.h" // _PySuper_Lookup()
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
#include "pycore_dict.h"
|
|
|
|
#include "dictobject.h"
|
|
|
|
#include "pycore_frame.h"
|
|
|
|
#include "opcode.h"
|
2023-06-02 07:46:18 -03:00
|
|
|
#include "optimizer.h"
|
2022-11-03 01:31:26 -03:00
|
|
|
#include "pydtrace.h"
|
|
|
|
#include "setobject.h"
|
2023-07-25 10:28:30 -03:00
|
|
|
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-01-18 14:41:07 -04:00
|
|
|
#define USE_COMPUTED_GOTOS 0
|
|
|
|
#include "ceval_macros.h"
|
2022-11-04 20:37:53 -03:00
|
|
|
|
|
|
|
/* Flow control macros */
|
|
|
|
#define DEOPT_IF(cond, instname) ((void)0)
|
2022-11-08 12:22:56 -04:00
|
|
|
#define ERROR_IF(cond, labelname) ((void)0)
|
2022-11-04 20:37:53 -03:00
|
|
|
#define GO_TO_INSTRUCTION(instname) ((void)0)
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
#define inst(name, ...) case name:
|
2022-11-22 20:04:57 -04:00
|
|
|
#define op(name, ...) /* NAME is ignored */
|
|
|
|
#define macro(name) static int MACRO_##name
|
2022-11-06 13:40:47 -04:00
|
|
|
#define super(name) static int SUPER_##name
|
2022-11-17 21:06:07 -04:00
|
|
|
#define family(name, ...) static int family_##name
|
2023-06-11 18:31:59 -03:00
|
|
|
#define pseudo(name) static int pseudo_##name
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
// Dummy variables for stack effects.
|
|
|
|
static PyObject *value, *value1, *value2, *left, *right, *res, *sum, *prod, *sub;
|
2023-01-29 21:28:39 -04:00
|
|
|
static PyObject *container, *start, *stop, *v, *lhs, *rhs, *res2;
|
2023-01-18 14:41:07 -04:00
|
|
|
static PyObject *list, *tuple, *dict, *owner, *set, *str, *tup, *map, *keys;
|
2023-07-13 21:27:35 -03:00
|
|
|
static PyObject *exit_func, *lasti, *val, *retval, *obj, *iter, *exhausted;
|
2023-05-16 00:36:23 -03:00
|
|
|
static PyObject *aiter, *awaitable, *iterable, *w, *exc_value, *bc, *locals;
|
2022-12-27 21:11:03 -04:00
|
|
|
static PyObject *orig, *excs, *update, *b, *fromlist, *level, *from;
|
2023-01-18 14:41:07 -04:00
|
|
|
static PyObject **pieces, **values;
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
static size_t jump;
|
|
|
|
// Dummy variables for cache effects
|
2023-01-11 16:40:43 -04:00
|
|
|
static uint16_t invert, counter, index, hint;
|
2023-07-13 21:27:35 -03:00
|
|
|
#define unused 0 // Used in a macro def, can't be static
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
static uint32_t type_version;
|
2022-11-08 12:22:56 -04:00
|
|
|
|
2022-11-04 20:37:53 -03:00
|
|
|
static PyObject *
|
2022-11-03 01:31:26 -03:00
|
|
|
dummy_func(
|
|
|
|
PyThreadState *tstate,
|
|
|
|
_PyInterpreterFrame *frame,
|
|
|
|
unsigned char opcode,
|
|
|
|
unsigned int oparg,
|
|
|
|
_Py_CODEUNIT *next_instr,
|
|
|
|
PyObject **stack_pointer,
|
2022-11-10 08:34:57 -04:00
|
|
|
PyObject *kwnames,
|
2022-11-03 01:31:26 -03:00
|
|
|
int throwflag,
|
2023-03-31 18:23:55 -03:00
|
|
|
PyObject *args[]
|
2022-11-03 01:31:26 -03:00
|
|
|
)
|
|
|
|
{
|
2023-03-31 18:23:55 -03:00
|
|
|
// Dummy labels.
|
|
|
|
pop_1_error:
|
|
|
|
// Dummy locals.
|
2023-06-13 05:51:05 -03:00
|
|
|
PyObject *dummy;
|
|
|
|
PyObject *attr;
|
2023-03-31 18:23:55 -03:00
|
|
|
PyObject *attrs;
|
|
|
|
PyObject *bottom;
|
|
|
|
PyObject *callable;
|
|
|
|
PyObject *callargs;
|
|
|
|
PyObject *codeobj;
|
|
|
|
PyObject *cond;
|
|
|
|
PyObject *descr;
|
2022-11-15 23:59:19 -04:00
|
|
|
_PyInterpreterFrame entry_frame;
|
2023-03-31 18:23:55 -03:00
|
|
|
PyObject *exc;
|
|
|
|
PyObject *exit;
|
|
|
|
PyObject *fget;
|
|
|
|
PyObject *fmt_spec;
|
|
|
|
PyObject *func;
|
|
|
|
uint32_t func_version;
|
|
|
|
PyObject *getattribute;
|
|
|
|
PyObject *kwargs;
|
|
|
|
PyObject *kwdefaults;
|
|
|
|
PyObject *len_o;
|
|
|
|
PyObject *match;
|
|
|
|
PyObject *match_type;
|
|
|
|
PyObject *method;
|
|
|
|
PyObject *mgr;
|
|
|
|
Py_ssize_t min_args;
|
|
|
|
PyObject *names;
|
|
|
|
PyObject *new_exc;
|
|
|
|
PyObject *next;
|
|
|
|
PyObject *none;
|
|
|
|
PyObject *null;
|
|
|
|
PyObject *prev_exc;
|
|
|
|
PyObject *receiver;
|
|
|
|
PyObject *rest;
|
|
|
|
int result;
|
|
|
|
PyObject *self;
|
|
|
|
PyObject *seq;
|
|
|
|
PyObject *slice;
|
|
|
|
PyObject *step;
|
|
|
|
PyObject *subject;
|
|
|
|
PyObject *top;
|
|
|
|
PyObject *type;
|
2023-05-16 00:36:23 -03:00
|
|
|
PyObject *typevars;
|
2023-03-31 18:23:55 -03:00
|
|
|
int values_or_none;
|
2022-11-15 23:59:19 -04:00
|
|
|
|
2022-11-03 01:31:26 -03:00
|
|
|
switch (opcode) {
|
|
|
|
|
|
|
|
// BEGIN BYTECODES //
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(NOP, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(RESUME, (--)) {
|
2023-08-17 15:29:58 -03:00
|
|
|
#if TIER_ONE
|
2023-08-17 07:16:03 -03:00
|
|
|
assert(frame == tstate->current_frame);
|
2023-04-12 08:04:55 -03:00
|
|
|
/* Possibly combine this with eval breaker */
|
2023-06-14 09:46:37 -03:00
|
|
|
if (_PyFrame_GetCode(frame)->_co_instrumentation_version != tstate->interp->monitoring_version) {
|
|
|
|
int err = _Py_Instrument(_PyFrame_GetCode(frame), tstate->interp);
|
2023-04-12 08:04:55 -03:00
|
|
|
ERROR_IF(err, error);
|
|
|
|
next_instr--;
|
|
|
|
}
|
2023-08-17 15:29:58 -03:00
|
|
|
else
|
|
|
|
#endif
|
|
|
|
if (oparg < 2) {
|
2023-07-03 17:28:27 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-04-12 08:04:55 -03:00
|
|
|
inst(INSTRUMENTED_RESUME, (--)) {
|
|
|
|
/* Possible performance enhancement:
|
|
|
|
* We need to check the eval breaker anyway, can we
|
|
|
|
* combine the instrument verison check and the eval breaker test?
|
|
|
|
*/
|
2023-06-14 09:46:37 -03:00
|
|
|
if (_PyFrame_GetCode(frame)->_co_instrumentation_version != tstate->interp->monitoring_version) {
|
|
|
|
if (_Py_Instrument(_PyFrame_GetCode(frame), tstate->interp)) {
|
2023-04-12 08:04:55 -03:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
next_instr--;
|
|
|
|
}
|
|
|
|
else {
|
2023-07-03 17:28:27 -03:00
|
|
|
if (oparg < 2) {
|
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
2023-04-12 08:04:55 -03:00
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
|
|
|
int err = _Py_call_instrumentation(
|
|
|
|
tstate, oparg > 0, frame, next_instr-1);
|
|
|
|
stack_pointer = _PyFrame_GetStackPointer(frame);
|
|
|
|
ERROR_IF(err, error);
|
|
|
|
if (frame->prev_instr != next_instr-1) {
|
|
|
|
/* Instrumentation has jumped */
|
|
|
|
next_instr = frame->prev_instr;
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-06-29 13:34:00 -03:00
|
|
|
pseudo(LOAD_CLOSURE) = {
|
|
|
|
LOAD_FAST,
|
|
|
|
};
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(LOAD_FAST_CHECK, (-- value)) {
|
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
ERROR_IF(value == NULL, unbound_local_error);
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_INCREF(value);
|
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(LOAD_FAST, (-- value)) {
|
|
|
|
value = GETLOCAL(oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(value != NULL);
|
|
|
|
Py_INCREF(value);
|
|
|
|
}
|
|
|
|
|
2023-05-09 14:02:14 -03:00
|
|
|
inst(LOAD_FAST_AND_CLEAR, (-- value)) {
|
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
// do not use SETLOCAL here, it decrefs the old value
|
|
|
|
GETLOCAL(oparg) = NULL;
|
|
|
|
}
|
|
|
|
|
2023-06-05 07:07:04 -03:00
|
|
|
inst(LOAD_FAST_LOAD_FAST, ( -- value1, value2)) {
|
|
|
|
uint32_t oparg1 = oparg >> 4;
|
|
|
|
uint32_t oparg2 = oparg & 15;
|
|
|
|
value1 = GETLOCAL(oparg1);
|
|
|
|
value2 = GETLOCAL(oparg2);
|
|
|
|
Py_INCREF(value1);
|
|
|
|
Py_INCREF(value2);
|
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(LOAD_CONST, (-- value)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
value = GETITEM(FRAME_CO_CONSTS, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_INCREF(value);
|
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(STORE_FAST, (value --)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
SETLOCAL(oparg, value);
|
|
|
|
}
|
|
|
|
|
2023-06-11 18:31:59 -03:00
|
|
|
pseudo(STORE_FAST_MAYBE_NULL) = {
|
|
|
|
STORE_FAST,
|
|
|
|
};
|
|
|
|
|
2023-06-05 07:07:04 -03:00
|
|
|
inst(STORE_FAST_LOAD_FAST, (value1 -- value2)) {
|
|
|
|
uint32_t oparg1 = oparg >> 4;
|
|
|
|
uint32_t oparg2 = oparg & 15;
|
|
|
|
SETLOCAL(oparg1, value1);
|
|
|
|
value2 = GETLOCAL(oparg2);
|
|
|
|
Py_INCREF(value2);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(STORE_FAST_STORE_FAST, (value2, value1 --)) {
|
|
|
|
uint32_t oparg1 = oparg >> 4;
|
|
|
|
uint32_t oparg2 = oparg & 15;
|
|
|
|
SETLOCAL(oparg1, value1);
|
|
|
|
SETLOCAL(oparg2, value2);
|
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(POP_TOP, (value --)) {
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-10 14:50:57 -04:00
|
|
|
inst(PUSH_NULL, (-- res)) {
|
|
|
|
res = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-22 20:04:57 -04:00
|
|
|
macro(END_FOR) = POP_TOP + POP_TOP;
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-04-12 08:04:55 -03:00
|
|
|
inst(INSTRUMENTED_END_FOR, (receiver, value --)) {
|
|
|
|
/* Need to create a fake StopIteration error here,
|
|
|
|
* to conform to PEP 380 */
|
|
|
|
if (PyGen_Check(receiver)) {
|
|
|
|
PyErr_SetObject(PyExc_StopIteration, value);
|
|
|
|
if (monitor_stop_iteration(tstate, frame, next_instr-1)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PyErr_SetRaisedException(NULL);
|
|
|
|
}
|
|
|
|
DECREF_INPUTS();
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(END_SEND, (receiver, value -- value)) {
|
|
|
|
Py_DECREF(receiver);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(INSTRUMENTED_END_SEND, (receiver, value -- value)) {
|
|
|
|
if (PyGen_Check(receiver) || PyCoro_CheckExact(receiver)) {
|
|
|
|
PyErr_SetObject(PyExc_StopIteration, value);
|
|
|
|
if (monitor_stop_iteration(tstate, frame, next_instr-1)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PyErr_SetRaisedException(NULL);
|
|
|
|
}
|
|
|
|
Py_DECREF(receiver);
|
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(UNARY_NEGATIVE, (value -- res)) {
|
|
|
|
res = PyNumber_Negative(value);
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-08 12:22:56 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(UNARY_NOT, (value -- res)) {
|
2023-06-29 17:49:54 -03:00
|
|
|
assert(PyBool_Check(value));
|
|
|
|
res = Py_IsFalse(value) ? Py_True : Py_False;
|
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(TO_BOOL, INLINE_CACHE_ENTRIES_TO_BOOL) = {
|
2023-06-29 17:49:54 -03:00
|
|
|
TO_BOOL_ALWAYS_TRUE,
|
|
|
|
TO_BOOL_BOOL,
|
|
|
|
TO_BOOL_INT,
|
|
|
|
TO_BOOL_LIST,
|
|
|
|
TO_BOOL_NONE,
|
|
|
|
TO_BOOL_STR,
|
|
|
|
};
|
|
|
|
|
|
|
|
inst(TO_BOOL, (unused/1, unused/2, value -- res)) {
|
|
|
|
#if ENABLE_SPECIALIZATION
|
|
|
|
_PyToBoolCache *cache = (_PyToBoolCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_ToBool(value, next_instr);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(TO_BOOL, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 01:31:26 -03:00
|
|
|
int err = PyObject_IsTrue(value);
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-08 12:22:56 -04:00
|
|
|
ERROR_IF(err < 0, error);
|
2023-06-29 17:49:54 -03:00
|
|
|
res = err ? Py_True : Py_False;
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(TO_BOOL_BOOL, (unused/1, unused/2, value -- value)) {
|
|
|
|
DEOPT_IF(!PyBool_Check(value), TO_BOOL);
|
|
|
|
STAT_INC(TO_BOOL, hit);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(TO_BOOL_INT, (unused/1, unused/2, value -- res)) {
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(value), TO_BOOL);
|
|
|
|
STAT_INC(TO_BOOL, hit);
|
|
|
|
if (_PyLong_IsZero((PyLongObject *)value)) {
|
|
|
|
assert(_Py_IsImmortal(value));
|
|
|
|
res = Py_False;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-11-08 12:22:56 -04:00
|
|
|
else {
|
2023-06-29 17:49:54 -03:00
|
|
|
DECREF_INPUTS();
|
|
|
|
res = Py_True;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(TO_BOOL_LIST, (unused/1, unused/2, value -- res)) {
|
|
|
|
DEOPT_IF(!PyList_CheckExact(value), TO_BOOL);
|
|
|
|
STAT_INC(TO_BOOL, hit);
|
|
|
|
res = Py_SIZE(value) ? Py_True : Py_False;
|
|
|
|
DECREF_INPUTS();
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(TO_BOOL_NONE, (unused/1, unused/2, value -- res)) {
|
|
|
|
// This one is a bit weird, because we expect *some* failures:
|
|
|
|
DEOPT_IF(!Py_IsNone(value), TO_BOOL);
|
|
|
|
STAT_INC(TO_BOOL, hit);
|
|
|
|
res = Py_False;
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(TO_BOOL_STR, (unused/1, unused/2, value -- res)) {
|
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(value), TO_BOOL);
|
|
|
|
STAT_INC(TO_BOOL, hit);
|
|
|
|
if (value == &_Py_STR(empty)) {
|
|
|
|
assert(_Py_IsImmortal(value));
|
2022-11-08 12:22:56 -04:00
|
|
|
res = Py_False;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-06-29 17:49:54 -03:00
|
|
|
else {
|
|
|
|
assert(Py_SIZE(value));
|
|
|
|
DECREF_INPUTS();
|
|
|
|
res = Py_True;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(TO_BOOL_ALWAYS_TRUE, (unused/1, version/2, value -- res)) {
|
|
|
|
// This one is a bit weird, because we expect *some* failures:
|
|
|
|
assert(version);
|
|
|
|
DEOPT_IF(Py_TYPE(value)->tp_version_tag != version, TO_BOOL);
|
|
|
|
STAT_INC(TO_BOOL, hit);
|
|
|
|
DECREF_INPUTS();
|
|
|
|
res = Py_True;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(UNARY_INVERT, (value -- res)) {
|
|
|
|
res = PyNumber_Invert(value);
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-08 12:22:56 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(BINARY_OP, INLINE_CACHE_ENTRIES_BINARY_OP) = {
|
2023-05-31 12:09:23 -03:00
|
|
|
BINARY_OP_MULTIPLY_INT,
|
2022-11-15 23:59:19 -04:00
|
|
|
BINARY_OP_ADD_INT,
|
2023-05-31 12:09:23 -03:00
|
|
|
BINARY_OP_SUBTRACT_INT,
|
2022-11-15 23:59:19 -04:00
|
|
|
BINARY_OP_MULTIPLY_FLOAT,
|
2023-05-31 12:09:23 -03:00
|
|
|
BINARY_OP_ADD_FLOAT,
|
2022-11-15 23:59:19 -04:00
|
|
|
BINARY_OP_SUBTRACT_FLOAT,
|
2023-05-31 12:09:23 -03:00
|
|
|
BINARY_OP_ADD_UNICODE,
|
|
|
|
// BINARY_OP_INPLACE_ADD_UNICODE, // See comments at that opcode.
|
2022-11-15 23:59:19 -04:00
|
|
|
};
|
|
|
|
|
2023-05-31 12:09:23 -03:00
|
|
|
op(_GUARD_BOTH_INT, (left, right -- left, right)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
|
2023-05-31 12:09:23 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
op(_BINARY_OP_MULTIPLY_INT, (unused/1, left, right -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(BINARY_OP, hit);
|
2023-05-31 12:09:23 -03:00
|
|
|
res = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
|
2023-05-31 12:09:23 -03:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-05-31 12:09:23 -03:00
|
|
|
op(_BINARY_OP_ADD_INT, (unused/1, left, right -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(BINARY_OP, hit);
|
2023-05-31 12:09:23 -03:00
|
|
|
res = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
|
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-05-31 12:09:23 -03:00
|
|
|
op(_BINARY_OP_SUBTRACT_INT, (unused/1, left, right -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(BINARY_OP, hit);
|
2023-05-31 12:09:23 -03:00
|
|
|
res = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
|
2023-05-31 12:09:23 -03:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-05-31 12:09:23 -03:00
|
|
|
macro(BINARY_OP_MULTIPLY_INT) =
|
|
|
|
_GUARD_BOTH_INT + _BINARY_OP_MULTIPLY_INT;
|
|
|
|
macro(BINARY_OP_ADD_INT) =
|
|
|
|
_GUARD_BOTH_INT + _BINARY_OP_ADD_INT;
|
|
|
|
macro(BINARY_OP_SUBTRACT_INT) =
|
|
|
|
_GUARD_BOTH_INT + _BINARY_OP_SUBTRACT_INT;
|
|
|
|
|
|
|
|
op(_GUARD_BOTH_FLOAT, (left, right -- left, right)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
|
2023-05-31 12:09:23 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
op(_BINARY_OP_MULTIPLY_FLOAT, (unused/1, left, right -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(BINARY_OP, hit);
|
2023-05-31 12:09:23 -03:00
|
|
|
double dres =
|
|
|
|
((PyFloatObject *)left)->ob_fval *
|
|
|
|
((PyFloatObject *)right)->ob_fval;
|
|
|
|
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_BINARY_OP_ADD_FLOAT, (unused/1, left, right -- res)) {
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
|
|
|
double dres =
|
|
|
|
((PyFloatObject *)left)->ob_fval +
|
|
|
|
((PyFloatObject *)right)->ob_fval;
|
|
|
|
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_BINARY_OP_SUBTRACT_FLOAT, (unused/1, left, right -- res)) {
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
|
|
|
double dres =
|
|
|
|
((PyFloatObject *)left)->ob_fval -
|
|
|
|
((PyFloatObject *)right)->ob_fval;
|
|
|
|
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-05-31 12:09:23 -03:00
|
|
|
macro(BINARY_OP_MULTIPLY_FLOAT) =
|
|
|
|
_GUARD_BOTH_FLOAT + _BINARY_OP_MULTIPLY_FLOAT;
|
|
|
|
macro(BINARY_OP_ADD_FLOAT) =
|
|
|
|
_GUARD_BOTH_FLOAT + _BINARY_OP_ADD_FLOAT;
|
|
|
|
macro(BINARY_OP_SUBTRACT_FLOAT) =
|
|
|
|
_GUARD_BOTH_FLOAT + _BINARY_OP_SUBTRACT_FLOAT;
|
|
|
|
|
|
|
|
op(_GUARD_BOTH_UNICODE, (left, right -- left, right)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
|
2023-05-31 12:09:23 -03:00
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_BINARY_OP_ADD_UNICODE, (unused/1, left, right -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(BINARY_OP, hit);
|
2022-11-08 12:22:56 -04:00
|
|
|
res = PyUnicode_Concat(left, right);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
|
2022-11-08 12:22:56 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-05-31 12:09:23 -03:00
|
|
|
macro(BINARY_OP_ADD_UNICODE) =
|
|
|
|
_GUARD_BOTH_UNICODE + _BINARY_OP_ADD_UNICODE;
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
// This is a subtle one. It's a super-instruction for
|
|
|
|
// BINARY_OP_ADD_UNICODE followed by STORE_FAST
|
|
|
|
// where the store goes into the left argument.
|
|
|
|
// So the inputs are the same as for all BINARY_OP
|
|
|
|
// specializations, but there is no output.
|
|
|
|
// At the end we just skip over the STORE_FAST.
|
2023-05-31 12:09:23 -03:00
|
|
|
op(_BINARY_OP_INPLACE_ADD_UNICODE, (left, right --)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP];
|
2023-06-05 07:07:04 -03:00
|
|
|
assert(true_next.op.code == STORE_FAST);
|
2023-02-20 10:56:48 -04:00
|
|
|
PyObject **target_local = &GETLOCAL(true_next.op.arg);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(*target_local != left, BINARY_OP);
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
|
|
|
/* Handle `left = left + right` or `left += right` for str.
|
|
|
|
*
|
|
|
|
* When possible, extend `left` in place rather than
|
|
|
|
* allocating a new PyUnicodeObject. This attempts to avoid
|
|
|
|
* quadratic behavior when one neglects to use str.join().
|
|
|
|
*
|
|
|
|
* If `left` has only two references remaining (one from
|
|
|
|
* the stack, one in the locals), DECREFing `left` leaves
|
|
|
|
* only the locals reference, so PyUnicode_Append knows
|
|
|
|
* that the string is safe to mutate.
|
|
|
|
*/
|
|
|
|
assert(Py_REFCNT(left) >= 2);
|
|
|
|
_Py_DECREF_NO_DEALLOC(left);
|
|
|
|
PyUnicode_Append(target_local, right);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
|
2022-11-08 12:22:56 -04:00
|
|
|
ERROR_IF(*target_local == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
// The STORE_FAST is already done.
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-05-31 12:09:23 -03:00
|
|
|
macro(BINARY_OP_INPLACE_ADD_UNICODE) =
|
|
|
|
_GUARD_BOTH_UNICODE + _BINARY_OP_INPLACE_ADD_UNICODE;
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(BINARY_SUBSCR, INLINE_CACHE_ENTRIES_BINARY_SUBSCR) = {
|
2022-11-17 21:06:07 -04:00
|
|
|
BINARY_SUBSCR_DICT,
|
|
|
|
BINARY_SUBSCR_GETITEM,
|
|
|
|
BINARY_SUBSCR_LIST_INT,
|
2023-08-08 17:42:43 -03:00
|
|
|
BINARY_SUBSCR_STR_INT,
|
2022-11-17 21:06:07 -04:00
|
|
|
BINARY_SUBSCR_TUPLE_INT,
|
|
|
|
};
|
|
|
|
|
2023-03-29 19:53:30 -03:00
|
|
|
inst(BINARY_SUBSCR, (unused/1, container, sub -- res)) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-09 14:50:09 -04:00
|
|
|
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_BinarySubscr(container, sub, next_instr);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(BINARY_SUBSCR, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-08 12:22:56 -04:00
|
|
|
res = PyObject_GetItem(container, sub);
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-08 12:22:56 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(BINARY_SLICE, (container, start, stop -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
|
2022-11-08 12:22:56 -04:00
|
|
|
// Can't use ERROR_IF() here, because we haven't
|
|
|
|
// DECREF'ed container yet, and we still own slice.
|
2022-11-03 01:31:26 -03:00
|
|
|
if (slice == NULL) {
|
2022-11-08 12:22:56 -04:00
|
|
|
res = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-11-08 12:22:56 -04:00
|
|
|
else {
|
|
|
|
res = PyObject_GetItem(container, slice);
|
|
|
|
Py_DECREF(slice);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(container);
|
2022-11-08 12:22:56 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-08 12:22:56 -04:00
|
|
|
inst(STORE_SLICE, (v, container, start, stop -- )) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
|
2022-11-08 12:22:56 -04:00
|
|
|
int err;
|
2022-11-03 01:31:26 -03:00
|
|
|
if (slice == NULL) {
|
2022-11-08 12:22:56 -04:00
|
|
|
err = 1;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-11-08 12:22:56 -04:00
|
|
|
else {
|
|
|
|
err = PyObject_SetItem(container, slice, v);
|
|
|
|
Py_DECREF(slice);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(v);
|
|
|
|
Py_DECREF(container);
|
2022-11-08 12:22:56 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-03-29 19:53:30 -03:00
|
|
|
inst(BINARY_SUBSCR_LIST_INT, (unused/1, list, sub -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
|
|
|
|
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
|
|
|
|
|
|
|
|
// Deopt unless 0 <= sub < PyList_Size(list)
|
2023-03-22 11:49:51 -03:00
|
|
|
DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), BINARY_SUBSCR);
|
2023-01-30 06:03:04 -04:00
|
|
|
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(index >= PyList_GET_SIZE(list), BINARY_SUBSCR);
|
|
|
|
STAT_INC(BINARY_SUBSCR, hit);
|
2022-11-17 21:06:07 -04:00
|
|
|
res = PyList_GET_ITEM(list, index);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(res != NULL);
|
|
|
|
Py_INCREF(res);
|
|
|
|
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
|
|
|
|
Py_DECREF(list);
|
|
|
|
}
|
|
|
|
|
2023-08-08 17:42:43 -03:00
|
|
|
inst(BINARY_SUBSCR_STR_INT, (unused/1, str, sub -- res)) {
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
|
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(str), BINARY_SUBSCR);
|
|
|
|
DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), BINARY_SUBSCR);
|
|
|
|
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
|
|
|
|
DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index, BINARY_SUBSCR);
|
|
|
|
// Specialize for reading an ASCII character from any string:
|
|
|
|
Py_UCS4 c = PyUnicode_READ_CHAR(str, index);
|
|
|
|
DEOPT_IF(Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c, BINARY_SUBSCR);
|
|
|
|
STAT_INC(BINARY_SUBSCR, hit);
|
|
|
|
res = (PyObject*)&_Py_SINGLETON(strings).ascii[c];
|
|
|
|
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
|
|
|
|
Py_DECREF(str);
|
|
|
|
}
|
|
|
|
|
2023-03-29 19:53:30 -03:00
|
|
|
inst(BINARY_SUBSCR_TUPLE_INT, (unused/1, tuple, sub -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
|
|
|
|
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
|
|
|
|
|
|
|
|
// Deopt unless 0 <= sub < PyTuple_Size(list)
|
2023-03-22 11:49:51 -03:00
|
|
|
DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), BINARY_SUBSCR);
|
2023-01-30 06:03:04 -04:00
|
|
|
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(index >= PyTuple_GET_SIZE(tuple), BINARY_SUBSCR);
|
|
|
|
STAT_INC(BINARY_SUBSCR, hit);
|
2022-11-17 21:06:07 -04:00
|
|
|
res = PyTuple_GET_ITEM(tuple, index);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(res != NULL);
|
|
|
|
Py_INCREF(res);
|
|
|
|
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
|
|
|
|
Py_DECREF(tuple);
|
|
|
|
}
|
|
|
|
|
2023-03-29 19:53:30 -03:00
|
|
|
inst(BINARY_SUBSCR_DICT, (unused/1, dict, sub -- res)) {
|
2022-11-17 21:06:07 -04:00
|
|
|
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(BINARY_SUBSCR, hit);
|
2022-11-17 21:06:07 -04:00
|
|
|
res = PyDict_GetItemWithError(dict, sub);
|
2022-11-03 01:31:26 -03:00
|
|
|
if (res == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_SetKeyError(sub);
|
|
|
|
}
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-11-17 21:06:07 -04:00
|
|
|
Py_INCREF(res); // Do this before DECREF'ing dict, sub
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-03-29 19:53:30 -03:00
|
|
|
inst(BINARY_SUBSCR_GETITEM, (unused/1, container, sub -- unused)) {
|
2023-05-12 19:23:13 -03:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, BINARY_SUBSCR);
|
2022-11-03 01:31:26 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(container);
|
2023-03-29 19:53:30 -03:00
|
|
|
DEOPT_IF(!PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE), BINARY_SUBSCR);
|
|
|
|
PyHeapTypeObject *ht = (PyHeapTypeObject *)tp;
|
|
|
|
PyObject *cached = ht->_spec_cache.getitem;
|
|
|
|
DEOPT_IF(cached == NULL, BINARY_SUBSCR);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(PyFunction_Check(cached));
|
|
|
|
PyFunctionObject *getitem = (PyFunctionObject *)cached;
|
2023-03-29 19:53:30 -03:00
|
|
|
uint32_t cached_version = ht->_spec_cache.getitem_version;
|
|
|
|
DEOPT_IF(getitem->func_version != cached_version, BINARY_SUBSCR);
|
2022-11-03 01:31:26 -03:00
|
|
|
PyCodeObject *code = (PyCodeObject *)getitem->func_code;
|
|
|
|
assert(code->co_argcount == 2);
|
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), BINARY_SUBSCR);
|
|
|
|
STAT_INC(BINARY_SUBSCR, hit);
|
|
|
|
Py_INCREF(getitem);
|
2023-01-06 10:55:56 -04:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, getitem, 2);
|
2022-11-03 01:31:26 -03:00
|
|
|
STACK_SHRINK(2);
|
|
|
|
new_frame->localsplus[0] = container;
|
|
|
|
new_frame->localsplus[1] = sub;
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_BINARY_SUBSCR);
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->return_offset = 0;
|
2022-11-17 15:36:03 -04:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(LIST_APPEND, (list, unused[oparg-1], v -- list, unused[oparg-1])) {
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(_PyList_AppendTakeRef((PyListObject *)list, v) < 0, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-18 14:41:07 -04:00
|
|
|
inst(SET_ADD, (set, unused[oparg-1], v -- set, unused[oparg-1])) {
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
int err = PySet_Add(set, v);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(STORE_SUBSCR, INLINE_CACHE_ENTRIES_STORE_SUBSCR) = {
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
STORE_SUBSCR_DICT,
|
|
|
|
STORE_SUBSCR_LIST_INT,
|
|
|
|
};
|
|
|
|
|
2023-07-17 16:12:33 -03:00
|
|
|
inst(STORE_SUBSCR, (unused/1, v, container, sub -- )) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2023-07-17 16:12:33 -03:00
|
|
|
_PyStoreSubscrCache *cache = (_PyStoreSubscrCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
2022-11-09 14:50:09 -04:00
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_StoreSubscr(container, sub, next_instr);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(STORE_SUBSCR, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 01:31:26 -03:00
|
|
|
/* container[sub] = v */
|
2022-11-09 14:50:09 -04:00
|
|
|
int err = PyObject_SetItem(container, sub, v);
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(STORE_SUBSCR_LIST_INT, (unused/1, value, list, sub -- )) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
|
|
|
|
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
|
|
|
|
|
|
|
|
// Ensure nonnegative, zero-or-one-digit ints.
|
2023-03-22 11:49:51 -03:00
|
|
|
DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), STORE_SUBSCR);
|
2023-01-30 06:03:04 -04:00
|
|
|
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
// Ensure index < len(list)
|
|
|
|
DEOPT_IF(index >= PyList_GET_SIZE(list), STORE_SUBSCR);
|
|
|
|
STAT_INC(STORE_SUBSCR, hit);
|
|
|
|
|
|
|
|
PyObject *old_value = PyList_GET_ITEM(list, index);
|
|
|
|
PyList_SET_ITEM(list, index, value);
|
|
|
|
assert(old_value != NULL);
|
|
|
|
Py_DECREF(old_value);
|
|
|
|
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
|
|
|
|
Py_DECREF(list);
|
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(STORE_SUBSCR_DICT, (unused/1, value, dict, sub -- )) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyDict_CheckExact(dict), STORE_SUBSCR);
|
|
|
|
STAT_INC(STORE_SUBSCR, hit);
|
|
|
|
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub, value);
|
|
|
|
Py_DECREF(dict);
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(DELETE_SUBSCR, (container, sub --)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* del container[sub] */
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
int err = PyObject_DelItem(container, sub);
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-05 12:05:51 -04:00
|
|
|
inst(CALL_INTRINSIC_1, (value -- res)) {
|
|
|
|
assert(oparg <= MAX_INTRINSIC_1);
|
2023-07-20 13:46:04 -03:00
|
|
|
res = _PyIntrinsics_UnaryFunctions[oparg].func(tstate, value);
|
2023-02-14 07:54:13 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(res == NULL, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(CALL_INTRINSIC_2, (value2, value1 -- res)) {
|
|
|
|
assert(oparg <= MAX_INTRINSIC_2);
|
2023-07-20 13:46:04 -03:00
|
|
|
res = _PyIntrinsics_BinaryFunctions[oparg].func(tstate, value2, value1);
|
2023-02-14 07:54:13 -04:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-25 18:29:56 -04:00
|
|
|
inst(RAISE_VARARGS, (args[oparg] -- )) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *cause = NULL, *exc = NULL;
|
|
|
|
switch (oparg) {
|
|
|
|
case 2:
|
2023-01-25 18:29:56 -04:00
|
|
|
cause = args[1];
|
2022-11-03 01:31:26 -03:00
|
|
|
/* fall through */
|
|
|
|
case 1:
|
2023-01-25 18:29:56 -04:00
|
|
|
exc = args[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
/* fall through */
|
|
|
|
case 0:
|
2023-07-27 09:32:30 -03:00
|
|
|
if (do_raise(tstate, exc, cause)) {
|
|
|
|
assert(oparg == 0);
|
|
|
|
monitor_reraise(tstate, frame, next_instr-1);
|
|
|
|
goto exception_unwind;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError,
|
|
|
|
"bad RAISE_VARARGS oparg");
|
|
|
|
break;
|
|
|
|
}
|
2023-01-25 18:29:56 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(INTERPRETER_EXIT, (retval --)) {
|
2022-11-10 08:34:57 -04:00
|
|
|
assert(frame == &entry_frame);
|
|
|
|
assert(_PyFrame_IsIncomplete(frame));
|
2023-08-17 07:16:03 -03:00
|
|
|
/* Restore previous frame and return. */
|
|
|
|
tstate->current_frame = frame->previous;
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(!_PyErr_Occurred(tstate));
|
2023-08-04 06:10:29 -03:00
|
|
|
tstate->c_recursion_remaining += PY_EVAL_C_STACK_UNITS;
|
2022-11-03 01:31:26 -03:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2023-08-17 15:29:58 -03:00
|
|
|
// The stack effect here is ambiguous.
|
|
|
|
// We definitely pop the return value off the stack on entry.
|
|
|
|
// We also push it onto the stack on exit, but that's a
|
|
|
|
// different frame, and it's accounted for by _PUSH_FRAME.
|
|
|
|
op(_POP_FRAME, (retval --)) {
|
2022-11-10 08:34:57 -04:00
|
|
|
assert(EMPTY());
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
2023-04-12 08:04:55 -03:00
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
|
|
|
// GH-99729: We need to unlink the frame *before* clearing it:
|
|
|
|
_PyInterpreterFrame *dying = frame;
|
2023-08-17 15:29:58 -03:00
|
|
|
#if TIER_ONE
|
|
|
|
assert(frame != &entry_frame);
|
|
|
|
#endif
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame = dying->previous;
|
2023-08-17 15:29:58 -03:00
|
|
|
_PyEval_FrameClearAndPop(tstate, dying);
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->prev_instr += frame->return_offset;
|
2023-04-12 08:04:55 -03:00
|
|
|
_PyFrame_StackPush(frame, retval);
|
2023-08-17 15:29:58 -03:00
|
|
|
#if TIER_ONE
|
2023-04-12 08:04:55 -03:00
|
|
|
goto resume_frame;
|
2023-08-17 15:29:58 -03:00
|
|
|
#endif
|
|
|
|
#if TIER_TWO
|
|
|
|
stack_pointer = _PyFrame_GetStackPointer(frame);
|
|
|
|
ip_offset = (_Py_CODEUNIT *)_PyFrame_GetCode(frame)->co_code_adaptive;
|
|
|
|
#endif
|
2023-04-12 08:04:55 -03:00
|
|
|
}
|
|
|
|
|
2023-08-17 15:29:58 -03:00
|
|
|
macro(RETURN_VALUE) =
|
|
|
|
SAVE_IP + // Tier 2 only; special-cased oparg
|
|
|
|
SAVE_CURRENT_IP + // Sets frame->prev_instr
|
|
|
|
_POP_FRAME;
|
|
|
|
|
2023-04-12 08:04:55 -03:00
|
|
|
inst(INSTRUMENTED_RETURN_VALUE, (retval --)) {
|
|
|
|
int err = _Py_call_instrumentation_arg(
|
|
|
|
tstate, PY_MONITORING_EVENT_PY_RETURN,
|
|
|
|
frame, next_instr-1, retval);
|
|
|
|
if (err) goto error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
assert(EMPTY());
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
2022-11-10 08:34:57 -04:00
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
|
|
|
assert(frame != &entry_frame);
|
2022-12-06 10:01:38 -04:00
|
|
|
// GH-99729: We need to unlink the frame *before* clearing it:
|
|
|
|
_PyInterpreterFrame *dying = frame;
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame = dying->previous;
|
2023-08-17 15:29:58 -03:00
|
|
|
_PyEval_FrameClearAndPop(tstate, dying);
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->prev_instr += frame->return_offset;
|
2022-11-10 08:34:57 -04:00
|
|
|
_PyFrame_StackPush(frame, retval);
|
|
|
|
goto resume_frame;
|
|
|
|
}
|
|
|
|
|
2023-08-17 15:29:58 -03:00
|
|
|
macro(RETURN_CONST) =
|
|
|
|
LOAD_CONST +
|
|
|
|
SAVE_IP + // Tier 2 only; special-cased oparg
|
|
|
|
SAVE_CURRENT_IP + // Sets frame->prev_instr
|
|
|
|
_POP_FRAME;
|
2023-04-12 08:04:55 -03:00
|
|
|
|
|
|
|
inst(INSTRUMENTED_RETURN_CONST, (--)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *retval = GETITEM(FRAME_CO_CONSTS, oparg);
|
2023-04-12 08:04:55 -03:00
|
|
|
int err = _Py_call_instrumentation_arg(
|
|
|
|
tstate, PY_MONITORING_EVENT_PY_RETURN,
|
|
|
|
frame, next_instr-1, retval);
|
|
|
|
if (err) goto error;
|
|
|
|
Py_INCREF(retval);
|
|
|
|
assert(EMPTY());
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
2023-02-07 18:32:21 -04:00
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
|
|
|
assert(frame != &entry_frame);
|
|
|
|
// GH-99729: We need to unlink the frame *before* clearing it:
|
|
|
|
_PyInterpreterFrame *dying = frame;
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame = dying->previous;
|
2023-08-17 15:29:58 -03:00
|
|
|
_PyEval_FrameClearAndPop(tstate, dying);
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->prev_instr += frame->return_offset;
|
2023-02-07 18:32:21 -04:00
|
|
|
_PyFrame_StackPush(frame, retval);
|
|
|
|
goto resume_frame;
|
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(GET_AITER, (obj -- iter)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
unaryfunc getter = NULL;
|
|
|
|
PyTypeObject *type = Py_TYPE(obj);
|
|
|
|
|
|
|
|
if (type->tp_as_async != NULL) {
|
|
|
|
getter = type->tp_as_async->am_aiter;
|
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
if (getter == NULL) {
|
2022-11-03 01:31:26 -03:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'async for' requires an object with "
|
|
|
|
"__aiter__ method, got %.100s",
|
|
|
|
type->tp_name);
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
iter = (*getter)(obj);
|
2022-12-17 00:45:55 -04:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(iter == NULL, error);
|
|
|
|
|
2022-11-03 01:31:26 -03:00
|
|
|
if (Py_TYPE(iter)->tp_as_async == NULL ||
|
|
|
|
Py_TYPE(iter)->tp_as_async->am_anext == NULL) {
|
|
|
|
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'async for' received an object from __aiter__ "
|
|
|
|
"that does not implement __anext__: %.100s",
|
|
|
|
Py_TYPE(iter)->tp_name);
|
|
|
|
Py_DECREF(iter);
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(GET_ANEXT, (aiter -- aiter, awaitable)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
unaryfunc getter = NULL;
|
|
|
|
PyObject *next_iter = NULL;
|
|
|
|
PyTypeObject *type = Py_TYPE(aiter);
|
|
|
|
|
|
|
|
if (PyAsyncGen_CheckExact(aiter)) {
|
|
|
|
awaitable = type->tp_as_async->am_anext(aiter);
|
|
|
|
if (awaitable == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (type->tp_as_async != NULL){
|
|
|
|
getter = type->tp_as_async->am_anext;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (getter != NULL) {
|
|
|
|
next_iter = (*getter)(aiter);
|
|
|
|
if (next_iter == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'async for' requires an iterator with "
|
|
|
|
"__anext__ method, got %.100s",
|
|
|
|
type->tp_name);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
awaitable = _PyCoro_GetAwaitableIter(next_iter);
|
|
|
|
if (awaitable == NULL) {
|
|
|
|
_PyErr_FormatFromCause(
|
|
|
|
PyExc_TypeError,
|
|
|
|
"'async for' received an invalid object "
|
|
|
|
"from __anext__: %.100s",
|
|
|
|
Py_TYPE(next_iter)->tp_name);
|
|
|
|
|
|
|
|
Py_DECREF(next_iter);
|
|
|
|
goto error;
|
|
|
|
} else {
|
|
|
|
Py_DECREF(next_iter);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(GET_AWAITABLE, (iterable -- iter)) {
|
|
|
|
iter = _PyCoro_GetAwaitableIter(iterable);
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
if (iter == NULL) {
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatAwaitableError(tstate, Py_TYPE(iterable), oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
if (iter != NULL && PyCoro_CheckExact(iter)) {
|
|
|
|
PyObject *yf = _PyGen_yf((PyGenObject*)iter);
|
|
|
|
if (yf != NULL) {
|
|
|
|
/* `iter` is a coroutine object that is being
|
|
|
|
awaited, `yf` is a pointer to the current awaitable
|
|
|
|
being awaited on. */
|
|
|
|
Py_DECREF(yf);
|
|
|
|
Py_CLEAR(iter);
|
|
|
|
_PyErr_SetString(tstate, PyExc_RuntimeError,
|
|
|
|
"coroutine is being awaited already");
|
|
|
|
/* The code below jumps to `error` if `iter` is NULL. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(iter == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(SEND, INLINE_CACHE_ENTRIES_SEND) = {
|
2023-02-13 07:24:55 -04:00
|
|
|
SEND_GEN,
|
|
|
|
};
|
|
|
|
|
|
|
|
inst(SEND, (unused/1, receiver, v -- receiver, retval)) {
|
|
|
|
#if ENABLE_SPECIALIZATION
|
|
|
|
_PySendCache *cache = (_PySendCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_Send(receiver, next_instr);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(SEND, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-10 08:34:57 -04:00
|
|
|
assert(frame != &entry_frame);
|
2023-05-12 19:23:13 -03:00
|
|
|
if ((tstate->interp->eval_frame == NULL) &&
|
|
|
|
(Py_TYPE(receiver) == &PyGen_Type || Py_TYPE(receiver) == &PyCoro_Type) &&
|
|
|
|
((PyGenObject *)receiver)->gi_frame_state < FRAME_EXECUTING)
|
2023-04-12 08:04:55 -03:00
|
|
|
{
|
|
|
|
PyGenObject *gen = (PyGenObject *)receiver;
|
|
|
|
_PyInterpreterFrame *gen_frame = (_PyInterpreterFrame *)gen->gi_iframe;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
_PyFrame_StackPush(gen_frame, v);
|
|
|
|
gen->gi_frame_state = FRAME_EXECUTING;
|
|
|
|
gen->gi_exc_state.previous_item = tstate->exc_info;
|
|
|
|
tstate->exc_info = &gen->gi_exc_state;
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_SEND);
|
2023-08-16 20:26:43 -03:00
|
|
|
frame->return_offset = oparg;
|
2023-04-12 08:04:55 -03:00
|
|
|
DISPATCH_INLINED(gen_frame);
|
|
|
|
}
|
2023-02-13 07:24:55 -04:00
|
|
|
if (Py_IsNone(v) && PyIter_Check(receiver)) {
|
|
|
|
retval = Py_TYPE(receiver)->tp_iternext(receiver);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
retval = PyObject_CallMethodOneArg(receiver, &_Py_ID(send), v);
|
|
|
|
}
|
|
|
|
if (retval == NULL) {
|
2023-04-12 08:04:55 -03:00
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)
|
|
|
|
) {
|
|
|
|
monitor_raise(tstate, frame, next_instr-1);
|
|
|
|
}
|
2023-02-13 07:24:55 -04:00
|
|
|
if (_PyGen_FetchStopIterationValue(&retval) == 0) {
|
|
|
|
assert(retval != NULL);
|
|
|
|
JUMPBY(oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
2023-02-13 07:24:55 -04:00
|
|
|
goto error;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
2023-02-15 08:21:40 -04:00
|
|
|
Py_DECREF(v);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-05-11 08:52:06 -03:00
|
|
|
inst(SEND_GEN, (unused/1, receiver, v -- receiver, unused)) {
|
2023-05-12 19:23:13 -03:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, SEND);
|
2023-02-13 07:24:55 -04:00
|
|
|
PyGenObject *gen = (PyGenObject *)receiver;
|
|
|
|
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type &&
|
|
|
|
Py_TYPE(gen) != &PyCoro_Type, SEND);
|
|
|
|
DEOPT_IF(gen->gi_frame_state >= FRAME_EXECUTING, SEND);
|
|
|
|
STAT_INC(SEND, hit);
|
|
|
|
_PyInterpreterFrame *gen_frame = (_PyInterpreterFrame *)gen->gi_iframe;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
_PyFrame_StackPush(gen_frame, v);
|
|
|
|
gen->gi_frame_state = FRAME_EXECUTING;
|
|
|
|
gen->gi_exc_state.previous_item = tstate->exc_info;
|
|
|
|
tstate->exc_info = &gen->gi_exc_state;
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_SEND);
|
2023-08-16 20:26:43 -03:00
|
|
|
frame->return_offset = oparg;
|
2023-02-13 07:24:55 -04:00
|
|
|
DISPATCH_INLINED(gen_frame);
|
|
|
|
}
|
|
|
|
|
2023-04-12 08:04:55 -03:00
|
|
|
inst(INSTRUMENTED_YIELD_VALUE, (retval -- unused)) {
|
|
|
|
assert(frame != &entry_frame);
|
2023-06-13 17:42:03 -03:00
|
|
|
assert(oparg >= 0); /* make the generator identify this as HAS_ARG */
|
2023-04-12 08:04:55 -03:00
|
|
|
PyGenObject *gen = _PyFrame_GetGenerator(frame);
|
|
|
|
gen->gi_frame_state = FRAME_SUSPENDED;
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer - 1);
|
|
|
|
int err = _Py_call_instrumentation_arg(
|
|
|
|
tstate, PY_MONITORING_EVENT_PY_YIELD,
|
|
|
|
frame, next_instr-1, retval);
|
|
|
|
if (err) goto error;
|
|
|
|
tstate->exc_info = gen->gi_exc_state.previous_item;
|
|
|
|
gen->gi_exc_state.previous_item = NULL;
|
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
|
|
|
_PyInterpreterFrame *gen_frame = frame;
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame = frame->previous;
|
2023-04-12 08:04:55 -03:00
|
|
|
gen_frame->previous = NULL;
|
|
|
|
_PyFrame_StackPush(frame, retval);
|
|
|
|
goto resume_frame;
|
|
|
|
}
|
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
inst(YIELD_VALUE, (retval -- unused)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
// NOTE: It's important that YIELD_VALUE never raises an exception!
|
|
|
|
// The compiler treats any exception raised here as a failed close()
|
|
|
|
// or throw() call.
|
2023-06-13 17:42:03 -03:00
|
|
|
assert(oparg >= 0); /* make the generator identify this as HAS_ARG */
|
2022-11-10 08:34:57 -04:00
|
|
|
assert(frame != &entry_frame);
|
2022-11-07 10:49:51 -04:00
|
|
|
PyGenObject *gen = _PyFrame_GetGenerator(frame);
|
|
|
|
gen->gi_frame_state = FRAME_SUSPENDED;
|
2022-12-27 21:11:03 -04:00
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer - 1);
|
2022-11-07 10:49:51 -04:00
|
|
|
tstate->exc_info = gen->gi_exc_state.previous_item;
|
|
|
|
gen->gi_exc_state.previous_item = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
2022-11-10 08:34:57 -04:00
|
|
|
_PyInterpreterFrame *gen_frame = frame;
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame = frame->previous;
|
2022-11-10 08:34:57 -04:00
|
|
|
gen_frame->previous = NULL;
|
|
|
|
_PyFrame_StackPush(frame, retval);
|
|
|
|
goto resume_frame;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(POP_EXCEPT, (exc_value -- )) {
|
2022-11-03 01:31:26 -03:00
|
|
|
_PyErr_StackItem *exc_info = tstate->exc_info;
|
2022-12-27 21:11:03 -04:00
|
|
|
Py_XSETREF(exc_info->exc_value, exc_value);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-02 06:02:57 -04:00
|
|
|
inst(RERAISE, (values[oparg], exc -- values[oparg])) {
|
|
|
|
assert(oparg >= 0 && oparg <= 2);
|
2022-11-03 01:31:26 -03:00
|
|
|
if (oparg) {
|
2023-02-02 06:02:57 -04:00
|
|
|
PyObject *lasti = values[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
if (PyLong_Check(lasti)) {
|
2023-06-14 09:46:37 -03:00
|
|
|
frame->prev_instr = _PyCode_CODE(_PyFrame_GetCode(frame)) + PyLong_AsLong(lasti);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(!_PyErr_Occurred(tstate));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
assert(PyLong_Check(lasti));
|
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError, "lasti is not an int");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
2023-02-02 06:02:57 -04:00
|
|
|
assert(exc && PyExceptionInstance_Check(exc));
|
|
|
|
Py_INCREF(exc);
|
2023-03-19 12:17:59 -03:00
|
|
|
_PyErr_SetRaisedException(tstate, exc);
|
2023-07-27 09:32:30 -03:00
|
|
|
monitor_reraise(tstate, frame, next_instr-1);
|
2022-11-03 01:31:26 -03:00
|
|
|
goto exception_unwind;
|
|
|
|
}
|
|
|
|
|
2023-01-31 14:47:50 -04:00
|
|
|
inst(END_ASYNC_FOR, (awaitable, exc -- )) {
|
|
|
|
assert(exc && PyExceptionInstance_Check(exc));
|
|
|
|
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
|
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
2023-01-31 14:47:50 -04:00
|
|
|
Py_INCREF(exc);
|
2023-03-19 12:17:59 -03:00
|
|
|
_PyErr_SetRaisedException(tstate, exc);
|
2023-07-27 09:32:30 -03:00
|
|
|
monitor_reraise(tstate, frame, next_instr-1);
|
2022-11-03 01:31:26 -03:00
|
|
|
goto exception_unwind;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-13 07:24:55 -04:00
|
|
|
inst(CLEANUP_THROW, (sub_iter, last_sent_val, exc_value -- none, value)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(throwflag);
|
|
|
|
assert(exc_value && PyExceptionInstance_Check(exc_value));
|
|
|
|
if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) {
|
2023-02-02 06:02:57 -04:00
|
|
|
value = Py_NewRef(((PyStopIterationObject *)exc_value)->value);
|
|
|
|
DECREF_INPUTS();
|
2023-05-16 18:36:02 -03:00
|
|
|
none = Py_None;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-11-10 14:50:57 -04:00
|
|
|
else {
|
2023-02-08 05:31:12 -04:00
|
|
|
_PyErr_SetRaisedException(tstate, Py_NewRef(exc_value));
|
2023-07-27 09:32:30 -03:00
|
|
|
monitor_reraise(tstate, frame, next_instr-1);
|
2022-11-10 14:50:57 -04:00
|
|
|
goto exception_unwind;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(LOAD_ASSERTION_ERROR, ( -- value)) {
|
|
|
|
value = Py_NewRef(PyExc_AssertionError);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(LOAD_BUILD_CLASS, ( -- bc)) {
|
2023-07-11 17:04:12 -03:00
|
|
|
ERROR_IF(PyMapping_GetOptionalItem(BUILTINS(), &_Py_ID(__build_class__), &bc) < 0, error);
|
|
|
|
if (bc == NULL) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_NameError,
|
|
|
|
"__build_class__ not found");
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-05-16 00:36:23 -03:00
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(STORE_NAME, (v -- )) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *ns = LOCALS();
|
|
|
|
int err;
|
|
|
|
if (ns == NULL) {
|
|
|
|
_PyErr_Format(tstate, PyExc_SystemError,
|
|
|
|
"no locals found when storing %R", name);
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
if (PyDict_CheckExact(ns))
|
|
|
|
err = PyDict_SetItem(ns, name, v);
|
|
|
|
else
|
|
|
|
err = PyObject_SetItem(ns, name, v);
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-10 14:50:57 -04:00
|
|
|
inst(DELETE_NAME, (--)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *ns = LOCALS();
|
|
|
|
int err;
|
|
|
|
if (ns == NULL) {
|
|
|
|
_PyErr_Format(tstate, PyExc_SystemError,
|
|
|
|
"no locals when deleting %R", name);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
err = PyObject_DelItem(ns, name);
|
2022-11-10 14:50:57 -04:00
|
|
|
// Can't use ERROR_IF here.
|
2022-11-03 01:31:26 -03:00
|
|
|
if (err != 0) {
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG,
|
|
|
|
name);
|
2022-11-03 01:31:26 -03:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(UNPACK_SEQUENCE, INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE) = {
|
2023-02-07 19:44:37 -04:00
|
|
|
UNPACK_SEQUENCE_TWO_TUPLE,
|
|
|
|
UNPACK_SEQUENCE_TUPLE,
|
|
|
|
UNPACK_SEQUENCE_LIST,
|
|
|
|
};
|
|
|
|
|
2023-02-07 16:37:43 -04:00
|
|
|
inst(UNPACK_SEQUENCE, (unused/1, seq -- unused[oparg])) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-09 14:50:09 -04:00
|
|
|
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_UnpackSequence(seq, next_instr, oparg);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(UNPACK_SEQUENCE, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-02-07 16:37:43 -04:00
|
|
|
PyObject **top = stack_pointer + oparg - 1;
|
2023-07-20 17:37:19 -03:00
|
|
|
int res = _PyEval_UnpackIterable(tstate, seq, oparg, -1, top);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-02-07 16:37:43 -04:00
|
|
|
ERROR_IF(res == 0, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-07 19:44:37 -04:00
|
|
|
inst(UNPACK_SEQUENCE_TWO_TUPLE, (unused/1, seq -- values[oparg])) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
|
|
|
|
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
|
2023-02-07 19:44:37 -04:00
|
|
|
assert(oparg == 2);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(UNPACK_SEQUENCE, hit);
|
2023-02-07 19:44:37 -04:00
|
|
|
values[0] = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
|
|
|
|
values[1] = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-07 19:44:37 -04:00
|
|
|
inst(UNPACK_SEQUENCE_TUPLE, (unused/1, seq -- values[oparg])) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
|
|
|
|
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
|
|
|
|
STAT_INC(UNPACK_SEQUENCE, hit);
|
|
|
|
PyObject **items = _PyTuple_ITEMS(seq);
|
2023-02-07 19:44:37 -04:00
|
|
|
for (int i = oparg; --i >= 0; ) {
|
|
|
|
*values++ = Py_NewRef(items[i]);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-07 19:44:37 -04:00
|
|
|
inst(UNPACK_SEQUENCE_LIST, (unused/1, seq -- values[oparg])) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
|
|
|
|
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
|
|
|
|
STAT_INC(UNPACK_SEQUENCE, hit);
|
|
|
|
PyObject **items = _PyList_ITEMS(seq);
|
2023-02-07 19:44:37 -04:00
|
|
|
for (int i = oparg; --i >= 0; ) {
|
|
|
|
*values++ = Py_NewRef(items[i]);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-07 16:37:43 -04:00
|
|
|
inst(UNPACK_EX, (seq -- unused[oparg & 0xFF], unused, unused[oparg >> 8])) {
|
2022-11-03 01:31:26 -03:00
|
|
|
int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
|
2023-02-07 16:37:43 -04:00
|
|
|
PyObject **top = stack_pointer + totalargs - 1;
|
2023-07-20 17:37:19 -03:00
|
|
|
int res = _PyEval_UnpackIterable(tstate, seq, oparg & 0xFF, oparg >> 8, top);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-02-07 16:37:43 -04:00
|
|
|
ERROR_IF(res == 0, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(STORE_ATTR, INLINE_CACHE_ENTRIES_STORE_ATTR) = {
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
STORE_ATTR_INSTANCE_VALUE,
|
|
|
|
STORE_ATTR_SLOT,
|
|
|
|
STORE_ATTR_WITH_HINT,
|
|
|
|
};
|
|
|
|
|
2023-07-17 16:12:33 -03:00
|
|
|
inst(STORE_ATTR, (unused/1, unused/3, v, owner --)) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2023-07-17 16:12:33 -03:00
|
|
|
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2022-11-09 14:50:09 -04:00
|
|
|
next_instr--;
|
2022-11-17 19:09:18 -04:00
|
|
|
_Py_Specialize_StoreAttr(owner, next_instr, name);
|
2022-11-09 14:50:09 -04:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(STORE_ATTR, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
int err = PyObject_SetAttr(owner, name, v);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(DELETE_ATTR, (owner --)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2023-07-11 06:38:22 -03:00
|
|
|
int err = PyObject_DelAttr(owner, name);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(STORE_GLOBAL, (v --)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
int err = PyDict_SetItem(GLOBALS(), name, v);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-10 14:50:57 -04:00
|
|
|
inst(DELETE_GLOBAL, (--)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
int err;
|
|
|
|
err = PyDict_DelItem(GLOBALS(), name);
|
2022-11-10 14:50:57 -04:00
|
|
|
// Can't use ERROR_IF here.
|
2022-11-03 01:31:26 -03:00
|
|
|
if (err != 0) {
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-05-16 00:36:23 -03:00
|
|
|
op(_LOAD_LOCALS, ( -- locals)) {
|
|
|
|
locals = LOCALS();
|
2022-11-03 01:31:26 -03:00
|
|
|
if (locals == NULL) {
|
2023-05-16 00:36:23 -03:00
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError,
|
|
|
|
"no locals found");
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-05-16 00:36:23 -03:00
|
|
|
Py_INCREF(locals);
|
|
|
|
}
|
|
|
|
|
|
|
|
macro(LOAD_LOCALS) = _LOAD_LOCALS;
|
|
|
|
|
|
|
|
op(_LOAD_FROM_DICT_OR_GLOBALS, (mod_or_class_dict -- v)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2023-07-11 17:04:12 -03:00
|
|
|
if (PyMapping_GetOptionalItem(mod_or_class_dict, name, &v) < 0) {
|
|
|
|
Py_DECREF(mod_or_class_dict);
|
|
|
|
goto error;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-05-16 00:36:23 -03:00
|
|
|
Py_DECREF(mod_or_class_dict);
|
2022-11-03 01:31:26 -03:00
|
|
|
if (v == NULL) {
|
|
|
|
v = PyDict_GetItemWithError(GLOBALS(), name);
|
|
|
|
if (v != NULL) {
|
|
|
|
Py_INCREF(v);
|
|
|
|
}
|
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else {
|
2023-07-11 17:04:12 -03:00
|
|
|
if (PyMapping_GetOptionalItem(BUILTINS(), name, &v) < 0) {
|
|
|
|
goto error;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-07-11 17:04:12 -03:00
|
|
|
if (v == NULL) {
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatExcCheckArg(
|
2023-07-11 17:04:12 -03:00
|
|
|
tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
|
|
|
goto error;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-05-16 00:36:23 -03:00
|
|
|
macro(LOAD_NAME) = _LOAD_LOCALS + _LOAD_FROM_DICT_OR_GLOBALS;
|
|
|
|
|
|
|
|
macro(LOAD_FROM_DICT_OR_GLOBALS) = _LOAD_FROM_DICT_OR_GLOBALS;
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(LOAD_GLOBAL, INLINE_CACHE_ENTRIES_LOAD_GLOBAL) = {
|
2023-02-01 17:12:49 -04:00
|
|
|
LOAD_GLOBAL_MODULE,
|
|
|
|
LOAD_GLOBAL_BUILTIN,
|
|
|
|
};
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_GLOBAL, (unused/1, unused/1, unused/1, unused/1 -- res, null if (oparg & 1))) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-09 14:50:09 -04:00
|
|
|
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
|
2022-11-09 14:50:09 -04:00
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_LoadGlobal(GLOBALS(), BUILTINS(), next_instr, name);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(LOAD_GLOBAL, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
|
2022-11-03 01:31:26 -03:00
|
|
|
if (PyDict_CheckExact(GLOBALS())
|
|
|
|
&& PyDict_CheckExact(BUILTINS()))
|
|
|
|
{
|
2023-08-09 15:19:39 -03:00
|
|
|
res = _PyDict_LoadGlobal((PyDictObject *)GLOBALS(),
|
|
|
|
(PyDictObject *)BUILTINS(),
|
|
|
|
name);
|
|
|
|
if (res == NULL) {
|
2022-11-03 01:31:26 -03:00
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
/* _PyDict_LoadGlobal() returns NULL without raising
|
|
|
|
* an exception if the key doesn't exist */
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-02-01 17:12:49 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-08-09 15:19:39 -03:00
|
|
|
Py_INCREF(res);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Slow-path if globals or builtins is not a dict */
|
|
|
|
|
|
|
|
/* namespace 1: globals */
|
2023-08-09 15:19:39 -03:00
|
|
|
ERROR_IF(PyMapping_GetOptionalItem(GLOBALS(), name, &res) < 0, error);
|
|
|
|
if (res == NULL) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* namespace 2: builtins */
|
2023-08-09 15:19:39 -03:00
|
|
|
ERROR_IF(PyMapping_GetOptionalItem(BUILTINS(), name, &res) < 0, error);
|
|
|
|
if (res == NULL) {
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatExcCheckArg(
|
2023-07-11 17:04:12 -03:00
|
|
|
tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
2023-02-01 17:12:49 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2023-02-01 17:12:49 -04:00
|
|
|
null = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-12 10:34:14 -03:00
|
|
|
op(_GUARD_GLOBALS_VERSION, (version/1 --)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyDictObject *dict = (PyDictObject *)GLOBALS();
|
2023-07-12 10:34:14 -03:00
|
|
|
DEOPT_IF(!PyDict_CheckExact(dict), LOAD_GLOBAL);
|
|
|
|
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
|
|
|
|
assert(DK_IS_UNICODE(dict->ma_keys));
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_GUARD_BUILTINS_VERSION, (version/1 --)) {
|
|
|
|
PyDictObject *dict = (PyDictObject *)BUILTINS();
|
|
|
|
DEOPT_IF(!PyDict_CheckExact(dict), LOAD_GLOBAL);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
|
|
|
|
assert(DK_IS_UNICODE(dict->ma_keys));
|
2023-07-12 10:34:14 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
op(_LOAD_GLOBAL_MODULE, (index/1 -- res, null if (oparg & 1))) {
|
2023-07-12 10:34:14 -03:00
|
|
|
PyDictObject *dict = (PyDictObject *)GLOBALS();
|
2022-11-03 01:31:26 -03:00
|
|
|
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(dict->ma_keys);
|
2023-02-01 17:12:49 -04:00
|
|
|
res = entries[index].me_value;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(res == NULL, LOAD_GLOBAL);
|
2023-02-01 17:12:49 -04:00
|
|
|
Py_INCREF(res);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_GLOBAL, hit);
|
2023-02-01 17:12:49 -04:00
|
|
|
null = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
op(_LOAD_GLOBAL_BUILTINS, (index/1 -- res, null if (oparg & 1))) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyDictObject *bdict = (PyDictObject *)BUILTINS();
|
|
|
|
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(bdict->ma_keys);
|
2023-02-01 17:12:49 -04:00
|
|
|
res = entries[index].me_value;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(res == NULL, LOAD_GLOBAL);
|
2023-02-01 17:12:49 -04:00
|
|
|
Py_INCREF(res);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_GLOBAL, hit);
|
2023-02-01 17:12:49 -04:00
|
|
|
null = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-12 10:34:14 -03:00
|
|
|
macro(LOAD_GLOBAL_MODULE) =
|
2023-07-31 12:55:33 -03:00
|
|
|
unused/1 + // Skip over the counter
|
2023-07-12 10:34:14 -03:00
|
|
|
_GUARD_GLOBALS_VERSION +
|
2023-07-31 12:55:33 -03:00
|
|
|
unused/1 + // Skip over the builtins version
|
2023-07-12 10:34:14 -03:00
|
|
|
_LOAD_GLOBAL_MODULE;
|
|
|
|
|
|
|
|
macro(LOAD_GLOBAL_BUILTIN) =
|
2023-07-31 12:55:33 -03:00
|
|
|
unused/1 + // Skip over the counter
|
2023-07-12 10:34:14 -03:00
|
|
|
_GUARD_GLOBALS_VERSION +
|
|
|
|
_GUARD_BUILTINS_VERSION +
|
|
|
|
_LOAD_GLOBAL_BUILTINS;
|
|
|
|
|
2022-11-10 14:50:57 -04:00
|
|
|
inst(DELETE_FAST, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *v = GETLOCAL(oparg);
|
2022-11-10 14:50:57 -04:00
|
|
|
ERROR_IF(v == NULL, unbound_local_error);
|
|
|
|
SETLOCAL(oparg, NULL);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-10 14:50:57 -04:00
|
|
|
inst(MAKE_CELL, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
// "initial" is probably NULL but not if it's an arg (or set
|
|
|
|
// via PyFrame_LocalsToFast() before MAKE_CELL has run).
|
|
|
|
PyObject *initial = GETLOCAL(oparg);
|
|
|
|
PyObject *cell = PyCell_New(initial);
|
|
|
|
if (cell == NULL) {
|
|
|
|
goto resume_with_error;
|
|
|
|
}
|
|
|
|
SETLOCAL(oparg, cell);
|
|
|
|
}
|
|
|
|
|
2022-11-10 14:50:57 -04:00
|
|
|
inst(DELETE_DEREF, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *cell = GETLOCAL(oparg);
|
|
|
|
PyObject *oldobj = PyCell_GET(cell);
|
2022-11-10 14:50:57 -04:00
|
|
|
// Can't use ERROR_IF here.
|
|
|
|
// Fortunately we don't need its superpower.
|
|
|
|
if (oldobj == NULL) {
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg);
|
2022-11-10 14:50:57 -04:00
|
|
|
goto error;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-11-10 14:50:57 -04:00
|
|
|
PyCell_SET(cell, NULL);
|
|
|
|
Py_DECREF(oldobj);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-05-16 00:36:23 -03:00
|
|
|
inst(LOAD_FROM_DICT_OR_DEREF, (class_dict -- value)) {
|
|
|
|
PyObject *name;
|
|
|
|
assert(class_dict);
|
2023-06-14 09:46:37 -03:00
|
|
|
assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);
|
|
|
|
name = PyTuple_GET_ITEM(_PyFrame_GetCode(frame)->co_localsplusnames, oparg);
|
2023-07-11 17:04:12 -03:00
|
|
|
if (PyMapping_GetOptionalItem(class_dict, name, &value) < 0) {
|
|
|
|
Py_DECREF(class_dict);
|
|
|
|
goto error;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-05-16 00:36:23 -03:00
|
|
|
Py_DECREF(class_dict);
|
2022-11-03 01:31:26 -03:00
|
|
|
if (!value) {
|
|
|
|
PyObject *cell = GETLOCAL(oparg);
|
|
|
|
value = PyCell_GET(cell);
|
|
|
|
if (value == NULL) {
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_INCREF(value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(LOAD_DEREF, ( -- value)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *cell = GETLOCAL(oparg);
|
2022-12-27 21:11:03 -04:00
|
|
|
value = PyCell_GET(cell);
|
2022-11-03 01:31:26 -03:00
|
|
|
if (value == NULL) {
|
2023-07-20 17:37:19 -03:00
|
|
|
_PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg);
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-12-27 21:11:03 -04:00
|
|
|
Py_INCREF(value);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(STORE_DEREF, (v --)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *cell = GETLOCAL(oparg);
|
|
|
|
PyObject *oldobj = PyCell_GET(cell);
|
|
|
|
PyCell_SET(cell, v);
|
|
|
|
Py_XDECREF(oldobj);
|
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(COPY_FREE_VARS, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* Copy closure variables to free variables */
|
2023-06-14 09:46:37 -03:00
|
|
|
PyCodeObject *co = _PyFrame_GetCode(frame);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(PyFunction_Check(frame->f_funcobj));
|
|
|
|
PyObject *closure = ((PyFunctionObject *)frame->f_funcobj)->func_closure;
|
|
|
|
assert(oparg == co->co_nfreevars);
|
2023-01-04 11:41:39 -04:00
|
|
|
int offset = co->co_nlocalsplus - oparg;
|
2022-11-03 01:31:26 -03:00
|
|
|
for (int i = 0; i < oparg; ++i) {
|
|
|
|
PyObject *o = PyTuple_GET_ITEM(closure, i);
|
2022-11-10 06:25:33 -04:00
|
|
|
frame->localsplus[offset + i] = Py_NewRef(o);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(BUILD_STRING, (pieces[oparg] -- str)) {
|
|
|
|
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-01-17 19:59:19 -04:00
|
|
|
ERROR_IF(str == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(BUILD_TUPLE, (values[oparg] -- tup)) {
|
|
|
|
tup = _PyTuple_FromArraySteal(values, oparg);
|
|
|
|
ERROR_IF(tup == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(BUILD_LIST, (values[oparg] -- list)) {
|
|
|
|
list = _PyList_FromArraySteal(values, oparg);
|
|
|
|
ERROR_IF(list == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(LIST_EXTEND, (list, unused[oparg-1], iterable -- list, unused[oparg-1])) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
|
|
|
|
if (none_val == NULL) {
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
|
|
|
|
(Py_TYPE(iterable)->tp_iter == NULL && !PySequence_Check(iterable)))
|
|
|
|
{
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"Value after * must be an iterable, not %.200s",
|
|
|
|
Py_TYPE(iterable)->tp_name);
|
|
|
|
}
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-05-16 18:36:02 -03:00
|
|
|
assert(Py_IsNone(none_val));
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(SET_UPDATE, (set, unused[oparg-1], iterable -- set, unused[oparg-1])) {
|
2022-11-03 01:31:26 -03:00
|
|
|
int err = _PySet_Update(set, iterable);
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(err < 0, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(BUILD_SET, (values[oparg] -- set)) {
|
|
|
|
set = PySet_New(NULL);
|
2023-02-16 13:46:43 -04:00
|
|
|
if (set == NULL)
|
|
|
|
goto error;
|
2022-11-03 01:31:26 -03:00
|
|
|
int err = 0;
|
2023-01-17 19:59:19 -04:00
|
|
|
for (int i = 0; i < oparg; i++) {
|
|
|
|
PyObject *item = values[i];
|
2022-11-03 01:31:26 -03:00
|
|
|
if (err == 0)
|
|
|
|
err = PySet_Add(set, item);
|
|
|
|
Py_DECREF(item);
|
|
|
|
}
|
|
|
|
if (err != 0) {
|
|
|
|
Py_DECREF(set);
|
2023-01-17 19:59:19 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(BUILD_MAP, (values[oparg*2] -- map)) {
|
|
|
|
map = _PyDict_FromItems(
|
|
|
|
values, 2,
|
|
|
|
values+1, 2,
|
2022-11-03 01:31:26 -03:00
|
|
|
oparg);
|
|
|
|
if (map == NULL)
|
|
|
|
goto error;
|
|
|
|
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-01-17 19:59:19 -04:00
|
|
|
ERROR_IF(map == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(SETUP_ANNOTATIONS, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
int err;
|
|
|
|
PyObject *ann_dict;
|
|
|
|
if (LOCALS() == NULL) {
|
|
|
|
_PyErr_Format(tstate, PyExc_SystemError,
|
|
|
|
"no locals found when setting up annotations");
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
/* check if __annotations__ in locals()... */
|
|
|
|
if (PyDict_CheckExact(LOCALS())) {
|
|
|
|
ann_dict = _PyDict_GetItemWithError(LOCALS(),
|
|
|
|
&_Py_ID(__annotations__));
|
|
|
|
if (ann_dict == NULL) {
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(_PyErr_Occurred(tstate), error);
|
2022-11-03 01:31:26 -03:00
|
|
|
/* ...if not, create a new one */
|
|
|
|
ann_dict = PyDict_New();
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(ann_dict == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
err = PyDict_SetItem(LOCALS(), &_Py_ID(__annotations__),
|
|
|
|
ann_dict);
|
|
|
|
Py_DECREF(ann_dict);
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* do the same if locals() is not a dict */
|
2023-07-11 17:04:12 -03:00
|
|
|
ERROR_IF(PyMapping_GetOptionalItem(LOCALS(), &_Py_ID(__annotations__), &ann_dict) < 0, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
if (ann_dict == NULL) {
|
|
|
|
ann_dict = PyDict_New();
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(ann_dict == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
err = PyObject_SetItem(LOCALS(), &_Py_ID(__annotations__),
|
|
|
|
ann_dict);
|
|
|
|
Py_DECREF(ann_dict);
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(err, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(ann_dict);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
inst(BUILD_CONST_KEY_MAP, (values[oparg], keys -- map)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
if (!PyTuple_CheckExact(keys) ||
|
|
|
|
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError,
|
|
|
|
"bad BUILD_CONST_KEY_MAP keys argument");
|
2023-01-17 19:59:19 -04:00
|
|
|
goto error; // Pop the keys and values.
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
map = _PyDict_FromItems(
|
|
|
|
&PyTuple_GET_ITEM(keys, 0), 1,
|
2023-01-17 19:59:19 -04:00
|
|
|
values, 1, oparg);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-01-17 19:59:19 -04:00
|
|
|
ERROR_IF(map == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(DICT_UPDATE, (dict, unused[oparg - 1], update -- dict, unused[oparg - 1])) {
|
2022-11-03 01:31:26 -03:00
|
|
|
if (PyDict_Update(dict, update) < 0) {
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_AttributeError)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'%.200s' object is not a mapping",
|
|
|
|
Py_TYPE(update)->tp_name);
|
|
|
|
}
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(DICT_MERGE, (callable, unused, unused, dict, unused[oparg - 1], update -- callable, unused, unused, dict, unused[oparg - 1])) {
|
2022-11-03 01:31:26 -03:00
|
|
|
if (_PyDict_MergeEx(dict, update, 2) < 0) {
|
2023-08-09 15:19:39 -03:00
|
|
|
_PyEval_FormatKwargsError(tstate, callable, update);
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(MAP_ADD, (dict, unused[oparg - 1], key, value -- dict, unused[oparg - 1])) {
|
2022-12-27 21:11:03 -04:00
|
|
|
assert(PyDict_CheckExact(dict));
|
|
|
|
/* dict[key] = value */
|
|
|
|
// Do not DECREF INPUTS because the function steals the references
|
|
|
|
ERROR_IF(_PyDict_SetItem_Take2((PyDictObject *)dict, key, value) != 0, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(INSTRUMENTED_LOAD_SUPER_ATTR, (unused/9, unused, unused, unused -- unused, unused if (oparg & 1))) {
|
2023-05-16 13:29:00 -03:00
|
|
|
_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);
|
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(LOAD_SUPER_ATTR, INLINE_CACHE_ENTRIES_LOAD_SUPER_ATTR) = {
|
2023-05-11 11:08:13 -03:00
|
|
|
LOAD_SUPER_ATTR_ATTR,
|
2023-04-25 14:45:51 -03:00
|
|
|
LOAD_SUPER_ATTR_METHOD,
|
|
|
|
};
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_SUPER_ATTR, (unused/1, global_super, class, self -- attr, null if (oparg & 1))) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
|
2023-04-25 14:45:51 -03:00
|
|
|
int load_method = oparg & 1;
|
|
|
|
#if ENABLE_SPECIALIZATION
|
|
|
|
_PySuperAttrCache *cache = (_PySuperAttrCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
next_instr--;
|
2023-05-11 11:08:13 -03:00
|
|
|
_Py_Specialize_LoadSuperAttr(global_super, class, next_instr, load_method);
|
2023-04-25 14:45:51 -03:00
|
|
|
DISPATCH_SAME_OPARG();
|
2023-04-24 19:22:14 -03:00
|
|
|
}
|
2023-04-25 14:45:51 -03:00
|
|
|
STAT_INC(LOAD_SUPER_ATTR, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
|
|
|
|
2023-05-16 13:29:00 -03:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2023-04-25 14:45:51 -03:00
|
|
|
// 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);
|
2023-05-16 13:29:00 -03:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2023-04-25 14:45:51 -03:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(super == NULL, error);
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = PyObject_GetAttr(super, name);
|
2023-04-25 14:45:51 -03:00
|
|
|
Py_DECREF(super);
|
2023-08-09 15:19:39 -03:00
|
|
|
ERROR_IF(attr == NULL, error);
|
|
|
|
null = NULL;
|
2023-04-25 14:45:51 -03:00
|
|
|
}
|
|
|
|
|
2023-06-11 18:31:59 -03:00
|
|
|
pseudo(LOAD_SUPER_METHOD) = {
|
|
|
|
LOAD_SUPER_ATTR,
|
|
|
|
};
|
|
|
|
|
|
|
|
pseudo(LOAD_ZERO_SUPER_METHOD) = {
|
|
|
|
LOAD_SUPER_ATTR,
|
|
|
|
};
|
|
|
|
|
|
|
|
pseudo(LOAD_ZERO_SUPER_ATTR) = {
|
|
|
|
LOAD_SUPER_ATTR,
|
|
|
|
};
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_SUPER_ATTR_ATTR, (unused/1, global_super, class, self -- attr, unused if (0))) {
|
2023-05-11 11:08:13 -03:00
|
|
|
assert(!(oparg & 1));
|
2023-04-25 14:45:51 -03:00
|
|
|
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
|
|
|
|
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
|
2023-05-11 11:08:13 -03:00
|
|
|
STAT_INC(LOAD_SUPER_ATTR, hit);
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = _PySuper_Lookup((PyTypeObject *)class, self, name, NULL);
|
2023-05-11 11:08:13 -03:00
|
|
|
DECREF_INPUTS();
|
2023-08-09 15:19:39 -03:00
|
|
|
ERROR_IF(attr == NULL, error);
|
2023-05-11 11:08:13 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_SUPER_ATTR_METHOD, (unused/1, global_super, class, self -- attr, self_or_null)) {
|
2023-05-11 11:08:13 -03:00
|
|
|
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);
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
|
2023-05-30 17:36:24 -03:00
|
|
|
PyTypeObject *cls = (PyTypeObject *)class;
|
2023-05-11 11:08:13 -03:00
|
|
|
int method_found = 0;
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = _PySuper_Lookup(cls, self, name,
|
2023-07-24 17:14:56 -03:00
|
|
|
Py_TYPE(self)->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
|
2023-04-25 14:45:51 -03:00
|
|
|
Py_DECREF(global_super);
|
|
|
|
Py_DECREF(class);
|
2023-08-09 15:19:39 -03:00
|
|
|
if (attr == NULL) {
|
2023-05-11 11:08:13 -03:00
|
|
|
Py_DECREF(self);
|
|
|
|
ERROR_IF(true, error);
|
|
|
|
}
|
|
|
|
if (method_found) {
|
2023-08-09 15:19:39 -03:00
|
|
|
self_or_null = self; // transfer ownership
|
2023-05-11 11:08:13 -03:00
|
|
|
} else {
|
|
|
|
Py_DECREF(self);
|
2023-08-09 15:19:39 -03:00
|
|
|
self_or_null = NULL;
|
2023-05-11 11:08:13 -03:00
|
|
|
}
|
2023-04-24 19:22:14 -03:00
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(LOAD_ATTR, INLINE_CACHE_ENTRIES_LOAD_ATTR) = {
|
2023-02-01 14:56:52 -04:00
|
|
|
LOAD_ATTR_INSTANCE_VALUE,
|
|
|
|
LOAD_ATTR_MODULE,
|
|
|
|
LOAD_ATTR_WITH_HINT,
|
|
|
|
LOAD_ATTR_SLOT,
|
|
|
|
LOAD_ATTR_CLASS,
|
|
|
|
LOAD_ATTR_PROPERTY,
|
|
|
|
LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN,
|
|
|
|
LOAD_ATTR_METHOD_WITH_VALUES,
|
|
|
|
LOAD_ATTR_METHOD_NO_DICT,
|
|
|
|
LOAD_ATTR_METHOD_LAZY_DICT,
|
2023-07-10 07:40:35 -03:00
|
|
|
LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES,
|
|
|
|
LOAD_ATTR_NONDESCRIPTOR_NO_DICT,
|
2023-02-01 14:56:52 -04:00
|
|
|
};
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR, (unused/9, owner -- attr, self_or_null if (oparg & 1))) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-09 14:50:09 -04:00
|
|
|
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
|
2022-11-09 14:50:09 -04:00
|
|
|
next_instr--;
|
2022-11-17 19:09:18 -04:00
|
|
|
_Py_Specialize_LoadAttr(owner, next_instr, name);
|
2022-11-09 14:50:09 -04:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(LOAD_ATTR, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 1);
|
2022-11-03 01:31:26 -03:00
|
|
|
if (oparg & 1) {
|
2023-01-29 21:28:39 -04:00
|
|
|
/* Designed to work in tandem with CALL, pushes two values. */
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = NULL;
|
|
|
|
if (_PyObject_GetMethod(owner, name, &attr)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* We can bypass temporary bound method object.
|
|
|
|
meth is unbound method and obj is self.
|
|
|
|
|
|
|
|
meth | self | arg1 | ... | argN
|
|
|
|
*/
|
2023-08-09 15:19:39 -03:00
|
|
|
assert(attr != NULL); // No errors on this branch
|
|
|
|
self_or_null = owner; // Transfer ownership
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* meth is not an unbound method (but a regular attr, or
|
|
|
|
something was returned by a descriptor protocol). Set
|
|
|
|
the second element of the stack to NULL, to signal
|
|
|
|
CALL that it's not a method call.
|
|
|
|
|
|
|
|
NULL | meth | arg1 | ... | argN
|
|
|
|
*/
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-08-09 15:19:39 -03:00
|
|
|
ERROR_IF(attr == NULL, error);
|
|
|
|
self_or_null = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
2022-11-10 14:50:57 -04:00
|
|
|
else {
|
2023-01-29 21:28:39 -04:00
|
|
|
/* Classic, pushes one value. */
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = PyObject_GetAttr(owner, name);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-08-09 15:19:39 -03:00
|
|
|
ERROR_IF(attr == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-06-11 18:31:59 -03:00
|
|
|
pseudo(LOAD_METHOD) = {
|
|
|
|
LOAD_ATTR,
|
|
|
|
};
|
|
|
|
|
2023-07-13 12:36:19 -03:00
|
|
|
op(_GUARD_TYPE_VERSION, (type_version/2, owner -- owner)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
|
2023-07-13 12:36:19 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
op(_CHECK_MANAGED_OBJECT_HAS_VALUES, (owner -- owner)) {
|
|
|
|
assert(Py_TYPE(owner)->tp_dictoffset < 0);
|
|
|
|
assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
2023-08-09 16:14:50 -03:00
|
|
|
PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
|
|
|
|
DEOPT_IF(!_PyDictOrValues_IsValues(*dorv) &&
|
|
|
|
!_PyObject_MakeInstanceAttributesFromDict(owner, dorv),
|
|
|
|
LOAD_ATTR);
|
2023-07-13 12:36:19 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
op(_LOAD_ATTR_INSTANCE_VALUE, (index/1, owner -- attr, null if (oparg & 1))) {
|
2023-07-13 12:36:19 -03:00
|
|
|
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = _PyDictOrValues_GetValues(dorv)->values[index];
|
|
|
|
DEOPT_IF(attr == NULL, LOAD_ATTR);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
2023-08-09 15:19:39 -03:00
|
|
|
Py_INCREF(attr);
|
|
|
|
null = NULL;
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-13 12:36:19 -03:00
|
|
|
macro(LOAD_ATTR_INSTANCE_VALUE) =
|
2023-07-31 12:55:33 -03:00
|
|
|
unused/1 + // Skip over the counter
|
2023-07-13 12:36:19 -03:00
|
|
|
_GUARD_TYPE_VERSION +
|
|
|
|
_CHECK_MANAGED_OBJECT_HAS_VALUES +
|
2023-07-31 12:55:33 -03:00
|
|
|
_LOAD_ATTR_INSTANCE_VALUE +
|
|
|
|
unused/5; // Skip over rest of cache
|
2023-07-13 12:36:19 -03:00
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_MODULE, (unused/1, type_version/2, index/1, unused/5, owner -- attr, null if (oparg & 1))) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
|
|
|
|
PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
|
|
|
|
assert(dict != NULL);
|
2023-02-01 14:56:52 -04:00
|
|
|
DEOPT_IF(dict->ma_keys->dk_version != type_version, LOAD_ATTR);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(dict->ma_keys->dk_kind == DICT_KEYS_UNICODE);
|
2023-02-01 14:56:52 -04:00
|
|
|
assert(index < dict->ma_keys->dk_nentries);
|
|
|
|
PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + index;
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = ep->me_value;
|
|
|
|
DEOPT_IF(attr == NULL, LOAD_ATTR);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
2023-08-09 15:19:39 -03:00
|
|
|
Py_INCREF(attr);
|
|
|
|
null = NULL;
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_WITH_HINT, (unused/1, type_version/2, index/1, unused/5, owner -- attr, null if (oparg & 1))) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
|
|
|
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
|
|
|
|
DEOPT_IF(_PyDictOrValues_IsValues(dorv), LOAD_ATTR);
|
|
|
|
PyDictObject *dict = (PyDictObject *)_PyDictOrValues_GetDict(dorv);
|
|
|
|
DEOPT_IF(dict == NULL, LOAD_ATTR);
|
|
|
|
assert(PyDict_CheckExact((PyObject *)dict));
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
|
2023-02-01 14:56:52 -04:00
|
|
|
uint16_t hint = index;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(hint >= (size_t)dict->ma_keys->dk_nentries, LOAD_ATTR);
|
|
|
|
if (DK_IS_UNICODE(dict->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint;
|
|
|
|
DEOPT_IF(ep->me_key != name, LOAD_ATTR);
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = ep->me_value;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
|
|
|
|
DEOPT_IF(ep->me_key != name, LOAD_ATTR);
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = ep->me_value;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(attr == NULL, LOAD_ATTR);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
2023-08-09 15:19:39 -03:00
|
|
|
Py_INCREF(attr);
|
|
|
|
null = NULL;
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_SLOT, (unused/1, type_version/2, index/1, unused/5, owner -- attr, null if (oparg & 1))) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
|
2023-02-01 14:56:52 -04:00
|
|
|
char *addr = (char *)owner + index;
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = *(PyObject **)addr;
|
|
|
|
DEOPT_IF(attr == NULL, LOAD_ATTR);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
2023-08-09 15:19:39 -03:00
|
|
|
Py_INCREF(attr);
|
|
|
|
null = NULL;
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_CLASS, (unused/1, type_version/2, unused/2, descr/4, owner -- attr, null if (oparg & 1))) {
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(!PyType_Check(owner), LOAD_ATTR);
|
|
|
|
DEOPT_IF(((PyTypeObject *)owner)->tp_version_tag != type_version,
|
2022-11-03 01:31:26 -03:00
|
|
|
LOAD_ATTR);
|
|
|
|
assert(type_version != 0);
|
|
|
|
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
2023-08-09 15:19:39 -03:00
|
|
|
null = NULL;
|
|
|
|
attr = descr;
|
|
|
|
assert(attr != NULL);
|
|
|
|
Py_INCREF(attr);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_PROPERTY, (unused/1, type_version/2, func_version/2, fget/4, owner -- unused, unused if (0))) {
|
|
|
|
assert((oparg & 1) == 0);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
|
|
|
|
|
|
|
|
PyTypeObject *cls = Py_TYPE(owner);
|
|
|
|
DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(type_version != 0);
|
|
|
|
assert(Py_IS_TYPE(fget, &PyFunction_Type));
|
|
|
|
PyFunctionObject *f = (PyFunctionObject *)fget;
|
|
|
|
assert(func_version != 0);
|
|
|
|
DEOPT_IF(f->func_version != func_version, LOAD_ATTR);
|
|
|
|
PyCodeObject *code = (PyCodeObject *)f->func_code;
|
|
|
|
assert(code->co_argcount == 1);
|
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
Py_INCREF(fget);
|
2023-01-06 10:55:56 -04:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, f, 1);
|
2023-02-01 14:56:52 -04:00
|
|
|
// Manipulate stack directly because we exit with DISPATCH_INLINED().
|
2023-08-09 15:19:39 -03:00
|
|
|
STACK_SHRINK(1);
|
2022-11-03 01:31:26 -03:00
|
|
|
new_frame->localsplus[0] = owner;
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->return_offset = 0;
|
2022-11-17 15:36:03 -04:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN, (unused/1, type_version/2, func_version/2, getattribute/4, owner -- unused, unused if (0))) {
|
|
|
|
assert((oparg & 1) == 0);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
|
|
|
|
PyTypeObject *cls = Py_TYPE(owner);
|
|
|
|
DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(type_version != 0);
|
|
|
|
assert(Py_IS_TYPE(getattribute, &PyFunction_Type));
|
|
|
|
PyFunctionObject *f = (PyFunctionObject *)getattribute;
|
|
|
|
assert(func_version != 0);
|
|
|
|
DEOPT_IF(f->func_version != func_version, LOAD_ATTR);
|
|
|
|
PyCodeObject *code = (PyCodeObject *)f->func_code;
|
|
|
|
assert(code->co_argcount == 2);
|
2022-11-09 14:50:09 -04:00
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), LOAD_ATTR);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 1);
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_INCREF(f);
|
2023-01-06 10:55:56 -04:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, f, 2);
|
2023-02-01 14:56:52 -04:00
|
|
|
// Manipulate stack directly because we exit with DISPATCH_INLINED().
|
2023-08-09 15:19:39 -03:00
|
|
|
STACK_SHRINK(1);
|
2022-11-03 01:31:26 -03:00
|
|
|
new_frame->localsplus[0] = owner;
|
2022-11-10 06:25:33 -04:00
|
|
|
new_frame->localsplus[1] = Py_NewRef(name);
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->return_offset = 0;
|
2022-11-17 15:36:03 -04:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(STORE_ATTR_INSTANCE_VALUE, (unused/1, type_version/2, index/1, value, owner --)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
|
|
|
|
assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
|
|
|
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
|
|
|
|
DEOPT_IF(!_PyDictOrValues_IsValues(dorv), STORE_ATTR);
|
|
|
|
STAT_INC(STORE_ATTR, hit);
|
|
|
|
PyDictValues *values = _PyDictOrValues_GetValues(dorv);
|
|
|
|
PyObject *old_value = values->values[index];
|
|
|
|
values->values[index] = value;
|
|
|
|
if (old_value == NULL) {
|
|
|
|
_PyDictValues_AddToInsertionOrder(values, index);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(old_value);
|
|
|
|
}
|
|
|
|
Py_DECREF(owner);
|
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(STORE_ATTR_WITH_HINT, (unused/1, type_version/2, hint/1, value, owner --)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
|
|
|
|
assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
|
|
|
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
|
2022-11-09 14:50:09 -04:00
|
|
|
DEOPT_IF(_PyDictOrValues_IsValues(dorv), STORE_ATTR);
|
2022-11-03 01:31:26 -03:00
|
|
|
PyDictObject *dict = (PyDictObject *)_PyDictOrValues_GetDict(dorv);
|
|
|
|
DEOPT_IF(dict == NULL, STORE_ATTR);
|
|
|
|
assert(PyDict_CheckExact((PyObject *)dict));
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(hint >= (size_t)dict->ma_keys->dk_nentries, STORE_ATTR);
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
PyObject *old_value;
|
2022-11-03 01:31:26 -03:00
|
|
|
uint64_t new_version;
|
|
|
|
if (DK_IS_UNICODE(dict->ma_keys)) {
|
|
|
|
PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint;
|
|
|
|
DEOPT_IF(ep->me_key != name, STORE_ATTR);
|
|
|
|
old_value = ep->me_value;
|
|
|
|
DEOPT_IF(old_value == NULL, STORE_ATTR);
|
2023-03-09 11:16:30 -04:00
|
|
|
new_version = _PyDict_NotifyEvent(tstate->interp, PyDict_EVENT_MODIFIED, dict, name, value);
|
2022-11-03 01:31:26 -03:00
|
|
|
ep->me_value = value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
|
|
|
|
DEOPT_IF(ep->me_key != name, STORE_ATTR);
|
|
|
|
old_value = ep->me_value;
|
|
|
|
DEOPT_IF(old_value == NULL, STORE_ATTR);
|
2023-03-09 11:16:30 -04:00
|
|
|
new_version = _PyDict_NotifyEvent(tstate->interp, PyDict_EVENT_MODIFIED, dict, name, value);
|
2022-11-03 01:31:26 -03:00
|
|
|
ep->me_value = value;
|
|
|
|
}
|
|
|
|
Py_DECREF(old_value);
|
|
|
|
STAT_INC(STORE_ATTR, hit);
|
|
|
|
/* Ensure dict is GC tracked if it needs to be */
|
|
|
|
if (!_PyObject_GC_IS_TRACKED(dict) && _PyObject_GC_MAY_BE_TRACKED(value)) {
|
|
|
|
_PyObject_GC_TRACK(dict);
|
|
|
|
}
|
|
|
|
/* PEP 509 */
|
|
|
|
dict->ma_version_tag = new_version;
|
|
|
|
Py_DECREF(owner);
|
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(STORE_ATTR_SLOT, (unused/1, type_version/2, index/1, value, owner --)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
char *addr = (char *)owner + index;
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(STORE_ATTR, hit);
|
|
|
|
PyObject *old_value = *(PyObject **)addr;
|
|
|
|
*(PyObject **)addr = value;
|
|
|
|
Py_XDECREF(old_value);
|
|
|
|
Py_DECREF(owner);
|
|
|
|
}
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(COMPARE_OP, INLINE_CACHE_ENTRIES_COMPARE_OP) = {
|
2023-03-23 19:25:09 -03:00
|
|
|
COMPARE_OP_FLOAT,
|
|
|
|
COMPARE_OP_INT,
|
|
|
|
COMPARE_OP_STR,
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
};
|
|
|
|
|
2023-03-23 19:25:09 -03:00
|
|
|
inst(COMPARE_OP, (unused/1, left, right -- res)) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-03 01:31:26 -03:00
|
|
|
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
|
2022-11-09 14:50:09 -04:00
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
next_instr--;
|
2023-03-23 19:25:09 -03:00
|
|
|
_Py_Specialize_CompareOp(left, right, next_instr, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
2023-03-23 19:25:09 -03:00
|
|
|
STAT_INC(COMPARE_OP, deferred);
|
2022-11-09 14:50:09 -04:00
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-06-29 17:49:54 -03:00
|
|
|
assert((oparg >> 5) <= Py_GE);
|
|
|
|
res = PyObject_RichCompare(left, right, oparg >> 5);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-03-23 19:25:09 -03:00
|
|
|
ERROR_IF(res == NULL, error);
|
2023-06-29 17:49:54 -03:00
|
|
|
if (oparg & 16) {
|
|
|
|
int res_bool = PyObject_IsTrue(res);
|
|
|
|
Py_DECREF(res);
|
|
|
|
ERROR_IF(res_bool < 0, error);
|
|
|
|
res = res_bool ? Py_True : Py_False;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-03-23 19:25:09 -03:00
|
|
|
inst(COMPARE_OP_FLOAT, (unused/1, left, right -- res)) {
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
|
|
|
|
STAT_INC(COMPARE_OP, hit);
|
2022-11-03 01:31:26 -03:00
|
|
|
double dleft = PyFloat_AS_DOUBLE(left);
|
|
|
|
double dright = PyFloat_AS_DOUBLE(right);
|
2023-01-11 16:40:43 -04:00
|
|
|
// 1 if NaN, 2 if <, 4 if >, 8 if ==; this matches low four bits of the oparg
|
|
|
|
int sign_ish = COMPARISON_BIT(dleft, dright);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
|
2023-03-23 19:25:09 -03:00
|
|
|
res = (sign_ish & oparg) ? Py_True : Py_False;
|
2023-06-29 17:49:54 -03:00
|
|
|
// It's always a bool, so we don't care about oparg & 16.
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-03-23 19:25:09 -03:00
|
|
|
// Similar to COMPARE_OP_FLOAT
|
|
|
|
inst(COMPARE_OP_INT, (unused/1, left, right -- res)) {
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(left), COMPARE_OP);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(right), COMPARE_OP);
|
|
|
|
DEOPT_IF(!_PyLong_IsCompact((PyLongObject *)left), COMPARE_OP);
|
|
|
|
DEOPT_IF(!_PyLong_IsCompact((PyLongObject *)right), COMPARE_OP);
|
|
|
|
STAT_INC(COMPARE_OP, hit);
|
2023-03-22 11:49:51 -03:00
|
|
|
assert(_PyLong_DigitCount((PyLongObject *)left) <= 1 &&
|
|
|
|
_PyLong_DigitCount((PyLongObject *)right) <= 1);
|
|
|
|
Py_ssize_t ileft = _PyLong_CompactValue((PyLongObject *)left);
|
|
|
|
Py_ssize_t iright = _PyLong_CompactValue((PyLongObject *)right);
|
2023-01-11 16:40:43 -04:00
|
|
|
// 2 if <, 4 if >, 8 if ==; this matches the low 4 bits of the oparg
|
|
|
|
int sign_ish = COMPARISON_BIT(ileft, iright);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
|
2023-03-23 19:25:09 -03:00
|
|
|
res = (sign_ish & oparg) ? Py_True : Py_False;
|
2023-06-29 17:49:54 -03:00
|
|
|
// It's always a bool, so we don't care about oparg & 16.
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-03-23 19:25:09 -03:00
|
|
|
// Similar to COMPARE_OP_FLOAT, but for ==, != only
|
|
|
|
inst(COMPARE_OP_STR, (unused/1, left, right -- res)) {
|
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
|
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
|
|
|
|
STAT_INC(COMPARE_OP, hit);
|
|
|
|
int eq = _PyUnicode_Equal(left, right);
|
2023-06-29 17:49:54 -03:00
|
|
|
assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
|
2023-03-23 19:25:09 -03:00
|
|
|
assert(eq == 0 || eq == 1);
|
2023-01-11 16:40:43 -04:00
|
|
|
assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS);
|
|
|
|
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
|
2023-03-23 19:25:09 -03:00
|
|
|
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
|
2023-06-29 17:49:54 -03:00
|
|
|
// It's always a bool, so we don't care about oparg & 16.
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-01-11 16:40:43 -04:00
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(IS_OP, (left, right -- b)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
int res = Py_Is(left, right) ^ oparg;
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
2023-05-16 18:36:02 -03:00
|
|
|
b = res ? Py_True : Py_False;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(CONTAINS_OP, (left, right -- b)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
int res = PySequence_Contains(right, left);
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(res < 0, error);
|
2023-05-16 18:36:02 -03:00
|
|
|
b = (res ^ oparg) ? Py_True : Py_False;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-24 05:43:16 -04:00
|
|
|
inst(CHECK_EG_MATCH, (exc_value, match_type -- rest, match)) {
|
2023-07-20 17:37:19 -03:00
|
|
|
if (_PyEval_CheckExceptStarTypeValid(tstate, match_type) < 0) {
|
2023-01-24 05:43:16 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-24 05:43:16 -04:00
|
|
|
match = NULL;
|
|
|
|
rest = NULL;
|
2023-07-20 17:37:19 -03:00
|
|
|
int res = _PyEval_ExceptionGroupMatch(exc_value, match_type,
|
|
|
|
&match, &rest);
|
2023-01-24 05:43:16 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(res < 0, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-01-24 05:43:16 -04:00
|
|
|
assert((match == NULL) == (rest == NULL));
|
|
|
|
ERROR_IF(match == NULL, error);
|
|
|
|
|
|
|
|
if (!Py_IsNone(match)) {
|
2023-04-01 02:01:48 -03:00
|
|
|
PyErr_SetHandledException(match);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(CHECK_EXC_MATCH, (left, right -- left, b)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(PyExceptionInstance_Check(left));
|
2023-07-20 17:37:19 -03:00
|
|
|
if (_PyEval_CheckExceptTypeValid(tstate, right) < 0) {
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
int res = PyErr_GivenExceptionMatches(left, right);
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
2023-05-16 18:36:02 -03:00
|
|
|
b = res ? Py_True : Py_False;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(IMPORT_NAME, (level, fromlist -- res)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
res = import_name(tstate, frame, name, fromlist, level);
|
2022-12-27 21:11:03 -04:00
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(IMPORT_FROM, (from -- from, res)) {
|
2023-06-13 17:42:03 -03:00
|
|
|
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
res = import_from(tstate, from, name);
|
2022-12-27 21:11:03 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(JUMP_FORWARD, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
inst(JUMP_BACKWARD, (--)) {
|
2023-07-03 17:28:27 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
2023-06-02 07:46:18 -03:00
|
|
|
_Py_CODEUNIT *here = next_instr - 1;
|
|
|
|
assert(oparg <= INSTR_OFFSET());
|
|
|
|
JUMPBY(1-oparg);
|
|
|
|
#if ENABLE_SPECIALIZATION
|
|
|
|
here[1].cache += (1 << OPTIMIZER_BITS_IN_COUNTER);
|
2023-07-20 13:35:39 -03:00
|
|
|
if (here[1].cache > tstate->interp->optimizer_backedge_threshold &&
|
|
|
|
// Double-check that the opcode isn't instrumented or something:
|
|
|
|
here->op.code == JUMP_BACKWARD &&
|
|
|
|
// _PyOptimizer_BackEdge is going to change frame->prev_instr,
|
|
|
|
// which breaks line event calculations:
|
|
|
|
next_instr->op.code != INSTRUMENTED_LINE
|
|
|
|
)
|
|
|
|
{
|
2023-06-02 07:46:18 -03:00
|
|
|
OBJECT_STAT_INC(optimization_attempts);
|
|
|
|
frame = _PyOptimizer_BackEdge(frame, here, next_instr, stack_pointer);
|
|
|
|
if (frame == NULL) {
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame;
|
2023-07-06 15:39:53 -03:00
|
|
|
goto resume_with_error;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
2023-08-17 07:16:03 -03:00
|
|
|
assert(frame == tstate->current_frame);
|
2023-06-02 07:46:18 -03:00
|
|
|
here[1].cache &= ((1 << OPTIMIZER_BITS_IN_COUNTER) -1);
|
|
|
|
goto resume_frame;
|
|
|
|
}
|
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-06-11 18:31:59 -03:00
|
|
|
pseudo(JUMP) = {
|
|
|
|
JUMP_FORWARD,
|
|
|
|
JUMP_BACKWARD,
|
|
|
|
};
|
|
|
|
|
|
|
|
pseudo(JUMP_NO_INTERRUPT) = {
|
|
|
|
JUMP_FORWARD,
|
|
|
|
JUMP_BACKWARD_NO_INTERRUPT,
|
|
|
|
};
|
|
|
|
|
2023-06-02 07:46:18 -03:00
|
|
|
inst(ENTER_EXECUTOR, (--)) {
|
2023-07-03 17:28:27 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
|
2023-06-14 09:46:37 -03:00
|
|
|
PyCodeObject *code = _PyFrame_GetCode(frame);
|
2023-06-19 06:32:20 -03:00
|
|
|
_PyExecutorObject *executor = (_PyExecutorObject *)code->co_executors->executors[oparg&255];
|
2023-07-03 17:28:27 -03:00
|
|
|
int original_oparg = executor->vm_data.oparg | (oparg & 0xfffff00);
|
|
|
|
JUMPBY(1-original_oparg);
|
|
|
|
frame->prev_instr = next_instr - 1;
|
2023-06-02 07:46:18 -03:00
|
|
|
Py_INCREF(executor);
|
|
|
|
frame = executor->execute(executor, frame, stack_pointer);
|
|
|
|
if (frame == NULL) {
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame;
|
2023-06-26 23:02:57 -03:00
|
|
|
goto resume_with_error;
|
2023-06-02 07:46:18 -03:00
|
|
|
}
|
|
|
|
goto resume_frame;
|
|
|
|
}
|
|
|
|
|
2023-02-01 15:38:06 -04:00
|
|
|
inst(POP_JUMP_IF_FALSE, (cond -- )) {
|
2023-06-29 17:49:54 -03:00
|
|
|
assert(PyBool_Check(cond));
|
|
|
|
JUMPBY(oparg * Py_IsFalse(cond));
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-01 15:38:06 -04:00
|
|
|
inst(POP_JUMP_IF_TRUE, (cond -- )) {
|
2023-06-29 17:49:54 -03:00
|
|
|
assert(PyBool_Check(cond));
|
|
|
|
JUMPBY(oparg * Py_IsTrue(cond));
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-11 07:33:59 -03:00
|
|
|
op(IS_NONE, (value -- b)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
if (Py_IsNone(value)) {
|
2023-07-11 07:33:59 -03:00
|
|
|
b = Py_True;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
2023-07-11 07:33:59 -03:00
|
|
|
b = Py_False;
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-11 07:33:59 -03:00
|
|
|
macro(POP_JUMP_IF_NONE) = IS_NONE + POP_JUMP_IF_TRUE;
|
|
|
|
|
|
|
|
macro(POP_JUMP_IF_NOT_NONE) = IS_NONE + POP_JUMP_IF_FALSE;
|
|
|
|
|
2023-01-31 06:23:15 -04:00
|
|
|
inst(JUMP_BACKWARD_NO_INTERRUPT, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* 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);
|
|
|
|
}
|
|
|
|
|
2023-01-31 06:23:15 -04:00
|
|
|
inst(GET_LEN, (obj -- obj, len_o)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
// PUSH(len(TOS))
|
2023-01-31 06:23:15 -04:00
|
|
|
Py_ssize_t len_i = PyObject_Length(obj);
|
|
|
|
ERROR_IF(len_i < 0, error);
|
|
|
|
len_o = PyLong_FromSsize_t(len_i);
|
|
|
|
ERROR_IF(len_o == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-24 18:39:13 -04:00
|
|
|
inst(MATCH_CLASS, (subject, type, names -- attrs)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
// Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
|
|
|
|
// None on failure.
|
|
|
|
assert(PyTuple_CheckExact(names));
|
2023-07-20 17:37:19 -03:00
|
|
|
attrs = _PyEval_MatchClass(tstate, subject, type, oparg, names);
|
2023-01-24 18:39:13 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
if (attrs) {
|
2023-01-24 18:39:13 -04:00
|
|
|
assert(PyTuple_CheckExact(attrs)); // Success!
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
2023-01-24 18:39:13 -04:00
|
|
|
ERROR_IF(_PyErr_Occurred(tstate), error); // Error!
|
2023-05-16 18:36:02 -03:00
|
|
|
attrs = Py_None; // Failure!
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-01-24 18:39:13 -04:00
|
|
|
inst(MATCH_MAPPING, (subject -- subject, res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
|
2023-05-16 18:36:02 -03:00
|
|
|
res = match ? Py_True : Py_False;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-24 18:39:13 -04:00
|
|
|
inst(MATCH_SEQUENCE, (subject -- subject, res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
|
2023-05-16 18:36:02 -03:00
|
|
|
res = match ? Py_True : Py_False;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-24 18:39:13 -04:00
|
|
|
inst(MATCH_KEYS, (subject, keys -- subject, keys, values_or_none)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
// On successful match, PUSH(values). Otherwise, PUSH(None).
|
2023-07-20 17:37:19 -03:00
|
|
|
values_or_none = _PyEval_MatchKeys(tstate, subject, keys);
|
2023-01-24 18:39:13 -04:00
|
|
|
ERROR_IF(values_or_none == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-31 06:23:15 -04:00
|
|
|
inst(GET_ITER, (iterable -- iter)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* before: [obj]; after [getiter(obj)] */
|
2023-01-31 06:23:15 -04:00
|
|
|
iter = PyObject_GetIter(iterable);
|
|
|
|
DECREF_INPUTS();
|
|
|
|
ERROR_IF(iter == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-03 07:30:21 -04:00
|
|
|
inst(GET_YIELD_FROM_ITER, (iterable -- iter)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* before: [obj]; after [getiter(obj)] */
|
|
|
|
if (PyCoro_CheckExact(iterable)) {
|
|
|
|
/* `iterable` is a coroutine */
|
2023-06-14 09:46:37 -03:00
|
|
|
if (!(_PyFrame_GetCode(frame)->co_flags & (CO_COROUTINE | CO_ITERABLE_COROUTINE))) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* and it is used in a 'yield from' expression of a
|
|
|
|
regular generator. */
|
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"cannot 'yield from' a coroutine object "
|
|
|
|
"in a non-coroutine generator");
|
|
|
|
goto error;
|
|
|
|
}
|
2023-02-03 07:30:21 -04:00
|
|
|
iter = iterable;
|
|
|
|
}
|
|
|
|
else if (PyGen_CheckExact(iterable)) {
|
|
|
|
iter = iterable;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-02-03 07:30:21 -04:00
|
|
|
else {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* `iterable` is not a generator. */
|
|
|
|
iter = PyObject_GetIter(iterable);
|
2023-02-03 07:30:21 -04:00
|
|
|
if (iter == NULL) {
|
2022-11-03 01:31:26 -03:00
|
|
|
goto error;
|
2023-02-03 07:30:21 -04:00
|
|
|
}
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-07 12:28:28 -04:00
|
|
|
// Most members of this family are "secretly" super-instructions.
|
|
|
|
// When the loop is exhausted, they jump, and the jump target is
|
|
|
|
// always END_FOR, which pops two values off the stack.
|
|
|
|
// This is optimized by skipping that instruction and combining
|
|
|
|
// its effect (popping 'iter' instead of pushing 'next'.)
|
|
|
|
|
2023-07-16 12:16:34 -03:00
|
|
|
family(FOR_ITER, INLINE_CACHE_ENTRIES_FOR_ITER) = {
|
2023-02-07 12:28:28 -04:00
|
|
|
FOR_ITER_LIST,
|
|
|
|
FOR_ITER_TUPLE,
|
|
|
|
FOR_ITER_RANGE,
|
|
|
|
FOR_ITER_GEN,
|
|
|
|
};
|
|
|
|
|
|
|
|
inst(FOR_ITER, (unused/1, iter -- iter, next)) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-09 14:50:09 -04:00
|
|
|
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
next_instr--;
|
2023-02-07 12:28:28 -04:00
|
|
|
_Py_Specialize_ForIter(iter, next_instr, oparg);
|
2022-11-09 14:50:09 -04:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(FOR_ITER, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-02-07 12:28:28 -04:00
|
|
|
/* before: [iter]; after: [iter, iter()] *or* [] (and jump over END_FOR.) */
|
|
|
|
next = (*Py_TYPE(iter)->tp_iternext)(iter);
|
|
|
|
if (next == NULL) {
|
2022-11-10 14:50:57 -04:00
|
|
|
if (_PyErr_Occurred(tstate)) {
|
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
|
|
|
|
goto error;
|
|
|
|
}
|
2023-04-12 08:04:55 -03:00
|
|
|
monitor_raise(tstate, frame, next_instr-1);
|
2022-11-10 14:50:57 -04:00
|
|
|
_PyErr_Clear(tstate);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-11-10 14:50:57 -04:00
|
|
|
/* iterator ended normally */
|
2023-04-12 08:04:55 -03:00
|
|
|
assert(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == END_FOR ||
|
|
|
|
next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == INSTRUMENTED_END_FOR);
|
2022-11-10 14:50:57 -04:00
|
|
|
Py_DECREF(iter);
|
2023-02-07 12:28:28 -04:00
|
|
|
STACK_SHRINK(1);
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
|
2023-02-07 12:28:28 -04:00
|
|
|
/* Jump forward oparg, then skip following END_FOR instruction */
|
2023-06-14 20:14:22 -03:00
|
|
|
JUMPBY(oparg + 1);
|
2023-02-07 12:28:28 -04:00
|
|
|
DISPATCH();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-02-07 12:28:28 -04:00
|
|
|
// Common case: no jump, leave it to the code generator
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-04-12 08:04:55 -03:00
|
|
|
inst(INSTRUMENTED_FOR_ITER, ( -- )) {
|
|
|
|
_Py_CODEUNIT *here = next_instr-1;
|
|
|
|
_Py_CODEUNIT *target;
|
|
|
|
PyObject *iter = TOP();
|
|
|
|
PyObject *next = (*Py_TYPE(iter)->tp_iternext)(iter);
|
|
|
|
if (next != NULL) {
|
|
|
|
PUSH(next);
|
|
|
|
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (_PyErr_Occurred(tstate)) {
|
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
monitor_raise(tstate, frame, here);
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
}
|
|
|
|
/* iterator ended normally */
|
|
|
|
assert(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == END_FOR ||
|
|
|
|
next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == INSTRUMENTED_END_FOR);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
Py_DECREF(iter);
|
|
|
|
/* Skip END_FOR */
|
|
|
|
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
|
|
|
|
}
|
|
|
|
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
|
|
|
|
}
|
|
|
|
|
2023-07-13 21:27:35 -03:00
|
|
|
op(_ITER_CHECK_LIST, (iter -- iter)) {
|
2023-02-07 12:28:28 -04:00
|
|
|
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
|
2023-07-13 21:27:35 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
op(_ITER_JUMP_LIST, (iter -- iter)) {
|
2023-02-07 12:28:28 -04:00
|
|
|
_PyListIterObject *it = (_PyListIterObject *)iter;
|
2023-07-13 21:27:35 -03:00
|
|
|
assert(Py_TYPE(iter) == &PyListIter_Type);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(FOR_ITER, hit);
|
|
|
|
PyListObject *seq = it->it_seq;
|
2023-07-13 21:27:35 -03:00
|
|
|
if (seq == NULL || it->it_index >= PyList_GET_SIZE(seq)) {
|
|
|
|
if (seq != NULL) {
|
|
|
|
it->it_seq = NULL;
|
|
|
|
Py_DECREF(seq);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-07-13 21:27:35 -03:00
|
|
|
Py_DECREF(iter);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
|
|
|
|
/* Jump forward oparg, then skip following END_FOR instruction */
|
|
|
|
JUMPBY(oparg + 1);
|
|
|
|
DISPATCH();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-13 21:27:35 -03:00
|
|
|
// Only used by Tier 2
|
|
|
|
op(_IS_ITER_EXHAUSTED_LIST, (iter -- iter, exhausted)) {
|
|
|
|
_PyListIterObject *it = (_PyListIterObject *)iter;
|
|
|
|
assert(Py_TYPE(iter) == &PyListIter_Type);
|
|
|
|
PyListObject *seq = it->it_seq;
|
2023-07-14 21:22:06 -03:00
|
|
|
if (seq == NULL) {
|
|
|
|
exhausted = Py_True;
|
|
|
|
}
|
|
|
|
else if (it->it_index >= PyList_GET_SIZE(seq)) {
|
|
|
|
Py_DECREF(seq);
|
|
|
|
it->it_seq = NULL;
|
2023-07-13 21:27:35 -03:00
|
|
|
exhausted = Py_True;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
exhausted = Py_False;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_ITER_NEXT_LIST, (iter -- iter, next)) {
|
|
|
|
_PyListIterObject *it = (_PyListIterObject *)iter;
|
|
|
|
assert(Py_TYPE(iter) == &PyListIter_Type);
|
|
|
|
PyListObject *seq = it->it_seq;
|
|
|
|
assert(seq);
|
|
|
|
assert(it->it_index < PyList_GET_SIZE(seq));
|
|
|
|
next = Py_NewRef(PyList_GET_ITEM(seq, it->it_index++));
|
|
|
|
}
|
|
|
|
|
|
|
|
macro(FOR_ITER_LIST) =
|
|
|
|
unused/1 + // Skip over the counter
|
|
|
|
_ITER_CHECK_LIST +
|
|
|
|
_ITER_JUMP_LIST +
|
|
|
|
_ITER_NEXT_LIST;
|
|
|
|
|
|
|
|
op(_ITER_CHECK_TUPLE, (iter -- iter)) {
|
|
|
|
DEOPT_IF(Py_TYPE(iter) != &PyTupleIter_Type, FOR_ITER);
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_ITER_JUMP_TUPLE, (iter -- iter)) {
|
2023-02-07 12:28:28 -04:00
|
|
|
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
|
2023-07-13 21:27:35 -03:00
|
|
|
assert(Py_TYPE(iter) == &PyTupleIter_Type);
|
2022-12-09 06:27:01 -04:00
|
|
|
STAT_INC(FOR_ITER, hit);
|
|
|
|
PyTupleObject *seq = it->it_seq;
|
2023-07-13 21:27:35 -03:00
|
|
|
if (seq == NULL || it->it_index >= PyTuple_GET_SIZE(seq)) {
|
|
|
|
if (seq != NULL) {
|
|
|
|
it->it_seq = NULL;
|
|
|
|
Py_DECREF(seq);
|
2022-12-09 06:27:01 -04:00
|
|
|
}
|
2023-07-13 21:27:35 -03:00
|
|
|
Py_DECREF(iter);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
|
|
|
|
/* Jump forward oparg, then skip following END_FOR instruction */
|
|
|
|
JUMPBY(oparg + 1);
|
|
|
|
DISPATCH();
|
2022-12-09 06:27:01 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-13 21:27:35 -03:00
|
|
|
// Only used by Tier 2
|
|
|
|
op(_IS_ITER_EXHAUSTED_TUPLE, (iter -- iter, exhausted)) {
|
|
|
|
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
|
|
|
|
assert(Py_TYPE(iter) == &PyTupleIter_Type);
|
|
|
|
PyTupleObject *seq = it->it_seq;
|
2023-07-14 21:22:06 -03:00
|
|
|
if (seq == NULL) {
|
|
|
|
exhausted = Py_True;
|
|
|
|
}
|
|
|
|
else if (it->it_index >= PyTuple_GET_SIZE(seq)) {
|
|
|
|
Py_DECREF(seq);
|
|
|
|
it->it_seq = NULL;
|
2023-07-13 21:27:35 -03:00
|
|
|
exhausted = Py_True;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
exhausted = Py_False;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_ITER_NEXT_TUPLE, (iter -- iter, next)) {
|
|
|
|
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
|
|
|
|
assert(Py_TYPE(iter) == &PyTupleIter_Type);
|
|
|
|
PyTupleObject *seq = it->it_seq;
|
|
|
|
assert(seq);
|
|
|
|
assert(it->it_index < PyTuple_GET_SIZE(seq));
|
|
|
|
next = Py_NewRef(PyTuple_GET_ITEM(seq, it->it_index++));
|
|
|
|
}
|
|
|
|
|
|
|
|
macro(FOR_ITER_TUPLE) =
|
|
|
|
unused/1 + // Skip over the counter
|
|
|
|
_ITER_CHECK_TUPLE +
|
|
|
|
_ITER_JUMP_TUPLE +
|
|
|
|
_ITER_NEXT_TUPLE;
|
|
|
|
|
2023-07-12 14:23:59 -03:00
|
|
|
op(_ITER_CHECK_RANGE, (iter -- iter)) {
|
2023-02-07 12:28:28 -04:00
|
|
|
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
|
2023-07-12 14:23:59 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
op(_ITER_JUMP_RANGE, (iter -- iter)) {
|
|
|
|
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
|
|
|
|
assert(Py_TYPE(r) == &PyRangeIter_Type);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(FOR_ITER, hit);
|
2022-11-30 17:04:30 -04:00
|
|
|
if (r->len <= 0) {
|
2022-11-03 01:31:26 -03:00
|
|
|
STACK_SHRINK(1);
|
|
|
|
Py_DECREF(r);
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
|
2023-02-07 12:28:28 -04:00
|
|
|
// Jump over END_FOR instruction.
|
2023-06-14 20:14:22 -03:00
|
|
|
JUMPBY(oparg + 1);
|
2023-02-22 07:11:57 -04:00
|
|
|
DISPATCH();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-07-12 14:23:59 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Only used by Tier 2
|
2023-07-13 21:27:35 -03:00
|
|
|
op(_IS_ITER_EXHAUSTED_RANGE, (iter -- iter, exhausted)) {
|
2023-07-12 14:23:59 -03:00
|
|
|
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
|
|
|
|
assert(Py_TYPE(r) == &PyRangeIter_Type);
|
|
|
|
exhausted = r->len <= 0 ? Py_True : Py_False;
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_ITER_NEXT_RANGE, (iter -- iter, next)) {
|
|
|
|
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
|
|
|
|
assert(Py_TYPE(r) == &PyRangeIter_Type);
|
|
|
|
assert(r->len > 0);
|
2023-02-22 07:11:57 -04:00
|
|
|
long value = r->start;
|
|
|
|
r->start = value + r->step;
|
|
|
|
r->len--;
|
|
|
|
next = PyLong_FromLong(value);
|
2023-07-12 14:23:59 -03:00
|
|
|
ERROR_IF(next == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-07-12 14:23:59 -03:00
|
|
|
macro(FOR_ITER_RANGE) =
|
2023-07-13 21:27:35 -03:00
|
|
|
unused/1 + // Skip over the counter
|
|
|
|
_ITER_CHECK_RANGE +
|
|
|
|
_ITER_JUMP_RANGE +
|
|
|
|
_ITER_NEXT_RANGE;
|
2023-07-12 14:23:59 -03:00
|
|
|
|
2023-02-07 12:28:28 -04:00
|
|
|
inst(FOR_ITER_GEN, (unused/1, iter -- iter, unused)) {
|
2023-05-12 19:23:13 -03:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
|
2023-02-07 12:28:28 -04:00
|
|
|
PyGenObject *gen = (PyGenObject *)iter;
|
2022-11-07 10:49:51 -04:00
|
|
|
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
|
|
|
|
DEOPT_IF(gen->gi_frame_state >= FRAME_EXECUTING, FOR_ITER);
|
|
|
|
STAT_INC(FOR_ITER, hit);
|
|
|
|
_PyInterpreterFrame *gen_frame = (_PyInterpreterFrame *)gen->gi_iframe;
|
2023-05-16 18:36:02 -03:00
|
|
|
_PyFrame_StackPush(gen_frame, Py_None);
|
2022-11-07 10:49:51 -04:00
|
|
|
gen->gi_frame_state = FRAME_EXECUTING;
|
|
|
|
gen->gi_exc_state.previous_item = tstate->exc_info;
|
|
|
|
tstate->exc_info = &gen->gi_exc_state;
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
|
2023-04-13 12:19:07 -03:00
|
|
|
assert(next_instr[oparg].op.code == END_FOR ||
|
|
|
|
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
|
2023-08-16 20:26:43 -03:00
|
|
|
frame->return_offset = oparg;
|
2022-11-17 15:36:03 -04:00
|
|
|
DISPATCH_INLINED(gen_frame);
|
2022-11-07 10:49:51 -04:00
|
|
|
}
|
|
|
|
|
2023-01-31 14:47:50 -04:00
|
|
|
inst(BEFORE_ASYNC_WITH, (mgr -- exit, res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
|
|
|
|
if (enter == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'%.200s' object does not support the "
|
|
|
|
"asynchronous context manager protocol",
|
|
|
|
Py_TYPE(mgr)->tp_name);
|
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
2023-01-31 14:47:50 -04:00
|
|
|
exit = _PyObject_LookupSpecial(mgr, &_Py_ID(__aexit__));
|
2022-11-03 01:31:26 -03:00
|
|
|
if (exit == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'%.200s' object does not support the "
|
|
|
|
"asynchronous context manager protocol "
|
|
|
|
"(missed __aexit__ method)",
|
|
|
|
Py_TYPE(mgr)->tp_name);
|
|
|
|
}
|
|
|
|
Py_DECREF(enter);
|
|
|
|
goto error;
|
|
|
|
}
|
2023-01-31 14:47:50 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
res = _PyObject_CallNoArgs(enter);
|
|
|
|
Py_DECREF(enter);
|
2023-01-31 14:47:50 -04:00
|
|
|
if (res == NULL) {
|
|
|
|
Py_DECREF(exit);
|
|
|
|
ERROR_IF(true, error);
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-31 06:23:15 -04:00
|
|
|
inst(BEFORE_WITH, (mgr -- exit, res)) {
|
|
|
|
/* pop the context manager, push its __exit__ and the
|
|
|
|
* value returned from calling its __enter__
|
|
|
|
*/
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__enter__));
|
|
|
|
if (enter == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'%.200s' object does not support the "
|
|
|
|
"context manager protocol",
|
|
|
|
Py_TYPE(mgr)->tp_name);
|
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
2023-01-31 06:23:15 -04:00
|
|
|
exit = _PyObject_LookupSpecial(mgr, &_Py_ID(__exit__));
|
2022-11-03 01:31:26 -03:00
|
|
|
if (exit == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'%.200s' object does not support the "
|
|
|
|
"context manager protocol "
|
|
|
|
"(missed __exit__ method)",
|
|
|
|
Py_TYPE(mgr)->tp_name);
|
|
|
|
}
|
|
|
|
Py_DECREF(enter);
|
|
|
|
goto error;
|
|
|
|
}
|
2023-01-31 06:23:15 -04:00
|
|
|
DECREF_INPUTS();
|
2022-11-03 01:31:26 -03:00
|
|
|
res = _PyObject_CallNoArgs(enter);
|
|
|
|
Py_DECREF(enter);
|
|
|
|
if (res == NULL) {
|
2023-01-31 06:23:15 -04:00
|
|
|
Py_DECREF(exit);
|
|
|
|
ERROR_IF(true, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-11-22 20:04:57 -04:00
|
|
|
inst(WITH_EXCEPT_START, (exit_func, lasti, unused, val -- exit_func, lasti, unused, val, res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* At the top of the stack are 4 values:
|
2022-11-22 20:04:57 -04:00
|
|
|
- val: TOP = exc_info()
|
|
|
|
- unused: SECOND = previous exception
|
|
|
|
- lasti: THIRD = lasti of exception in exc_info()
|
|
|
|
- exit_func: FOURTH = the context.__exit__ bound method
|
2022-11-03 01:31:26 -03:00
|
|
|
We call FOURTH(type(TOP), TOP, GetTraceback(TOP)).
|
|
|
|
Then we push the __exit__ return value.
|
|
|
|
*/
|
2022-11-22 20:04:57 -04:00
|
|
|
PyObject *exc, *tb;
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
assert(val && PyExceptionInstance_Check(val));
|
|
|
|
exc = PyExceptionInstance_Class(val);
|
|
|
|
tb = PyException_GetTraceback(val);
|
2023-07-27 11:27:11 -03:00
|
|
|
if (tb == NULL) {
|
|
|
|
tb = Py_None;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(tb);
|
|
|
|
}
|
2022-11-22 20:04:57 -04:00
|
|
|
assert(PyLong_Check(lasti));
|
|
|
|
(void)lasti; // Shut up compiler warning if asserts are off
|
2022-11-03 01:31:26 -03:00
|
|
|
PyObject *stack[4] = {NULL, exc, val, tb};
|
|
|
|
res = PyObject_Vectorcall(exit_func, stack + 1,
|
|
|
|
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
|
2022-11-22 20:04:57 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-06-11 18:31:59 -03:00
|
|
|
pseudo(SETUP_FINALLY) = {
|
|
|
|
NOP,
|
|
|
|
};
|
|
|
|
|
|
|
|
pseudo(SETUP_CLEANUP) = {
|
|
|
|
NOP,
|
|
|
|
};
|
|
|
|
|
|
|
|
pseudo(SETUP_WITH) = {
|
|
|
|
NOP,
|
|
|
|
};
|
|
|
|
|
|
|
|
pseudo(POP_BLOCK) = {
|
|
|
|
NOP,
|
|
|
|
};
|
|
|
|
|
2023-02-01 15:38:06 -04:00
|
|
|
inst(PUSH_EXC_INFO, (new_exc -- prev_exc, new_exc)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
_PyErr_StackItem *exc_info = tstate->exc_info;
|
|
|
|
if (exc_info->exc_value != NULL) {
|
2023-02-01 15:38:06 -04:00
|
|
|
prev_exc = exc_info->exc_value;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
else {
|
2023-05-16 18:36:02 -03:00
|
|
|
prev_exc = Py_None;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-02-01 15:38:06 -04:00
|
|
|
assert(PyExceptionInstance_Check(new_exc));
|
|
|
|
exc_info->exc_value = Py_NewRef(new_exc);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_METHOD_WITH_VALUES, (unused/1, type_version/2, keys_version/2, descr/4, owner -- attr, self if (1))) {
|
2023-07-10 07:40:35 -03:00
|
|
|
assert(oparg & 1);
|
2022-11-03 01:31:26 -03:00
|
|
|
/* Cached method object */
|
2023-08-09 15:19:39 -03:00
|
|
|
PyTypeObject *owner_cls = Py_TYPE(owner);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(type_version != 0);
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(owner_cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(owner_cls->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
2023-08-09 16:14:50 -03:00
|
|
|
PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
|
|
|
|
DEOPT_IF(!_PyDictOrValues_IsValues(*dorv) &&
|
|
|
|
!_PyObject_MakeInstanceAttributesFromDict(owner, dorv),
|
|
|
|
LOAD_ATTR);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyHeapTypeObject *owner_heap_type = (PyHeapTypeObject *)owner_cls;
|
|
|
|
DEOPT_IF(owner_heap_type->ht_cached_keys->dk_version !=
|
2023-02-01 14:56:52 -04:00
|
|
|
keys_version, LOAD_ATTR);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
2023-02-01 14:56:52 -04:00
|
|
|
assert(descr != NULL);
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = Py_NewRef(descr);
|
|
|
|
assert(_PyType_HasFeature(Py_TYPE(attr), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
|
|
|
self = owner;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_METHOD_NO_DICT, (unused/1, type_version/2, unused/2, descr/4, owner -- attr, self if (1))) {
|
2023-07-10 07:40:35 -03:00
|
|
|
assert(oparg & 1);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyTypeObject *owner_cls = Py_TYPE(owner);
|
|
|
|
DEOPT_IF(owner_cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(owner_cls->tp_dictoffset == 0);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
2023-02-01 14:56:52 -04:00
|
|
|
assert(descr != NULL);
|
|
|
|
assert(_PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = Py_NewRef(descr);
|
|
|
|
self = owner;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES, (unused/1, type_version/2, keys_version/2, descr/4, owner -- attr, unused if (0))) {
|
2023-07-10 07:40:35 -03:00
|
|
|
assert((oparg & 1) == 0);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyTypeObject *owner_cls = Py_TYPE(owner);
|
2023-07-10 07:40:35 -03:00
|
|
|
assert(type_version != 0);
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(owner_cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(owner_cls->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
2023-08-09 16:14:50 -03:00
|
|
|
PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
|
|
|
|
DEOPT_IF(!_PyDictOrValues_IsValues(*dorv) &&
|
|
|
|
!_PyObject_MakeInstanceAttributesFromDict(owner, dorv),
|
|
|
|
LOAD_ATTR);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyHeapTypeObject *owner_heap_type = (PyHeapTypeObject *)owner_cls;
|
|
|
|
DEOPT_IF(owner_heap_type->ht_cached_keys->dk_version !=
|
2023-07-10 07:40:35 -03:00
|
|
|
keys_version, LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
assert(descr != NULL);
|
|
|
|
DECREF_INPUTS();
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = Py_NewRef(descr);
|
2023-07-10 07:40:35 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_NONDESCRIPTOR_NO_DICT, (unused/1, type_version/2, unused/2, descr/4, owner -- attr, unused if (0))) {
|
2023-07-10 07:40:35 -03:00
|
|
|
assert((oparg & 1) == 0);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyTypeObject *owner_cls = Py_TYPE(owner);
|
2023-07-10 07:40:35 -03:00
|
|
|
assert(type_version != 0);
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(owner_cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(owner_cls->tp_dictoffset == 0);
|
2023-07-10 07:40:35 -03:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
assert(descr != NULL);
|
|
|
|
DECREF_INPUTS();
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = Py_NewRef(descr);
|
2023-07-10 07:40:35 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(LOAD_ATTR_METHOD_LAZY_DICT, (unused/1, type_version/2, unused/2, descr/4, owner -- attr, self if (1))) {
|
2023-07-10 07:40:35 -03:00
|
|
|
assert(oparg & 1);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyTypeObject *owner_cls = Py_TYPE(owner);
|
|
|
|
DEOPT_IF(owner_cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
Py_ssize_t dictoffset = owner_cls->tp_dictoffset;
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(dictoffset > 0);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyObject *dict = *(PyObject **)((char *)owner + dictoffset);
|
2022-11-03 01:31:26 -03:00
|
|
|
/* This object has a __dict__, just not yet created */
|
|
|
|
DEOPT_IF(dict != NULL, LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
2023-02-01 14:56:52 -04:00
|
|
|
assert(descr != NULL);
|
|
|
|
assert(_PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
2023-08-09 15:19:39 -03:00
|
|
|
attr = Py_NewRef(descr);
|
|
|
|
self = owner;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-01-31 06:23:15 -04:00
|
|
|
inst(KW_NAMES, (--)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2023-06-13 17:42:03 -03:00
|
|
|
assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
|
|
|
|
kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-04-12 08:04:55 -03:00
|
|
|
inst(INSTRUMENTED_CALL, ( -- )) {
|
2023-08-09 15:19:39 -03:00
|
|
|
int is_meth = PEEK(oparg + 1) != NULL;
|
2023-04-12 08:04:55 -03:00
|
|
|
int total_args = oparg + is_meth;
|
2023-08-09 15:19:39 -03:00
|
|
|
PyObject *function = PEEK(oparg + 2);
|
2023-04-12 08:04:55 -03:00
|
|
|
PyObject *arg = total_args == 0 ?
|
|
|
|
&_PyInstrumentation_MISSING : PEEK(total_args);
|
|
|
|
int err = _Py_call_instrumentation_2args(
|
|
|
|
tstate, PY_MONITORING_EVENT_CALL,
|
|
|
|
frame, next_instr-1, function, arg);
|
|
|
|
ERROR_IF(err, error);
|
|
|
|
_PyCallCache *cache = (_PyCallCache *)next_instr;
|
|
|
|
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
|
|
|
|
GO_TO_INSTRUCTION(CALL);
|
|
|
|
}
|
|
|
|
|
2023-04-05 18:15:49 -03:00
|
|
|
// Cache layout: counter/1, func_version/2
|
2023-02-14 07:54:13 -04:00
|
|
|
// Neither CALL_INTRINSIC_1/2 nor CALL_FUNCTION_EX are members!
|
2023-07-16 12:16:34 -03:00
|
|
|
family(CALL, INLINE_CACHE_ENTRIES_CALL) = {
|
2023-02-08 15:40:10 -04:00
|
|
|
CALL_BOUND_METHOD_EXACT_ARGS,
|
|
|
|
CALL_PY_EXACT_ARGS,
|
|
|
|
CALL_PY_WITH_DEFAULTS,
|
|
|
|
CALL_NO_KW_TYPE_1,
|
|
|
|
CALL_NO_KW_STR_1,
|
|
|
|
CALL_NO_KW_TUPLE_1,
|
|
|
|
CALL_BUILTIN_CLASS,
|
|
|
|
CALL_NO_KW_BUILTIN_O,
|
|
|
|
CALL_NO_KW_BUILTIN_FAST,
|
|
|
|
CALL_BUILTIN_FAST_WITH_KEYWORDS,
|
|
|
|
CALL_NO_KW_LEN,
|
|
|
|
CALL_NO_KW_ISINSTANCE,
|
|
|
|
CALL_NO_KW_LIST_APPEND,
|
|
|
|
CALL_NO_KW_METHOD_DESCRIPTOR_O,
|
|
|
|
CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
|
|
|
|
CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS,
|
|
|
|
CALL_NO_KW_METHOD_DESCRIPTOR_FAST,
|
2023-06-22 05:48:19 -03:00
|
|
|
CALL_NO_KW_ALLOC_AND_ENTER_INIT,
|
2023-02-08 15:40:10 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
// On entry, the stack is either
|
|
|
|
// [NULL, callable, arg1, arg2, ...]
|
|
|
|
// or
|
|
|
|
// [method, self, arg1, arg2, ...]
|
|
|
|
// (Some args may be keywords, see KW_NAMES, which sets 'kwnames'.)
|
|
|
|
// On exit, the stack is [result].
|
|
|
|
// When calling Python, inline the call using DISPATCH_INLINED().
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-09 14:50:09 -04:00
|
|
|
_PyCallCache *cache = (_PyCallCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
next_instr--;
|
2023-02-08 15:40:10 -04:00
|
|
|
_Py_Specialize_Call(callable, next_instr, total_args, kwnames);
|
2022-11-09 14:50:09 -04:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(CALL, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null == NULL && Py_TYPE(callable) == &PyMethod_Type) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
PyObject *self = ((PyMethodObject *)callable)->im_self;
|
|
|
|
args[0] = Py_NewRef(self);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyObject *method = ((PyMethodObject *)callable)->im_func;
|
2023-02-08 15:40:10 -04:00
|
|
|
args[-1] = Py_NewRef(method);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
callable = method;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
int positional_args = total_args - KWNAMES_LEN();
|
|
|
|
// Check if the call can be inlined or not
|
2023-02-08 15:40:10 -04:00
|
|
|
if (Py_TYPE(callable) == &PyFunction_Type &&
|
2022-11-03 01:31:26 -03:00
|
|
|
tstate->interp->eval_frame == NULL &&
|
2023-02-08 15:40:10 -04:00
|
|
|
((PyFunctionObject *)callable)->vectorcall == _PyFunction_Vectorcall)
|
2022-11-03 01:31:26 -03:00
|
|
|
{
|
2023-02-08 15:40:10 -04:00
|
|
|
int code_flags = ((PyCodeObject*)PyFunction_GET_CODE(callable))->co_flags;
|
|
|
|
PyObject *locals = code_flags & CO_OPTIMIZED ? NULL : Py_NewRef(PyFunction_GET_GLOBALS(callable));
|
2022-11-03 01:31:26 -03:00
|
|
|
_PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit(
|
2023-02-08 15:40:10 -04:00
|
|
|
tstate, (PyFunctionObject *)callable, locals,
|
|
|
|
args, positional_args, kwnames
|
2022-11-03 01:31:26 -03:00
|
|
|
);
|
2022-11-10 08:34:57 -04:00
|
|
|
kwnames = NULL;
|
2023-02-08 15:40:10 -04:00
|
|
|
// Manipulate stack directly since we leave using DISPATCH_INLINED().
|
|
|
|
STACK_SHRINK(oparg + 2);
|
2022-11-03 01:31:26 -03:00
|
|
|
// The frame has stolen all the arguments from the stack,
|
|
|
|
// so there is no need to clean them up.
|
|
|
|
if (new_frame == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->return_offset = 0;
|
2022-11-17 15:36:03 -04:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
/* Callable is not a normal Python function */
|
2023-04-12 08:04:55 -03:00
|
|
|
res = PyObject_Vectorcall(
|
|
|
|
callable, args,
|
|
|
|
positional_args | PY_VECTORCALL_ARGUMENTS_OFFSET,
|
|
|
|
kwnames);
|
|
|
|
if (opcode == INSTRUMENTED_CALL) {
|
|
|
|
PyObject *arg = total_args == 0 ?
|
2023-08-09 15:19:39 -03:00
|
|
|
&_PyInstrumentation_MISSING : args[0];
|
2023-04-12 08:04:55 -03:00
|
|
|
if (res == NULL) {
|
|
|
|
_Py_call_instrumentation_exc2(
|
|
|
|
tstate, PY_MONITORING_EVENT_C_RAISE,
|
|
|
|
frame, next_instr-1, callable, arg);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int err = _Py_call_instrumentation_2args(
|
|
|
|
tstate, PY_MONITORING_EVENT_C_RETURN,
|
|
|
|
frame, next_instr-1, callable, arg);
|
|
|
|
if (err < 0) {
|
|
|
|
Py_CLEAR(res);
|
|
|
|
}
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2022-11-10 08:34:57 -04:00
|
|
|
kwnames = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(callable);
|
2022-11-03 01:31:26 -03:00
|
|
|
for (int i = 0; i < total_args; i++) {
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(args[i]);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-02-08 15:40:10 -04:00
|
|
|
// Start out with [NULL, bound_method, arg1, arg2, ...]
|
|
|
|
// Transform to [callable, self, arg1, arg2, ...]
|
|
|
|
// Then fall through to CALL_PY_EXACT_ARGS
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_BOUND_METHOD_EXACT_ARGS, (unused/1, unused/2, callable, null, unused[oparg] -- unused)) {
|
|
|
|
DEOPT_IF(null != NULL, CALL);
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyObject *self = ((PyMethodObject *)callable)->im_self;
|
2023-08-09 15:19:39 -03:00
|
|
|
PEEK(oparg + 1) = Py_NewRef(self); // self_or_null
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *meth = ((PyMethodObject *)callable)->im_func;
|
2023-08-09 15:19:39 -03:00
|
|
|
PEEK(oparg + 2) = Py_NewRef(meth); // callable
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(callable);
|
|
|
|
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
|
|
|
|
}
|
|
|
|
|
2023-08-16 20:26:43 -03:00
|
|
|
op(_CHECK_PEP_523, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, CALL);
|
2023-08-16 20:26:43 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
op(_CHECK_FUNCTION_EXACT_ARGS, (func_version/2, callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) {
|
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyFunction_Check(callable), CALL);
|
|
|
|
PyFunctionObject *func = (PyFunctionObject *)callable;
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(func->func_version != func_version, CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
PyCodeObject *code = (PyCodeObject *)func->func_code;
|
2023-08-16 20:26:43 -03:00
|
|
|
DEOPT_IF(code->co_argcount != oparg + (self_or_null != NULL), CALL);
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_CHECK_STACK_SPACE, (callable, unused, unused[oparg] -- callable, unused, unused[oparg])) {
|
|
|
|
PyFunctionObject *func = (PyFunctionObject *)callable;
|
|
|
|
PyCodeObject *code = (PyCodeObject *)func->func_code;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), CALL);
|
2023-08-16 20:26:43 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
op(_INIT_CALL_PY_EXACT_ARGS, (callable, self_or_null, args[oparg] -- new_frame: _PyInterpreterFrame*)) {
|
|
|
|
int argcount = oparg;
|
|
|
|
if (self_or_null != NULL) {
|
|
|
|
args--;
|
|
|
|
argcount++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(CALL, hit);
|
2023-08-16 20:26:43 -03:00
|
|
|
PyFunctionObject *func = (PyFunctionObject *)callable;
|
|
|
|
new_frame = _PyFrame_PushUnchecked(tstate, func, argcount);
|
2022-11-03 01:31:26 -03:00
|
|
|
for (int i = 0; i < argcount; i++) {
|
2023-02-08 15:40:10 -04:00
|
|
|
new_frame->localsplus[i] = args[i];
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-08-16 20:26:43 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
// The 'unused' output effect represents the return value
|
|
|
|
// (which will be pushed when the frame returns).
|
|
|
|
// It is needed so CALL_PY_EXACT_ARGS matches its family.
|
|
|
|
op(_PUSH_FRAME, (new_frame: _PyInterpreterFrame* -- unused)) {
|
|
|
|
// Write it out explicitly because it's subtly different.
|
|
|
|
// Eventually this should be the only occurrence of this code.
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->return_offset = 0;
|
2023-08-16 20:26:43 -03:00
|
|
|
assert(tstate->interp->eval_frame == NULL);
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
|
|
|
new_frame->previous = frame;
|
|
|
|
CALL_STAT_INC(inlined_py_calls);
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame = new_frame;
|
2023-08-16 20:26:43 -03:00
|
|
|
#if TIER_ONE
|
|
|
|
goto start_frame;
|
|
|
|
#endif
|
|
|
|
#if TIER_TWO
|
|
|
|
ERROR_IF(_Py_EnterRecursivePy(tstate), exit_unwind);
|
|
|
|
stack_pointer = _PyFrame_GetStackPointer(frame);
|
|
|
|
ip_offset = (_Py_CODEUNIT *)_PyFrame_GetCode(frame)->co_code_adaptive;
|
|
|
|
#endif
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-16 20:26:43 -03:00
|
|
|
macro(CALL_PY_EXACT_ARGS) =
|
|
|
|
unused/1 + // Skip over the counter
|
|
|
|
_CHECK_PEP_523 +
|
|
|
|
_CHECK_FUNCTION_EXACT_ARGS +
|
|
|
|
_CHECK_STACK_SPACE +
|
|
|
|
_INIT_CALL_PY_EXACT_ARGS +
|
|
|
|
SAVE_IP + // Tier 2 only; special-cased oparg
|
|
|
|
SAVE_CURRENT_IP + // Sets frame->prev_instr
|
|
|
|
_PUSH_FRAME;
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_PY_WITH_DEFAULTS, (unused/1, func_version/2, callable, self_or_null, args[oparg] -- unused)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, CALL);
|
2023-02-08 15:40:10 -04:00
|
|
|
int argcount = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
argcount++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyFunction_Check(callable), CALL);
|
|
|
|
PyFunctionObject *func = (PyFunctionObject *)callable;
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(func->func_version != func_version, CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
PyCodeObject *code = (PyCodeObject *)func->func_code;
|
2023-04-05 18:15:49 -03:00
|
|
|
assert(func->func_defaults);
|
|
|
|
assert(PyTuple_CheckExact(func->func_defaults));
|
|
|
|
int defcount = (int)PyTuple_GET_SIZE(func->func_defaults);
|
|
|
|
assert(defcount <= code->co_argcount);
|
|
|
|
int min_args = code->co_argcount - defcount;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(argcount > code->co_argcount, CALL);
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(argcount < min_args, CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-01-06 10:55:56 -04:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, func, code->co_argcount);
|
2022-11-03 01:31:26 -03:00
|
|
|
for (int i = 0; i < argcount; i++) {
|
2023-02-08 15:40:10 -04:00
|
|
|
new_frame->localsplus[i] = args[i];
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
for (int i = argcount; i < code->co_argcount; i++) {
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *def = PyTuple_GET_ITEM(func->func_defaults, i - min_args);
|
2022-11-10 06:25:33 -04:00
|
|
|
new_frame->localsplus[i] = Py_NewRef(def);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-02-08 15:40:10 -04:00
|
|
|
// Manipulate stack and cache directly since we leave using DISPATCH_INLINED().
|
|
|
|
STACK_SHRINK(oparg + 2);
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
|
2023-04-13 12:19:07 -03:00
|
|
|
frame->return_offset = 0;
|
2022-11-17 15:36:03 -04:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_TYPE_1, (unused/1, unused/2, callable, null, args[oparg] -- res)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(oparg == 1);
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(null != NULL, CALL);
|
|
|
|
PyObject *obj = args[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(callable != (PyObject *)&PyType_Type, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-02-08 15:40:10 -04:00
|
|
|
res = Py_NewRef(Py_TYPE(obj));
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_DECREF(obj);
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(&PyType_Type); // I.e., callable
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_STR_1, (unused/1, unused/2, callable, null, args[oparg] -- res)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(oparg == 1);
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(null != NULL, CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(callable != (PyObject *)&PyUnicode_Type, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *arg = args[0];
|
|
|
|
res = PyObject_Str(arg);
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_DECREF(arg);
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(&PyUnicode_Type); // I.e., callable
|
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_TUPLE_1, (unused/1, unused/2, callable, null, args[oparg] -- res)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(oparg == 1);
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(null != NULL, CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(callable != (PyObject *)&PyTuple_Type, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *arg = args[0];
|
|
|
|
res = PySequence_Tuple(arg);
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_DECREF(arg);
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(&PyTuple_Type); // I.e., tuple
|
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_ALLOC_AND_ENTER_INIT, (unused/1, unused/2, callable, null, args[oparg] -- unused)) {
|
2023-06-22 05:48:19 -03:00
|
|
|
/* This instruction does the following:
|
|
|
|
* 1. Creates the object (by calling ``object.__new__``)
|
|
|
|
* 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
|
|
|
|
* 3. Pushes the frame for ``__init__`` to the frame stack
|
|
|
|
* */
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2023-06-22 05:48:19 -03:00
|
|
|
_PyCallCache *cache = (_PyCallCache *)next_instr;
|
|
|
|
DEOPT_IF(null != NULL, CALL);
|
|
|
|
DEOPT_IF(!PyType_Check(callable), CALL);
|
|
|
|
PyTypeObject *tp = (PyTypeObject *)callable;
|
|
|
|
DEOPT_IF(tp->tp_version_tag != read_u32(cache->func_version), CALL);
|
|
|
|
PyHeapTypeObject *cls = (PyHeapTypeObject *)callable;
|
|
|
|
PyFunctionObject *init = (PyFunctionObject *)cls->_spec_cache.init;
|
|
|
|
PyCodeObject *code = (PyCodeObject *)init->func_code;
|
|
|
|
DEOPT_IF(code->co_argcount != oparg+1, CALL);
|
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize + _Py_InitCleanup.co_framesize), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyObject *self = _PyType_NewManagedObject(tp);
|
|
|
|
if (self == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(tp);
|
|
|
|
_PyInterpreterFrame *shim = _PyFrame_PushTrampolineUnchecked(
|
|
|
|
tstate, (PyCodeObject *)&_Py_InitCleanup, 1, 0);
|
|
|
|
assert(_PyCode_CODE((PyCodeObject *)shim->f_executable)[1].op.code == EXIT_INIT_CHECK);
|
|
|
|
/* Push self onto stack of shim */
|
|
|
|
Py_INCREF(self);
|
|
|
|
shim->localsplus[0] = self;
|
|
|
|
Py_INCREF(init);
|
|
|
|
_PyInterpreterFrame *init_frame = _PyFrame_PushUnchecked(tstate, init, oparg+1);
|
|
|
|
/* Copy self followed by args to __init__ frame */
|
|
|
|
init_frame->localsplus[0] = self;
|
|
|
|
for (int i = 0; i < oparg; i++) {
|
|
|
|
init_frame->localsplus[i+1] = args[i];
|
|
|
|
}
|
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
|
|
|
|
frame->prev_instr = next_instr - 1;
|
|
|
|
frame->return_offset = 0;
|
|
|
|
STACK_SHRINK(oparg+2);
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
|
|
|
/* Link frames */
|
|
|
|
init_frame->previous = shim;
|
|
|
|
shim->previous = frame;
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame = init_frame;
|
2023-06-22 05:48:19 -03:00
|
|
|
CALL_STAT_INC(inlined_py_calls);
|
2023-07-07 07:09:26 -03:00
|
|
|
/* Account for pushing the extra frame.
|
|
|
|
* We don't check recursion depth here,
|
|
|
|
* as it will be checked after start_frame */
|
|
|
|
tstate->py_recursion_remaining--;
|
2023-06-22 05:48:19 -03:00
|
|
|
goto start_frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(EXIT_INIT_CHECK, (should_be_none -- )) {
|
|
|
|
assert(STACK_LEVEL() == 2);
|
|
|
|
if (should_be_none != Py_None) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"__init__() should return None, not '%.200s'",
|
|
|
|
Py_TYPE(should_be_none)->tp_name);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_BUILTIN_CLASS, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
int kwnames_len = KWNAMES_LEN();
|
|
|
|
DEOPT_IF(!PyType_Check(callable), CALL);
|
|
|
|
PyTypeObject *tp = (PyTypeObject *)callable;
|
|
|
|
DEOPT_IF(tp->tp_vectorcall == NULL, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-02-08 15:40:10 -04:00
|
|
|
res = tp->tp_vectorcall((PyObject *)tp, args,
|
|
|
|
total_args - kwnames_len, kwnames);
|
2022-11-10 08:34:57 -04:00
|
|
|
kwnames = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
/* Free the arguments. */
|
|
|
|
for (int i = 0; i < total_args; i++) {
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(args[i]);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(tp);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_BUILTIN_O, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* Builtin METH_O functions */
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(total_args != 1, CALL);
|
|
|
|
DEOPT_IF(!PyCFunction_CheckExact(callable), CALL);
|
|
|
|
DEOPT_IF(PyCFunction_GET_FLAGS(callable) != METH_O, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
|
|
|
|
// This is slower but CPython promises to check all non-vectorcall
|
|
|
|
// function calls.
|
|
|
|
if (_Py_EnterRecursiveCallTstate(tstate, " while calling a Python object")) {
|
|
|
|
goto error;
|
|
|
|
}
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *arg = args[0];
|
|
|
|
res = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable), arg);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_LeaveRecursiveCallTstate(tstate);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
|
|
|
|
Py_DECREF(arg);
|
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_BUILTIN_FAST, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* Builtin METH_FASTCALL functions, without keywords */
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyCFunction_CheckExact(callable), CALL);
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(PyCFunction_GET_FLAGS(callable) != METH_FASTCALL, CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
|
|
|
|
/* res = func(self, args, nargs) */
|
2023-02-08 15:40:10 -04:00
|
|
|
res = ((_PyCFunctionFast)(void(*)(void))cfunc)(
|
2022-11-03 01:31:26 -03:00
|
|
|
PyCFunction_GET_SELF(callable),
|
2023-02-08 15:40:10 -04:00
|
|
|
args,
|
2022-11-03 01:31:26 -03:00
|
|
|
total_args);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
|
|
|
|
/* Free the arguments. */
|
|
|
|
for (int i = 0; i < total_args; i++) {
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(args[i]);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
/* Not deopting because this doesn't mean our optimization was
|
|
|
|
wrong. `res` can be NULL for valid reasons. Eg. getattr(x,
|
|
|
|
'invalid'). In those cases an exception is set, so we must
|
|
|
|
handle it.
|
|
|
|
*/
|
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_BUILTIN_FAST_WITH_KEYWORDS, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!PyCFunction_CheckExact(callable), CALL);
|
|
|
|
DEOPT_IF(PyCFunction_GET_FLAGS(callable) !=
|
|
|
|
(METH_FASTCALL | METH_KEYWORDS), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
/* res = func(self, args, nargs, kwnames) */
|
|
|
|
_PyCFunctionFastWithKeywords cfunc =
|
|
|
|
(_PyCFunctionFastWithKeywords)(void(*)(void))
|
|
|
|
PyCFunction_GET_FUNCTION(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
res = cfunc(
|
2022-11-03 01:31:26 -03:00
|
|
|
PyCFunction_GET_SELF(callable),
|
2023-02-08 15:40:10 -04:00
|
|
|
args,
|
2022-11-03 01:31:26 -03:00
|
|
|
total_args - KWNAMES_LEN(),
|
2022-11-10 08:34:57 -04:00
|
|
|
kwnames
|
2022-11-03 01:31:26 -03:00
|
|
|
);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
2022-11-10 08:34:57 -04:00
|
|
|
kwnames = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
/* Free the arguments. */
|
|
|
|
for (int i = 0; i < total_args; i++) {
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(args[i]);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_LEN, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
/* len(o) */
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(total_args != 1, CALL);
|
2023-07-31 18:18:38 -03:00
|
|
|
PyInterpreterState *interp = tstate->interp;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(callable != interp->callable_cache.len, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *arg = args[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_ssize_t len_i = PyObject_Length(arg);
|
|
|
|
if (len_i < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
2023-02-08 15:40:10 -04:00
|
|
|
res = PyLong_FromSsize_t(len_i);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
|
|
|
|
Py_DECREF(callable);
|
|
|
|
Py_DECREF(arg);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_ISINSTANCE, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
/* isinstance(o, o2) */
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(total_args != 2, CALL);
|
2023-07-31 18:18:38 -03:00
|
|
|
PyInterpreterState *interp = tstate->interp;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(callable != interp->callable_cache.isinstance, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *cls = args[1];
|
|
|
|
PyObject *inst = args[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
int retval = PyObject_IsInstance(inst, cls);
|
|
|
|
if (retval < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
2023-02-08 15:40:10 -04:00
|
|
|
res = PyBool_FromLong(retval);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
|
|
|
|
Py_DECREF(inst);
|
|
|
|
Py_DECREF(cls);
|
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-08 15:40:10 -04:00
|
|
|
// This is secretly a super-instruction
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_LIST_APPEND, (unused/1, unused/2, callable, self, args[oparg] -- unused)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(oparg == 1);
|
2023-08-09 15:19:39 -03:00
|
|
|
assert(self != NULL);
|
2023-07-31 18:18:38 -03:00
|
|
|
PyInterpreterState *interp = tstate->interp;
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(callable != interp->callable_cache.list_append, CALL);
|
2023-02-08 15:40:10 -04:00
|
|
|
DEOPT_IF(!PyList_Check(self), CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(CALL, hit);
|
2023-02-08 15:40:10 -04:00
|
|
|
if (_PyList_AppendTakeRef((PyListObject *)self, args[0]) < 0) {
|
|
|
|
goto pop_1_error; // Since arg is DECREF'ed already
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-02-08 15:40:10 -04:00
|
|
|
Py_DECREF(self);
|
2023-08-09 15:19:39 -03:00
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
STACK_SHRINK(3);
|
2022-11-10 12:46:56 -04:00
|
|
|
// CALL + POP_TOP
|
2023-06-14 20:14:22 -03:00
|
|
|
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
|
2023-02-20 10:56:48 -04:00
|
|
|
assert(next_instr[-1].op.code == POP_TOP);
|
2023-02-08 15:40:10 -04:00
|
|
|
DISPATCH();
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_METHOD_DESCRIPTOR_O, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2023-08-09 15:19:39 -03:00
|
|
|
PyMethodDescrObject *method = (PyMethodDescrObject *)callable;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(total_args != 2, CALL);
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(!Py_IS_TYPE(method, &PyMethodDescr_Type), CALL);
|
|
|
|
PyMethodDef *meth = method->d_method;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(meth->ml_flags != METH_O, CALL);
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *arg = args[1];
|
|
|
|
PyObject *self = args[0];
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(!Py_IS_TYPE(self, method->d_common.d_type), CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyCFunction cfunc = meth->ml_meth;
|
|
|
|
// This is slower but CPython promises to check all non-vectorcall
|
|
|
|
// function calls.
|
|
|
|
if (_Py_EnterRecursiveCallTstate(tstate, " while calling a Python object")) {
|
|
|
|
goto error;
|
|
|
|
}
|
2023-02-08 15:40:10 -04:00
|
|
|
res = _PyCFunction_TrampolineCall(cfunc, self, arg);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_LeaveRecursiveCallTstate(tstate);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
Py_DECREF(self);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2023-08-09 15:19:39 -03:00
|
|
|
PyMethodDescrObject *method = (PyMethodDescrObject *)callable;
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(method, &PyMethodDescr_Type), CALL);
|
|
|
|
PyMethodDef *meth = method->d_method;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(meth->ml_flags != (METH_FASTCALL|METH_KEYWORDS), CALL);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyTypeObject *d_type = method->d_common.d_type;
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *self = args[0];
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(!Py_IS_TYPE(self, d_type), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-02-08 15:40:10 -04:00
|
|
|
int nargs = total_args - 1;
|
2022-11-03 01:31:26 -03:00
|
|
|
_PyCFunctionFastWithKeywords cfunc =
|
|
|
|
(_PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
|
2023-02-08 15:40:10 -04:00
|
|
|
res = cfunc(self, args + 1, nargs - KWNAMES_LEN(), kwnames);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
2022-11-10 08:34:57 -04:00
|
|
|
kwnames = NULL;
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
/* Free the arguments. */
|
2023-02-08 15:40:10 -04:00
|
|
|
for (int i = 0; i < total_args; i++) {
|
|
|
|
Py_DECREF(args[i]);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(oparg == 0 || oparg == 1);
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(total_args != 1, CALL);
|
2023-08-09 15:19:39 -03:00
|
|
|
PyMethodDescrObject *method = (PyMethodDescrObject *)callable;
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(method, &PyMethodDescr_Type), CALL);
|
|
|
|
PyMethodDef *meth = method->d_method;
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *self = args[0];
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(!Py_IS_TYPE(self, method->d_common.d_type), CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(meth->ml_flags != METH_NOARGS, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyCFunction cfunc = meth->ml_meth;
|
|
|
|
// This is slower but CPython promises to check all non-vectorcall
|
|
|
|
// function calls.
|
|
|
|
if (_Py_EnterRecursiveCallTstate(tstate, " while calling a Python object")) {
|
|
|
|
goto error;
|
|
|
|
}
|
2023-02-08 15:40:10 -04:00
|
|
|
res = _PyCFunction_TrampolineCall(cfunc, self, NULL);
|
2022-11-03 01:31:26 -03:00
|
|
|
_Py_LeaveRecursiveCallTstate(tstate);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
Py_DECREF(self);
|
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_NO_KW_METHOD_DESCRIPTOR_FAST, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
|
2023-07-17 15:02:58 -03:00
|
|
|
ASSERT_KWNAMES_IS_NULL();
|
2023-02-08 15:40:10 -04:00
|
|
|
int total_args = oparg;
|
2023-08-09 15:19:39 -03:00
|
|
|
if (self_or_null != NULL) {
|
2023-02-08 15:40:10 -04:00
|
|
|
args--;
|
|
|
|
total_args++;
|
|
|
|
}
|
2023-08-09 15:19:39 -03:00
|
|
|
PyMethodDescrObject *method = (PyMethodDescrObject *)callable;
|
2022-11-03 01:31:26 -03:00
|
|
|
/* Builtin METH_FASTCALL methods, without keywords */
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(!Py_IS_TYPE(method, &PyMethodDescr_Type), CALL);
|
|
|
|
PyMethodDef *meth = method->d_method;
|
2022-11-03 01:31:26 -03:00
|
|
|
DEOPT_IF(meth->ml_flags != METH_FASTCALL, CALL);
|
2023-02-08 15:40:10 -04:00
|
|
|
PyObject *self = args[0];
|
2023-08-09 15:19:39 -03:00
|
|
|
DEOPT_IF(!Py_IS_TYPE(self, method->d_common.d_type), CALL);
|
2022-11-03 01:31:26 -03:00
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
_PyCFunctionFast cfunc =
|
|
|
|
(_PyCFunctionFast)(void(*)(void))meth->ml_meth;
|
2023-02-08 15:40:10 -04:00
|
|
|
int nargs = total_args - 1;
|
|
|
|
res = cfunc(self, args + 1, nargs);
|
2022-11-03 01:31:26 -03:00
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
/* Clear the stack of the arguments. */
|
2023-02-08 15:40:10 -04:00
|
|
|
for (int i = 0; i < total_args; i++) {
|
|
|
|
Py_DECREF(args[i]);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(callable);
|
2023-02-08 15:40:10 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-04-12 08:04:55 -03:00
|
|
|
inst(INSTRUMENTED_CALL_FUNCTION_EX, ( -- )) {
|
|
|
|
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
|
|
|
|
}
|
|
|
|
|
2023-08-09 15:19:39 -03:00
|
|
|
inst(CALL_FUNCTION_EX, (func, unused, callargs, kwargs if (oparg & 1) -- result)) {
|
2023-04-12 08:04:55 -03:00
|
|
|
// 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));
|
2022-11-03 01:31:26 -03:00
|
|
|
if (!PyTuple_CheckExact(callargs)) {
|
|
|
|
if (check_args_iterable(tstate, func, callargs) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
2023-02-08 00:03:22 -04:00
|
|
|
PyObject *tuple = PySequence_Tuple(callargs);
|
|
|
|
if (tuple == NULL) {
|
2022-11-03 01:31:26 -03:00
|
|
|
goto error;
|
|
|
|
}
|
2023-02-08 00:03:22 -04:00
|
|
|
Py_SETREF(callargs, tuple);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
assert(PyTuple_CheckExact(callargs));
|
2023-04-12 08:04:55 -03:00
|
|
|
EVAL_CALL_STAT_INC_IF_FUNCTION(EVAL_CALL_FUNCTION_EX, func);
|
|
|
|
if (opcode == INSTRUMENTED_CALL_FUNCTION_EX &&
|
|
|
|
!PyFunction_Check(func) && !PyMethod_Check(func)
|
|
|
|
) {
|
|
|
|
PyObject *arg = PyTuple_GET_SIZE(callargs) > 0 ?
|
|
|
|
PyTuple_GET_ITEM(callargs, 0) : Py_None;
|
|
|
|
int err = _Py_call_instrumentation_2args(
|
|
|
|
tstate, PY_MONITORING_EVENT_CALL,
|
|
|
|
frame, next_instr-1, func, arg);
|
|
|
|
if (err) goto error;
|
|
|
|
result = PyObject_Call(func, callargs, kwargs);
|
|
|
|
if (result == NULL) {
|
|
|
|
_Py_call_instrumentation_exc2(
|
|
|
|
tstate, PY_MONITORING_EVENT_C_RAISE,
|
|
|
|
frame, next_instr-1, func, arg);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int err = _Py_call_instrumentation_2args(
|
|
|
|
tstate, PY_MONITORING_EVENT_C_RETURN,
|
|
|
|
frame, next_instr-1, func, arg);
|
|
|
|
if (err < 0) {
|
|
|
|
Py_CLEAR(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2023-04-30 10:08:26 -03:00
|
|
|
if (Py_TYPE(func) == &PyFunction_Type &&
|
|
|
|
tstate->interp->eval_frame == NULL &&
|
|
|
|
((PyFunctionObject *)func)->vectorcall == _PyFunction_Vectorcall) {
|
|
|
|
assert(PyTuple_CheckExact(callargs));
|
|
|
|
Py_ssize_t nargs = PyTuple_GET_SIZE(callargs);
|
|
|
|
int code_flags = ((PyCodeObject *)PyFunction_GET_CODE(func))->co_flags;
|
|
|
|
PyObject *locals = code_flags & CO_OPTIMIZED ? NULL : Py_NewRef(PyFunction_GET_GLOBALS(func));
|
|
|
|
|
|
|
|
_PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit_Ex(tstate,
|
|
|
|
(PyFunctionObject *)func, locals,
|
|
|
|
nargs, callargs, kwargs);
|
|
|
|
// Need to manually shrink the stack since we exit with DISPATCH_INLINED.
|
|
|
|
STACK_SHRINK(oparg + 3);
|
|
|
|
if (new_frame == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
frame->return_offset = 0;
|
|
|
|
DISPATCH_INLINED(new_frame);
|
|
|
|
}
|
2023-04-12 08:04:55 -03:00
|
|
|
result = PyObject_Call(func, callargs, kwargs);
|
|
|
|
}
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-08-09 15:19:39 -03:00
|
|
|
assert(PEEK(2 + (oparg & 1)) == NULL);
|
2023-02-08 00:03:22 -04:00
|
|
|
ERROR_IF(result == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
2023-06-13 05:51:05 -03:00
|
|
|
inst(MAKE_FUNCTION, (codeobj -- func)) {
|
2023-02-03 10:40:45 -04:00
|
|
|
|
|
|
|
PyFunctionObject *func_obj = (PyFunctionObject *)
|
2022-11-03 01:31:26 -03:00
|
|
|
PyFunction_New(codeobj, GLOBALS());
|
|
|
|
|
|
|
|
Py_DECREF(codeobj);
|
2023-02-03 10:40:45 -04:00
|
|
|
if (func_obj == NULL) {
|
2022-11-03 01:31:26 -03:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2023-08-17 15:29:58 -03:00
|
|
|
_PyFunction_SetVersion(
|
|
|
|
func_obj, ((PyCodeObject *)codeobj)->co_version);
|
2023-02-03 10:40:45 -04:00
|
|
|
func = (PyObject *)func_obj;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-06-13 05:51:05 -03:00
|
|
|
|
|
|
|
inst(SET_FUNCTION_ATTRIBUTE, (attr, func -- func)) {
|
|
|
|
assert(PyFunction_Check(func));
|
|
|
|
PyFunctionObject *func_obj = (PyFunctionObject *)func;
|
|
|
|
switch(oparg) {
|
|
|
|
case MAKE_FUNCTION_CLOSURE:
|
|
|
|
assert(func_obj->func_closure == NULL);
|
|
|
|
func_obj->func_closure = attr;
|
|
|
|
break;
|
|
|
|
case MAKE_FUNCTION_ANNOTATIONS:
|
|
|
|
assert(func_obj->func_annotations == NULL);
|
|
|
|
func_obj->func_annotations = attr;
|
|
|
|
break;
|
|
|
|
case MAKE_FUNCTION_KWDEFAULTS:
|
|
|
|
assert(PyDict_CheckExact(attr));
|
|
|
|
assert(func_obj->func_kwdefaults == NULL);
|
|
|
|
func_obj->func_kwdefaults = attr;
|
|
|
|
break;
|
|
|
|
case MAKE_FUNCTION_DEFAULTS:
|
|
|
|
assert(PyTuple_CheckExact(attr));
|
|
|
|
assert(func_obj->func_defaults == NULL);
|
|
|
|
func_obj->func_defaults = attr;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
Py_UNREACHABLE();
|
|
|
|
}
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-02-03 07:30:21 -04:00
|
|
|
inst(RETURN_GENERATOR, (--)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(PyFunction_Check(frame->f_funcobj));
|
|
|
|
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
|
|
|
|
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
|
|
|
|
if (gen == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
assert(EMPTY());
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
|
|
|
_PyInterpreterFrame *gen_frame = (_PyInterpreterFrame *)gen->gi_iframe;
|
|
|
|
_PyFrame_Copy(frame, gen_frame);
|
|
|
|
assert(frame->frame_obj == NULL);
|
|
|
|
gen->gi_frame_state = FRAME_CREATED;
|
|
|
|
gen_frame->owner = FRAME_OWNED_BY_GENERATOR;
|
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
2022-11-10 08:34:57 -04:00
|
|
|
assert(frame != &entry_frame);
|
|
|
|
_PyInterpreterFrame *prev = frame->previous;
|
|
|
|
_PyThreadState_PopFrame(tstate, frame);
|
2023-08-17 07:16:03 -03:00
|
|
|
frame = tstate->current_frame = prev;
|
2022-11-10 08:34:57 -04:00
|
|
|
_PyFrame_StackPush(frame, (PyObject *)gen);
|
|
|
|
goto resume_frame;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-03 10:40:45 -04:00
|
|
|
inst(BUILD_SLICE, (start, stop, step if (oparg == 3) -- slice)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
slice = PySlice_New(start, stop, step);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2023-02-03 10:40:45 -04:00
|
|
|
ERROR_IF(slice == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-06-14 12:15:08 -03:00
|
|
|
inst(CONVERT_VALUE, (value -- result)) {
|
|
|
|
convertion_func_ptr conv_fn;
|
|
|
|
assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
|
|
|
|
conv_fn = CONVERSION_FUNCTIONS[oparg];
|
|
|
|
result = conv_fn(value);
|
|
|
|
Py_DECREF(value);
|
|
|
|
ERROR_IF(result == NULL, error);
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-06-14 12:15:08 -03:00
|
|
|
inst(FORMAT_SIMPLE, (value -- res)) {
|
|
|
|
/* If value is a unicode object, then we know the result
|
|
|
|
* of format(value) is value itself. */
|
|
|
|
if (!PyUnicode_CheckExact(value)) {
|
|
|
|
res = PyObject_Format(value, NULL);
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_DECREF(value);
|
2023-06-14 12:15:08 -03:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
2023-06-14 12:15:08 -03:00
|
|
|
else {
|
|
|
|
res = value;
|
|
|
|
}
|
|
|
|
}
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-06-14 12:15:08 -03:00
|
|
|
inst(FORMAT_WITH_SPEC, (value, fmt_spec -- res)) {
|
|
|
|
res = PyObject_Format(value, fmt_spec);
|
2023-03-21 04:47:15 -03:00
|
|
|
Py_DECREF(value);
|
2023-06-14 12:15:08 -03:00
|
|
|
Py_DECREF(fmt_spec);
|
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-06 18:45:18 -04:00
|
|
|
inst(COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
|
|
|
|
assert(oparg > 0);
|
|
|
|
top = Py_NewRef(bottom);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
(STORE_SUBSCR was alread half converted,
but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
The original had mysterious `SET_TOP(NULL)` before `goto error`.
I assume those just account for `obj` having been decref'ed,
so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
2022-12-08 17:31:27 -04:00
|
|
|
inst(BINARY_OP, (unused/1, lhs, rhs -- res)) {
|
2023-01-19 14:14:55 -04:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-03 01:31:26 -03:00
|
|
|
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
|
2022-11-09 14:50:09 -04:00
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
2022-11-03 01:31:26 -03:00
|
|
|
next_instr--;
|
2023-07-18 15:42:44 -03:00
|
|
|
_Py_Specialize_BinaryOp(lhs, rhs, next_instr, oparg, LOCALS_ARRAY);
|
2022-11-03 01:31:26 -03:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
2022-11-09 14:50:09 -04:00
|
|
|
STAT_INC(BINARY_OP, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-19 14:14:55 -04:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-07-20 17:37:19 -03:00
|
|
|
assert(NB_ADD <= oparg);
|
|
|
|
assert(oparg <= NB_INPLACE_XOR);
|
|
|
|
assert(_PyEval_BinaryOps[oparg]);
|
|
|
|
res = _PyEval_BinaryOps[oparg](lhs, rhs);
|
2023-03-13 19:08:45 -03:00
|
|
|
DECREF_INPUTS();
|
2022-11-17 15:36:57 -04:00
|
|
|
ERROR_IF(res == NULL, error);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-02-06 18:45:18 -04:00
|
|
|
inst(SWAP, (bottom, unused[oparg-2], top --
|
|
|
|
top, unused[oparg-2], bottom)) {
|
|
|
|
assert(oparg >= 2);
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2023-04-12 08:04:55 -03:00
|
|
|
inst(INSTRUMENTED_INSTRUCTION, ( -- )) {
|
|
|
|
int next_opcode = _Py_call_instrumentation_instruction(
|
|
|
|
tstate, frame, next_instr-1);
|
|
|
|
ERROR_IF(next_opcode < 0, error);
|
|
|
|
next_instr--;
|
|
|
|
if (_PyOpcode_Caches[next_opcode]) {
|
|
|
|
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)(next_instr+1);
|
|
|
|
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
|
|
|
|
}
|
|
|
|
assert(next_opcode > 0 && next_opcode < 256);
|
|
|
|
opcode = next_opcode;
|
|
|
|
DISPATCH_GOTO();
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(INSTRUMENTED_JUMP_FORWARD, ( -- )) {
|
|
|
|
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(INSTRUMENTED_JUMP_BACKWARD, ( -- )) {
|
|
|
|
CHECK_EVAL_BREAKER();
|
2023-07-03 17:28:27 -03:00
|
|
|
INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
|
2023-04-12 08:04:55 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
inst(INSTRUMENTED_POP_JUMP_IF_TRUE, ( -- )) {
|
|
|
|
PyObject *cond = POP();
|
2023-06-29 17:49:54 -03:00
|
|
|
assert(PyBool_Check(cond));
|
|
|
|
_Py_CODEUNIT *here = next_instr - 1;
|
|
|
|
int offset = Py_IsTrue(cond) * oparg;
|
2023-04-12 08:04:55 -03:00
|
|
|
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(INSTRUMENTED_POP_JUMP_IF_FALSE, ( -- )) {
|
|
|
|
PyObject *cond = POP();
|
2023-06-29 17:49:54 -03:00
|
|
|
assert(PyBool_Check(cond));
|
|
|
|
_Py_CODEUNIT *here = next_instr - 1;
|
|
|
|
int offset = Py_IsFalse(cond) * oparg;
|
2023-04-12 08:04:55 -03:00
|
|
|
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(INSTRUMENTED_POP_JUMP_IF_NONE, ( -- )) {
|
|
|
|
PyObject *value = POP();
|
|
|
|
_Py_CODEUNIT *here = next_instr-1;
|
|
|
|
int offset;
|
|
|
|
if (Py_IsNone(value)) {
|
|
|
|
offset = oparg;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(value);
|
|
|
|
offset = 0;
|
|
|
|
}
|
|
|
|
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(INSTRUMENTED_POP_JUMP_IF_NOT_NONE, ( -- )) {
|
|
|
|
PyObject *value = POP();
|
|
|
|
_Py_CODEUNIT *here = next_instr-1;
|
|
|
|
int offset;
|
|
|
|
if (Py_IsNone(value)) {
|
|
|
|
offset = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(value);
|
2023-06-29 17:49:54 -03:00
|
|
|
offset = oparg;
|
2023-04-12 08:04:55 -03:00
|
|
|
}
|
|
|
|
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(EXTENDED_ARG, ( -- )) {
|
2022-11-03 01:31:26 -03:00
|
|
|
assert(oparg);
|
2023-02-20 10:56:48 -04:00
|
|
|
opcode = next_instr->op.code;
|
|
|
|
oparg = oparg << 8 | next_instr->op.arg;
|
2022-11-09 14:50:09 -04:00
|
|
|
PRE_DISPATCH_GOTO();
|
2022-11-03 01:31:26 -03:00
|
|
|
DISPATCH_GOTO();
|
|
|
|
}
|
|
|
|
|
2023-01-31 06:23:15 -04:00
|
|
|
inst(CACHE, (--)) {
|
2023-04-12 08:04:55 -03:00
|
|
|
assert(0 && "Executing a cache.");
|
|
|
|
Py_UNREACHABLE();
|
|
|
|
}
|
|
|
|
|
|
|
|
inst(RESERVED, (--)) {
|
|
|
|
assert(0 && "Executing RESERVED instruction.");
|
2022-11-03 01:31:26 -03:00
|
|
|
Py_UNREACHABLE();
|
|
|
|
}
|
|
|
|
|
2023-07-13 16:14:51 -03:00
|
|
|
///////// Tier-2 only opcodes /////////
|
|
|
|
|
|
|
|
op(_POP_JUMP_IF_FALSE, (flag -- )) {
|
|
|
|
if (Py_IsFalse(flag)) {
|
|
|
|
pc = oparg;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
op(_POP_JUMP_IF_TRUE, (flag -- )) {
|
|
|
|
if (Py_IsTrue(flag)) {
|
|
|
|
pc = oparg;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
op(JUMP_TO_TOP, (--)) {
|
|
|
|
pc = 0;
|
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
}
|
|
|
|
|
|
|
|
op(SAVE_IP, (--)) {
|
|
|
|
frame->prev_instr = ip_offset + oparg;
|
|
|
|
}
|
|
|
|
|
2023-08-16 20:26:43 -03:00
|
|
|
op(SAVE_CURRENT_IP, (--)) {
|
|
|
|
#if TIER_ONE
|
|
|
|
frame->prev_instr = next_instr - 1;
|
|
|
|
#endif
|
|
|
|
#if TIER_TWO
|
|
|
|
// Relies on a preceding SAVE_IP
|
|
|
|
frame->prev_instr--;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2023-07-13 16:14:51 -03:00
|
|
|
op(EXIT_TRACE, (--)) {
|
|
|
|
frame->prev_instr--; // Back up to just before destination
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
|
|
|
Py_DECREF(self);
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2023-08-15 15:04:17 -03:00
|
|
|
op(INSERT, (unused[oparg], top -- top, unused[oparg])) {
|
|
|
|
// Inserts TOS at position specified by oparg;
|
|
|
|
memmove(&stack_pointer[-1 - oparg], &stack_pointer[-oparg], oparg * sizeof(stack_pointer[0]));
|
|
|
|
}
|
|
|
|
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
// END BYTECODES //
|
|
|
|
|
|
|
|
}
|
2023-01-18 14:41:07 -04:00
|
|
|
dispatch_opcode:
|
2022-11-04 21:40:43 -03:00
|
|
|
error:
|
|
|
|
exception_unwind:
|
2023-01-18 14:41:07 -04:00
|
|
|
exit_unwind:
|
2022-11-04 21:40:43 -03:00
|
|
|
handle_eval_breaker:
|
|
|
|
resume_frame:
|
|
|
|
resume_with_error:
|
|
|
|
start_frame:
|
|
|
|
unbound_local_error:
|
|
|
|
;
|
2022-11-03 01:31:26 -03:00
|
|
|
}
|
|
|
|
|
2022-11-15 23:59:19 -04:00
|
|
|
// Future families go below this point //
|