2022-11-05 08:40:43 +08:00
|
|
|
// This file is generated by Tools/cases_generator/generate_cases.py
|
2022-11-18 09:06:07 +08:00
|
|
|
// from Python/bytecodes.c
|
2022-11-03 12:31:26 +08:00
|
|
|
// Do not edit!
|
|
|
|
|
|
|
|
TARGET(NOP) {
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(RESUME) {
|
|
|
|
assert(tstate->cframe == &cframe);
|
|
|
|
assert(frame == cframe.current_frame);
|
|
|
|
if (_Py_atomic_load_relaxed_int32(eval_breaker) && oparg < 2) {
|
|
|
|
goto handle_eval_breaker;
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_CLOSURE) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value;
|
2022-11-03 12:31:26 +08:00
|
|
|
/* We keep LOAD_CLOSURE so that the bytecode stays more readable. */
|
2022-11-09 00:22:56 +08:00
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
if (value == NULL) goto unbound_local_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_INCREF(value);
|
2022-11-09 00:22:56 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, value);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_FAST_CHECK) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value;
|
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
if (value == NULL) goto unbound_local_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_INCREF(value);
|
2022-11-09 00:22:56 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, value);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_FAST) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value;
|
|
|
|
value = GETLOCAL(oparg);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(value != NULL);
|
|
|
|
Py_INCREF(value);
|
2022-11-09 00:22:56 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, value);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_CONST) {
|
|
|
|
PREDICTED(LOAD_CONST);
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value;
|
|
|
|
value = GETITEM(consts, oparg);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_INCREF(value);
|
2022-11-09 00:22:56 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, value);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_FAST) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
SETLOCAL(oparg, value);
|
2022-11-09 00:22:56 +08:00
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-12-09 07:54:07 +08:00
|
|
|
TARGET(LOAD_FAST__LOAD_FAST) {
|
|
|
|
PyObject *_tmp_1;
|
|
|
|
PyObject *_tmp_2;
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
assert(value != NULL);
|
|
|
|
Py_INCREF(value);
|
|
|
|
_tmp_2 = value;
|
|
|
|
}
|
|
|
|
NEXTOPARG();
|
|
|
|
JUMPBY(1);
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
assert(value != NULL);
|
|
|
|
Py_INCREF(value);
|
|
|
|
_tmp_1 = value;
|
|
|
|
}
|
|
|
|
STACK_GROW(2);
|
|
|
|
POKE(1, _tmp_1);
|
|
|
|
POKE(2, _tmp_2);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_FAST__LOAD_CONST) {
|
|
|
|
PyObject *_tmp_1;
|
|
|
|
PyObject *_tmp_2;
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
assert(value != NULL);
|
|
|
|
Py_INCREF(value);
|
|
|
|
_tmp_2 = value;
|
|
|
|
}
|
|
|
|
NEXTOPARG();
|
|
|
|
JUMPBY(1);
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
value = GETITEM(consts, oparg);
|
|
|
|
Py_INCREF(value);
|
|
|
|
_tmp_1 = value;
|
|
|
|
}
|
|
|
|
STACK_GROW(2);
|
|
|
|
POKE(1, _tmp_1);
|
|
|
|
POKE(2, _tmp_2);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_FAST__LOAD_FAST) {
|
|
|
|
PyObject *_tmp_1 = PEEK(1);
|
|
|
|
{
|
|
|
|
PyObject *value = _tmp_1;
|
|
|
|
SETLOCAL(oparg, value);
|
|
|
|
}
|
|
|
|
NEXTOPARG();
|
|
|
|
JUMPBY(1);
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
assert(value != NULL);
|
|
|
|
Py_INCREF(value);
|
|
|
|
_tmp_1 = value;
|
|
|
|
}
|
|
|
|
POKE(1, _tmp_1);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_FAST__STORE_FAST) {
|
|
|
|
PyObject *_tmp_1 = PEEK(1);
|
|
|
|
PyObject *_tmp_2 = PEEK(2);
|
|
|
|
{
|
|
|
|
PyObject *value = _tmp_1;
|
|
|
|
SETLOCAL(oparg, value);
|
|
|
|
}
|
|
|
|
NEXTOPARG();
|
|
|
|
JUMPBY(1);
|
|
|
|
{
|
|
|
|
PyObject *value = _tmp_2;
|
|
|
|
SETLOCAL(oparg, value);
|
|
|
|
}
|
|
|
|
STACK_SHRINK(2);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_CONST__LOAD_FAST) {
|
|
|
|
PyObject *_tmp_1;
|
|
|
|
PyObject *_tmp_2;
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
value = GETITEM(consts, oparg);
|
|
|
|
Py_INCREF(value);
|
|
|
|
_tmp_2 = value;
|
|
|
|
}
|
|
|
|
NEXTOPARG();
|
|
|
|
JUMPBY(1);
|
|
|
|
{
|
|
|
|
PyObject *value;
|
|
|
|
value = GETLOCAL(oparg);
|
|
|
|
assert(value != NULL);
|
|
|
|
Py_INCREF(value);
|
|
|
|
_tmp_1 = value;
|
|
|
|
}
|
|
|
|
STACK_GROW(2);
|
|
|
|
POKE(1, _tmp_1);
|
|
|
|
POKE(2, _tmp_2);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-11-03 12:31:26 +08:00
|
|
|
TARGET(POP_TOP) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(value);
|
2022-11-09 00:22:56 +08:00
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(PUSH_NULL) {
|
2022-11-11 02:50:57 +08:00
|
|
|
PyObject *res;
|
|
|
|
res = NULL;
|
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, res);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-12-09 07:54:07 +08:00
|
|
|
TARGET(END_FOR) {
|
|
|
|
PyObject *_tmp_1 = PEEK(1);
|
|
|
|
PyObject *_tmp_2 = PEEK(2);
|
|
|
|
{
|
|
|
|
PyObject *value = _tmp_1;
|
|
|
|
Py_DECREF(value);
|
|
|
|
}
|
|
|
|
{
|
|
|
|
PyObject *value = _tmp_2;
|
|
|
|
Py_DECREF(value);
|
|
|
|
}
|
|
|
|
STACK_SHRINK(2);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-11-03 12:31:26 +08:00
|
|
|
TARGET(UNARY_NEGATIVE) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value = PEEK(1);
|
|
|
|
PyObject *res;
|
|
|
|
res = PyNumber_Negative(value);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(value);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (res == NULL) goto pop_1_error;
|
|
|
|
POKE(1, res);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(UNARY_NOT) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value = PEEK(1);
|
|
|
|
PyObject *res;
|
2022-11-03 12:31:26 +08:00
|
|
|
int err = PyObject_IsTrue(value);
|
|
|
|
Py_DECREF(value);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (err < 0) goto pop_1_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
if (err == 0) {
|
2022-11-09 00:22:56 +08:00
|
|
|
res = Py_True;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-11-09 00:22:56 +08:00
|
|
|
else {
|
|
|
|
res = Py_False;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-11-09 00:22:56 +08:00
|
|
|
Py_INCREF(res);
|
|
|
|
POKE(1, res);
|
|
|
|
DISPATCH();
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(UNARY_INVERT) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *value = PEEK(1);
|
|
|
|
PyObject *res;
|
|
|
|
res = PyNumber_Invert(value);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(value);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (res == NULL) goto pop_1_error;
|
|
|
|
POKE(1, res);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_OP_MULTIPLY_INT) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *prod;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
2022-11-09 00:22:56 +08:00
|
|
|
prod = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (prod == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, prod);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_OP_MULTIPLY_FLOAT) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *prod;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
|
|
|
double dprod = ((PyFloatObject *)left)->ob_fval *
|
|
|
|
((PyFloatObject *)right)->ob_fval;
|
2022-11-09 00:22:56 +08:00
|
|
|
prod = PyFloat_FromDouble(dprod);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (prod == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, prod);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_OP_SUBTRACT_INT) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *sub;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
2022-11-09 00:22:56 +08:00
|
|
|
sub = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (sub == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, 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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_OP_SUBTRACT_FLOAT) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *sub;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
|
|
|
double dsub = ((PyFloatObject *)left)->ob_fval - ((PyFloatObject *)right)->ob_fval;
|
2022-11-09 00:22:56 +08:00
|
|
|
sub = PyFloat_FromDouble(dsub);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (sub == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, 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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_OP_ADD_UNICODE) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *res;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
2022-11-09 00:22:56 +08:00
|
|
|
res = PyUnicode_Concat(left, right);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (res == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, res);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_OP_INPLACE_ADD_UNICODE) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
|
|
|
|
_Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP];
|
|
|
|
assert(_Py_OPCODE(true_next) == STORE_FAST ||
|
|
|
|
_Py_OPCODE(true_next) == STORE_FAST__LOAD_FAST);
|
|
|
|
PyObject **target_local = &GETLOCAL(_Py_OPARG(true_next));
|
|
|
|
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-09 00:22:56 +08:00
|
|
|
if (*target_local == NULL) goto pop_2_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
// The STORE_FAST is already done.
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
|
2022-11-09 00:22:56 +08:00
|
|
|
STACK_SHRINK(2);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_OP_ADD_FLOAT) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *sum;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
|
|
|
double dsum = ((PyFloatObject *)left)->ob_fval +
|
|
|
|
((PyFloatObject *)right)->ob_fval;
|
2022-11-09 00:22:56 +08:00
|
|
|
sum = PyFloat_FromDouble(dsum);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (sum == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, sum);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_OP_ADD_INT) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *sum;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
|
|
|
|
DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
|
|
|
|
STAT_INC(BINARY_OP, hit);
|
2022-11-09 00:22:56 +08:00
|
|
|
sum = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (sum == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, sum);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_SUBSCR) {
|
|
|
|
PREDICTED(BINARY_SUBSCR);
|
2022-11-18 09:06:07 +08:00
|
|
|
static_assert(INLINE_CACHE_ENTRIES_BINARY_SUBSCR == 4, "incorrect cache size");
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *container = PEEK(2);
|
|
|
|
PyObject *res;
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-10 02:50:09 +08:00
|
|
|
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_BinarySubscr(container, sub, next_instr);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(BINARY_SUBSCR, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-09 00:22:56 +08:00
|
|
|
res = PyObject_GetItem(container, sub);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(container);
|
|
|
|
Py_DECREF(sub);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (res == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, res);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_SLICE) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *stop = PEEK(1);
|
|
|
|
PyObject *start = PEEK(2);
|
|
|
|
PyObject *container = PEEK(3);
|
|
|
|
PyObject *res;
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
|
2022-11-09 00:22:56 +08:00
|
|
|
// Can't use ERROR_IF() here, because we haven't
|
|
|
|
// DECREF'ed container yet, and we still own slice.
|
2022-11-03 12:31:26 +08:00
|
|
|
if (slice == NULL) {
|
2022-11-09 00:22:56 +08:00
|
|
|
res = NULL;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-11-09 00:22:56 +08:00
|
|
|
else {
|
|
|
|
res = PyObject_GetItem(container, slice);
|
|
|
|
Py_DECREF(slice);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
Py_DECREF(container);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (res == NULL) goto pop_3_error;
|
|
|
|
STACK_SHRINK(2);
|
|
|
|
POKE(1, res);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_SLICE) {
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *stop = PEEK(1);
|
|
|
|
PyObject *start = PEEK(2);
|
|
|
|
PyObject *container = PEEK(3);
|
|
|
|
PyObject *v = PEEK(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
|
2022-11-09 00:22:56 +08:00
|
|
|
int err;
|
2022-11-03 12:31:26 +08:00
|
|
|
if (slice == NULL) {
|
2022-11-09 00:22:56 +08:00
|
|
|
err = 1;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-11-09 00:22:56 +08:00
|
|
|
else {
|
|
|
|
err = PyObject_SetItem(container, slice, v);
|
|
|
|
Py_DECREF(slice);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
Py_DECREF(v);
|
|
|
|
Py_DECREF(container);
|
2022-11-09 00:22:56 +08:00
|
|
|
if (err) goto pop_4_error;
|
|
|
|
STACK_SHRINK(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_SUBSCR_LIST_INT) {
|
2022-11-18 09:06:07 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *list = PEEK(2);
|
|
|
|
PyObject *res;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
|
|
|
|
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
|
|
|
|
|
|
|
|
// Deopt unless 0 <= sub < PyList_Size(list)
|
2022-12-22 19:30:18 +08:00
|
|
|
DEOPT_IF(!_PyLong_IsPositiveSingleDigit(sub), BINARY_SUBSCR);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(((PyLongObject *)_PyLong_GetZero())->ob_digit[0] == 0);
|
|
|
|
Py_ssize_t index = ((PyLongObject*)sub)->ob_digit[0];
|
|
|
|
DEOPT_IF(index >= PyList_GET_SIZE(list), BINARY_SUBSCR);
|
|
|
|
STAT_INC(BINARY_SUBSCR, hit);
|
2022-11-18 09:06:07 +08:00
|
|
|
res = PyList_GET_ITEM(list, index);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(res != NULL);
|
|
|
|
Py_INCREF(res);
|
|
|
|
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
|
|
|
|
Py_DECREF(list);
|
2022-11-18 09:06:07 +08:00
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, res);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_SUBSCR_TUPLE_INT) {
|
2022-11-18 09:06:07 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *tuple = PEEK(2);
|
|
|
|
PyObject *res;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
|
|
|
|
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
|
|
|
|
|
|
|
|
// Deopt unless 0 <= sub < PyTuple_Size(list)
|
2022-12-22 19:30:18 +08:00
|
|
|
DEOPT_IF(!_PyLong_IsPositiveSingleDigit(sub), BINARY_SUBSCR);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(((PyLongObject *)_PyLong_GetZero())->ob_digit[0] == 0);
|
|
|
|
Py_ssize_t index = ((PyLongObject*)sub)->ob_digit[0];
|
|
|
|
DEOPT_IF(index >= PyTuple_GET_SIZE(tuple), BINARY_SUBSCR);
|
|
|
|
STAT_INC(BINARY_SUBSCR, hit);
|
2022-11-18 09:06:07 +08:00
|
|
|
res = PyTuple_GET_ITEM(tuple, index);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(res != NULL);
|
|
|
|
Py_INCREF(res);
|
|
|
|
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
|
|
|
|
Py_DECREF(tuple);
|
2022-11-18 09:06:07 +08:00
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, res);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_SUBSCR_DICT) {
|
2022-11-18 09:06:07 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *dict = PEEK(2);
|
|
|
|
PyObject *res;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
2022-11-18 09:06:07 +08:00
|
|
|
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
|
2022-11-03 12:31:26 +08:00
|
|
|
STAT_INC(BINARY_SUBSCR, hit);
|
2022-11-18 09:06:07 +08:00
|
|
|
res = PyDict_GetItemWithError(dict, sub);
|
2022-11-03 12:31:26 +08:00
|
|
|
if (res == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_SetKeyError(sub);
|
|
|
|
}
|
2022-11-18 09:06:07 +08:00
|
|
|
Py_DECREF(dict);
|
|
|
|
Py_DECREF(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-09 05:31:27 +08:00
|
|
|
if (true) goto pop_2_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-11-18 09:06:07 +08:00
|
|
|
Py_INCREF(res); // Do this before DECREF'ing dict, sub
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(dict);
|
2022-11-18 09:06:07 +08:00
|
|
|
Py_DECREF(sub);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, res);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BINARY_SUBSCR_GETITEM) {
|
2022-11-18 09:06:07 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *container = PEEK(2);
|
2022-12-14 19:12:53 +08:00
|
|
|
uint32_t type_version = read_u32(&next_instr[1].cache);
|
|
|
|
uint16_t func_version = read_u16(&next_instr[3].cache);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyTypeObject *tp = Py_TYPE(container);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, BINARY_SUBSCR);
|
|
|
|
assert(tp->tp_flags & Py_TPFLAGS_HEAPTYPE);
|
|
|
|
PyObject *cached = ((PyHeapTypeObject *)tp)->_spec_cache.getitem;
|
|
|
|
assert(PyFunction_Check(cached));
|
|
|
|
PyFunctionObject *getitem = (PyFunctionObject *)cached;
|
2022-11-18 09:06:07 +08:00
|
|
|
DEOPT_IF(getitem->func_version != func_version, BINARY_SUBSCR);
|
2022-11-03 12:31:26 +08: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 22:55:56 +08:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, getitem, 2);
|
2022-11-03 12:31:26 +08:00
|
|
|
STACK_SHRINK(2);
|
|
|
|
new_frame->localsplus[0] = container;
|
|
|
|
new_frame->localsplus[1] = sub;
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_SUBSCR);
|
2022-11-18 03:36:03 +08:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LIST_APPEND) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *v = PEEK(1);
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject *list = PEEK(2 + (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-09 05:31:27 +08:00
|
|
|
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
|
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PREDICT(JUMP_BACKWARD);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(SET_ADD) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *v = PEEK(1);
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject *set = PEEK(2 + (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-09 05:31:27 +08:00
|
|
|
int err = PySet_Add(set, v);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(v);
|
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-09 05:31:27 +08:00
|
|
|
if (err) goto pop_1_error;
|
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PREDICT(JUMP_BACKWARD);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_SUBSCR) {
|
|
|
|
PREDICTED(STORE_SUBSCR);
|
2022-11-09 00:22:56 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *container = PEEK(2);
|
|
|
|
PyObject *v = PEEK(3);
|
2022-12-14 19:12:53 +08:00
|
|
|
uint16_t counter = read_u16(&next_instr[0].cache);
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
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-09 05:31:27 +08:00
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
|
2022-11-10 02:50:09 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_StoreSubscr(container, sub, next_instr);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(STORE_SUBSCR, deferred);
|
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-09 05:31:27 +08:00
|
|
|
_PyStoreSubscrCache *cache = (_PyStoreSubscrCache *)next_instr;
|
2022-11-10 02:50:09 +08:00
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#else
|
|
|
|
(void)counter; // Unused.
|
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 12:31:26 +08:00
|
|
|
/* container[sub] = v */
|
2022-11-10 02:50:09 +08:00
|
|
|
int err = PyObject_SetItem(container, sub, v);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(v);
|
|
|
|
Py_DECREF(container);
|
|
|
|
Py_DECREF(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-09 05:31:27 +08:00
|
|
|
if (err) goto pop_3_error;
|
2022-11-09 00:22:56 +08:00
|
|
|
STACK_SHRINK(3);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_SUBSCR_LIST_INT) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *list = PEEK(2);
|
|
|
|
PyObject *value = PEEK(3);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
|
|
|
|
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
|
|
|
|
|
|
|
|
// Ensure nonnegative, zero-or-one-digit ints.
|
2022-12-22 19:30:18 +08:00
|
|
|
DEOPT_IF(!_PyLong_IsPositiveSingleDigit(sub), STORE_SUBSCR);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_ssize_t index = ((PyLongObject*)sub)->ob_digit[0];
|
|
|
|
// 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-09 05:31:27 +08:00
|
|
|
STACK_SHRINK(3);
|
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_SUBSCR_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-09 05:31:27 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *dict = PEEK(2);
|
|
|
|
PyObject *value = PEEK(3);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
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-09 05:31:27 +08:00
|
|
|
if (err) goto pop_3_error;
|
|
|
|
STACK_SHRINK(3);
|
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(DELETE_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-09 05:31:27 +08:00
|
|
|
PyObject *sub = PEEK(1);
|
|
|
|
PyObject *container = PEEK(2);
|
2022-11-03 12:31:26 +08: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-09 05:31:27 +08:00
|
|
|
int err = PyObject_DelItem(container, sub);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(container);
|
|
|
|
Py_DECREF(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-09 05:31:27 +08:00
|
|
|
if (err) goto pop_2_error;
|
|
|
|
STACK_SHRINK(2);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2023-01-06 00:05:51 +08:00
|
|
|
TARGET(CALL_INTRINSIC_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-09 05:31:27 +08:00
|
|
|
PyObject *value = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *res;
|
2023-01-06 00:05:51 +08:00
|
|
|
assert(oparg <= MAX_INTRINSIC_1);
|
|
|
|
res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(value);
|
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-09 05:31:27 +08:00
|
|
|
if (res == NULL) goto pop_1_error;
|
2023-01-06 00:05:51 +08:00
|
|
|
POKE(1, res);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(RAISE_VARARGS) {
|
|
|
|
PyObject *cause = NULL, *exc = NULL;
|
|
|
|
switch (oparg) {
|
|
|
|
case 2:
|
|
|
|
cause = POP(); /* cause */
|
|
|
|
/* fall through */
|
|
|
|
case 1:
|
|
|
|
exc = POP(); /* exc */
|
|
|
|
/* fall through */
|
|
|
|
case 0:
|
|
|
|
if (do_raise(tstate, exc, cause)) {
|
|
|
|
goto exception_unwind;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError,
|
|
|
|
"bad RAISE_VARARGS oparg");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2022-11-10 20:34:57 +08:00
|
|
|
TARGET(INTERPRETER_EXIT) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *retval = PEEK(1);
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(frame == &entry_frame);
|
|
|
|
assert(_PyFrame_IsIncomplete(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-09 05:31:27 +08:00
|
|
|
STACK_SHRINK(1); // Since we're not going to DISPATCH()
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(EMPTY());
|
|
|
|
/* Restore previous cframe and return. */
|
|
|
|
tstate->cframe = cframe.previous;
|
|
|
|
tstate->cframe->use_tracing = cframe.use_tracing;
|
|
|
|
assert(tstate->cframe->current_frame == frame->previous);
|
|
|
|
assert(!_PyErr_Occurred(tstate));
|
2022-11-10 20:34:57 +08:00
|
|
|
_Py_LeaveRecursiveCallTstate(tstate);
|
2022-11-03 12:31:26 +08:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2022-11-10 20:34:57 +08:00
|
|
|
TARGET(RETURN_VALUE) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *retval = PEEK(1);
|
|
|
|
STACK_SHRINK(1);
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(EMPTY());
|
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
|
|
|
TRACE_FUNCTION_EXIT();
|
|
|
|
DTRACE_FUNCTION_EXIT();
|
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
|
|
|
assert(frame != &entry_frame);
|
2022-12-06 22:01:38 +08:00
|
|
|
// GH-99729: We need to unlink the frame *before* clearing it:
|
|
|
|
_PyInterpreterFrame *dying = frame;
|
|
|
|
frame = cframe.current_frame = dying->previous;
|
|
|
|
_PyEvalFrameClearAndPop(tstate, dying);
|
2022-11-10 20:34:57 +08:00
|
|
|
_PyFrame_StackPush(frame, retval);
|
|
|
|
goto resume_frame;
|
|
|
|
}
|
|
|
|
|
2022-11-03 12:31:26 +08:00
|
|
|
TARGET(GET_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-09 05:31:27 +08:00
|
|
|
PyObject *obj = PEEK(1);
|
|
|
|
PyObject *iter;
|
2022-11-03 12:31:26 +08: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-09 05:31:27 +08:00
|
|
|
if (getter == NULL) {
|
2022-11-03 12:31:26 +08:00
|
|
|
_PyErr_Format(tstate, PyExc_TypeError,
|
|
|
|
"'async for' requires an object with "
|
|
|
|
"__aiter__ method, got %.100s",
|
|
|
|
type->tp_name);
|
|
|
|
Py_DECREF(obj);
|
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-09 05:31:27 +08:00
|
|
|
if (true) goto pop_1_error;
|
2022-11-03 12:31:26 +08: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-09 05:31:27 +08:00
|
|
|
iter = (*getter)(obj);
|
|
|
|
Py_DECREF(obj);
|
|
|
|
if (iter == NULL) goto pop_1_error;
|
|
|
|
|
2022-11-03 12:31:26 +08: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-09 05:31:27 +08:00
|
|
|
if (true) goto pop_1_error;
|
2022-11-03 12:31:26 +08: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-09 05:31:27 +08:00
|
|
|
POKE(1, iter);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(GET_ANEXT) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *aiter = PEEK(1);
|
|
|
|
PyObject *awaitable;
|
2022-11-03 12:31:26 +08: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-28 09:11:03 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, awaitable);
|
2022-11-03 12:31:26 +08:00
|
|
|
PREDICT(LOAD_CONST);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(GET_AWAITABLE) {
|
|
|
|
PREDICTED(GET_AWAITABLE);
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *iterable = PEEK(1);
|
|
|
|
PyObject *iter;
|
|
|
|
iter = _PyCoro_GetAwaitableIter(iterable);
|
2022-11-03 12:31:26 +08:00
|
|
|
|
|
|
|
if (iter == NULL) {
|
|
|
|
format_awaitable_error(tstate, Py_TYPE(iterable), oparg);
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_DECREF(iterable);
|
|
|
|
|
|
|
|
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-28 09:11:03 +08:00
|
|
|
if (iter == NULL) goto pop_1_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
|
2022-12-28 09:11:03 +08:00
|
|
|
POKE(1, iter);
|
2022-11-03 12:31:26 +08:00
|
|
|
PREDICT(LOAD_CONST);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(SEND) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(frame != &entry_frame);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(STACK_LEVEL() >= 2);
|
|
|
|
PyObject *v = POP();
|
|
|
|
PyObject *receiver = TOP();
|
|
|
|
PySendResult gen_status;
|
|
|
|
PyObject *retval;
|
|
|
|
if (tstate->c_tracefunc == NULL) {
|
|
|
|
gen_status = PyIter_Send(receiver, v, &retval);
|
|
|
|
} else {
|
|
|
|
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) {
|
|
|
|
if (tstate->c_tracefunc != NULL
|
|
|
|
&& _PyErr_ExceptionMatches(tstate, PyExc_StopIteration))
|
|
|
|
call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, tstate, frame);
|
|
|
|
if (_PyGen_FetchStopIterationValue(&retval) == 0) {
|
|
|
|
gen_status = PYGEN_RETURN;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gen_status = PYGEN_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
gen_status = PYGEN_NEXT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_DECREF(v);
|
|
|
|
if (gen_status == PYGEN_ERROR) {
|
|
|
|
assert(retval == NULL);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (gen_status == PYGEN_RETURN) {
|
|
|
|
assert(retval != NULL);
|
|
|
|
Py_DECREF(receiver);
|
|
|
|
SET_TOP(retval);
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else {
|
|
|
|
assert(gen_status == PYGEN_NEXT);
|
|
|
|
assert(retval != NULL);
|
|
|
|
PUSH(retval);
|
|
|
|
}
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(YIELD_VALUE) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *retval = PEEK(1);
|
2022-11-03 12:31:26 +08: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.
|
|
|
|
assert(oparg == STACK_LEVEL());
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(frame != &entry_frame);
|
2022-11-07 22:49:51 +08:00
|
|
|
PyGenObject *gen = _PyFrame_GetGenerator(frame);
|
|
|
|
gen->gi_frame_state = FRAME_SUSPENDED;
|
2022-12-28 09:11:03 +08:00
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer - 1);
|
2022-11-03 12:31:26 +08:00
|
|
|
TRACE_FUNCTION_EXIT();
|
|
|
|
DTRACE_FUNCTION_EXIT();
|
2022-11-07 22:49:51 +08:00
|
|
|
tstate->exc_info = gen->gi_exc_state.previous_item;
|
|
|
|
gen->gi_exc_state.previous_item = NULL;
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_LeaveRecursiveCallPy(tstate);
|
2022-11-10 20:34:57 +08:00
|
|
|
_PyInterpreterFrame *gen_frame = frame;
|
|
|
|
frame = cframe.current_frame = frame->previous;
|
|
|
|
gen_frame->previous = NULL;
|
|
|
|
frame->prev_instr -= frame->yield_offset;
|
|
|
|
_PyFrame_StackPush(frame, retval);
|
|
|
|
goto resume_frame;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(POP_EXCEPT) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *exc_value = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
_PyErr_StackItem *exc_info = tstate->exc_info;
|
2022-12-28 09:11:03 +08:00
|
|
|
Py_XSETREF(exc_info->exc_value, exc_value);
|
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(RERAISE) {
|
|
|
|
if (oparg) {
|
|
|
|
PyObject *lasti = PEEK(oparg + 1);
|
|
|
|
if (PyLong_Check(lasti)) {
|
2022-11-10 20:34:57 +08:00
|
|
|
frame->prev_instr = _PyCode_CODE(frame->f_code) + PyLong_AsLong(lasti);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(!_PyErr_Occurred(tstate));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
assert(PyLong_Check(lasti));
|
|
|
|
_PyErr_SetString(tstate, PyExc_SystemError, "lasti is not an int");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PyObject *val = POP();
|
|
|
|
assert(val && PyExceptionInstance_Check(val));
|
|
|
|
PyObject *exc = Py_NewRef(PyExceptionInstance_Class(val));
|
|
|
|
PyObject *tb = PyException_GetTraceback(val);
|
|
|
|
_PyErr_Restore(tstate, exc, val, tb);
|
|
|
|
goto exception_unwind;
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(PREP_RERAISE_STAR) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *excs = PEEK(1);
|
|
|
|
PyObject *orig = PEEK(2);
|
|
|
|
PyObject *val;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(PyList_Check(excs));
|
|
|
|
|
2022-12-28 09:11:03 +08:00
|
|
|
val = _PyExc_PrepReraiseStar(orig, excs);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(orig);
|
2022-12-28 09:11:03 +08:00
|
|
|
Py_DECREF(excs);
|
2022-11-03 12:31:26 +08:00
|
|
|
|
2022-12-28 09:11:03 +08:00
|
|
|
if (val == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, val);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(END_ASYNC_FOR) {
|
|
|
|
PyObject *val = POP();
|
|
|
|
assert(val && PyExceptionInstance_Check(val));
|
|
|
|
if (PyErr_GivenExceptionMatches(val, PyExc_StopAsyncIteration)) {
|
|
|
|
Py_DECREF(val);
|
|
|
|
Py_DECREF(POP());
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyObject *exc = Py_NewRef(PyExceptionInstance_Class(val));
|
|
|
|
PyObject *tb = PyException_GetTraceback(val);
|
|
|
|
_PyErr_Restore(tstate, exc, val, tb);
|
|
|
|
goto exception_unwind;
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CLEANUP_THROW) {
|
|
|
|
assert(throwflag);
|
|
|
|
PyObject *exc_value = TOP();
|
|
|
|
assert(exc_value && PyExceptionInstance_Check(exc_value));
|
|
|
|
if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) {
|
|
|
|
PyObject *value = ((PyStopIterationObject *)exc_value)->value;
|
|
|
|
Py_INCREF(value);
|
|
|
|
Py_DECREF(POP()); // The StopIteration.
|
|
|
|
Py_DECREF(POP()); // The last sent value.
|
|
|
|
Py_DECREF(POP()); // The delegated sub-iterator.
|
|
|
|
PUSH(value);
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else {
|
|
|
|
PyObject *exc_type = Py_NewRef(Py_TYPE(exc_value));
|
|
|
|
PyObject *exc_traceback = PyException_GetTraceback(exc_value);
|
|
|
|
_PyErr_Restore(tstate, exc_type, Py_NewRef(exc_value), exc_traceback);
|
|
|
|
goto exception_unwind;
|
|
|
|
}
|
|
|
|
DISPATCH();
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ASSERTION_ERROR) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *value;
|
|
|
|
value = Py_NewRef(PyExc_AssertionError);
|
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, value);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_BUILD_CLASS) {
|
|
|
|
PyObject *bc;
|
|
|
|
if (PyDict_CheckExact(BUILTINS())) {
|
|
|
|
bc = _PyDict_GetItemWithError(BUILTINS(),
|
|
|
|
&_Py_ID(__build_class__));
|
|
|
|
if (bc == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
_PyErr_SetString(tstate, PyExc_NameError,
|
|
|
|
"__build_class__ not found");
|
|
|
|
}
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
Py_INCREF(bc);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
bc = PyObject_GetItem(BUILTINS(), &_Py_ID(__build_class__));
|
|
|
|
if (bc == NULL) {
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError))
|
|
|
|
_PyErr_SetString(tstate, PyExc_NameError,
|
|
|
|
"__build_class__ not found");
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
}
|
2022-12-28 09:11:03 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, bc);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_NAME) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *v = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *name = GETITEM(names, oparg);
|
|
|
|
PyObject *ns = LOCALS();
|
|
|
|
int err;
|
|
|
|
if (ns == NULL) {
|
|
|
|
_PyErr_Format(tstate, PyExc_SystemError,
|
|
|
|
"no locals found when storing %R", name);
|
|
|
|
Py_DECREF(v);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto pop_1_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
if (PyDict_CheckExact(ns))
|
|
|
|
err = PyDict_SetItem(ns, name, v);
|
|
|
|
else
|
|
|
|
err = PyObject_SetItem(ns, name, v);
|
|
|
|
Py_DECREF(v);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (err) goto pop_1_error;
|
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(DELETE_NAME) {
|
|
|
|
PyObject *name = GETITEM(names, oparg);
|
|
|
|
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-11 02:50:57 +08:00
|
|
|
// Can't use ERROR_IF here.
|
2022-11-03 12:31:26 +08:00
|
|
|
if (err != 0) {
|
|
|
|
format_exc_check_arg(tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG,
|
|
|
|
name);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(UNPACK_SEQUENCE) {
|
|
|
|
PREDICTED(UNPACK_SEQUENCE);
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-10 02:50:09 +08:00
|
|
|
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *seq = TOP();
|
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_UnpackSequence(seq, next_instr, oparg);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(UNPACK_SEQUENCE, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *seq = POP();
|
|
|
|
PyObject **top = stack_pointer + oparg;
|
|
|
|
if (!unpack_iterable(tstate, seq, oparg, -1, top)) {
|
|
|
|
Py_DECREF(seq);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
STACK_GROW(oparg);
|
|
|
|
Py_DECREF(seq);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
|
|
|
|
PyObject *seq = TOP();
|
|
|
|
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
|
|
|
|
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
|
|
|
|
STAT_INC(UNPACK_SEQUENCE, hit);
|
|
|
|
SET_TOP(Py_NewRef(PyTuple_GET_ITEM(seq, 1)));
|
|
|
|
PUSH(Py_NewRef(PyTuple_GET_ITEM(seq, 0)));
|
|
|
|
Py_DECREF(seq);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(UNPACK_SEQUENCE_TUPLE) {
|
|
|
|
PyObject *seq = TOP();
|
|
|
|
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
|
|
|
|
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
|
|
|
|
STAT_INC(UNPACK_SEQUENCE, hit);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
PyObject **items = _PyTuple_ITEMS(seq);
|
|
|
|
while (oparg--) {
|
|
|
|
PUSH(Py_NewRef(items[oparg]));
|
|
|
|
}
|
|
|
|
Py_DECREF(seq);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(UNPACK_SEQUENCE_LIST) {
|
|
|
|
PyObject *seq = TOP();
|
|
|
|
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
|
|
|
|
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
|
|
|
|
STAT_INC(UNPACK_SEQUENCE, hit);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
PyObject **items = _PyList_ITEMS(seq);
|
|
|
|
while (oparg--) {
|
|
|
|
PUSH(Py_NewRef(items[oparg]));
|
|
|
|
}
|
|
|
|
Py_DECREF(seq);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(UNPACK_EX) {
|
|
|
|
int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
|
|
|
|
PyObject *seq = POP();
|
|
|
|
PyObject **top = stack_pointer + totalargs;
|
|
|
|
if (!unpack_iterable(tstate, seq, oparg & 0xFF, oparg >> 8, top)) {
|
|
|
|
Py_DECREF(seq);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
STACK_GROW(totalargs);
|
|
|
|
Py_DECREF(seq);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_ATTR) {
|
|
|
|
PREDICTED(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-09 05:31:27 +08:00
|
|
|
PyObject *owner = PEEK(1);
|
|
|
|
PyObject *v = PEEK(2);
|
2022-12-14 19:12:53 +08:00
|
|
|
uint16_t counter = read_u16(&next_instr[0].cache);
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
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-09 05:31:27 +08:00
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
|
2022-11-10 02:50:09 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *name = GETITEM(names, oparg);
|
|
|
|
next_instr--;
|
2022-11-18 07:09:18 +08:00
|
|
|
_Py_Specialize_StoreAttr(owner, next_instr, name);
|
2022-11-10 02:50:09 +08:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(STORE_ATTR, deferred);
|
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-09 05:31:27 +08:00
|
|
|
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
|
2022-11-10 02:50:09 +08:00
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#else
|
|
|
|
(void)counter; // Unused.
|
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *name = GETITEM(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-09 05:31:27 +08:00
|
|
|
int err = PyObject_SetAttr(owner, name, v);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(v);
|
|
|
|
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-09 05:31:27 +08:00
|
|
|
if (err) goto pop_2_error;
|
|
|
|
STACK_SHRINK(2);
|
|
|
|
JUMPBY(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(DELETE_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-09 05:31:27 +08:00
|
|
|
PyObject *owner = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *name = GETITEM(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-09 05:31:27 +08:00
|
|
|
int err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
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-09 05:31:27 +08:00
|
|
|
if (err) goto pop_1_error;
|
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_GLOBAL) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *v = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *name = GETITEM(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-09 05:31:27 +08:00
|
|
|
int err = PyDict_SetItem(GLOBALS(), name, v);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(v);
|
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-09 05:31:27 +08:00
|
|
|
if (err) goto pop_1_error;
|
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(DELETE_GLOBAL) {
|
|
|
|
PyObject *name = GETITEM(names, oparg);
|
|
|
|
int err;
|
|
|
|
err = PyDict_DelItem(GLOBALS(), name);
|
2022-11-11 02:50:57 +08:00
|
|
|
// Can't use ERROR_IF here.
|
2022-11-03 12:31:26 +08:00
|
|
|
if (err != 0) {
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
|
|
|
|
format_exc_check_arg(tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_NAME) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *v;
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *name = GETITEM(names, oparg);
|
|
|
|
PyObject *locals = LOCALS();
|
|
|
|
if (locals == NULL) {
|
|
|
|
_PyErr_Format(tstate, PyExc_SystemError,
|
|
|
|
"no locals when loading %R", name);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (PyDict_CheckExact(locals)) {
|
|
|
|
v = PyDict_GetItemWithError(locals, name);
|
|
|
|
if (v != NULL) {
|
|
|
|
Py_INCREF(v);
|
|
|
|
}
|
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
v = PyObject_GetItem(locals, name);
|
|
|
|
if (v == NULL) {
|
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_KeyError))
|
|
|
|
goto error;
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (v == NULL) {
|
|
|
|
v = PyDict_GetItemWithError(GLOBALS(), name);
|
|
|
|
if (v != NULL) {
|
|
|
|
Py_INCREF(v);
|
|
|
|
}
|
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (PyDict_CheckExact(BUILTINS())) {
|
|
|
|
v = PyDict_GetItemWithError(BUILTINS(), name);
|
|
|
|
if (v == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
format_exc_check_arg(
|
|
|
|
tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_INCREF(v);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
v = PyObject_GetItem(BUILTINS(), name);
|
|
|
|
if (v == NULL) {
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
|
|
|
|
format_exc_check_arg(
|
|
|
|
tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-12-28 09:11:03 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, v);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_GLOBAL) {
|
|
|
|
PREDICTED(LOAD_GLOBAL);
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-10 02:50:09 +08:00
|
|
|
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *name = GETITEM(names, oparg>>1);
|
|
|
|
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-20 02:14:55 +08:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 12:31:26 +08:00
|
|
|
int push_null = oparg & 1;
|
|
|
|
PEEK(0) = NULL;
|
|
|
|
PyObject *name = GETITEM(names, oparg>>1);
|
|
|
|
PyObject *v;
|
|
|
|
if (PyDict_CheckExact(GLOBALS())
|
|
|
|
&& PyDict_CheckExact(BUILTINS()))
|
|
|
|
{
|
|
|
|
v = _PyDict_LoadGlobal((PyDictObject *)GLOBALS(),
|
|
|
|
(PyDictObject *)BUILTINS(),
|
|
|
|
name);
|
|
|
|
if (v == NULL) {
|
|
|
|
if (!_PyErr_Occurred(tstate)) {
|
|
|
|
/* _PyDict_LoadGlobal() returns NULL without raising
|
|
|
|
* an exception if the key doesn't exist */
|
|
|
|
format_exc_check_arg(tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_INCREF(v);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Slow-path if globals or builtins is not a dict */
|
|
|
|
|
|
|
|
/* namespace 1: globals */
|
|
|
|
v = PyObject_GetItem(GLOBALS(), name);
|
|
|
|
if (v == NULL) {
|
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
|
|
|
|
/* namespace 2: builtins */
|
|
|
|
v = PyObject_GetItem(BUILTINS(), name);
|
|
|
|
if (v == NULL) {
|
|
|
|
if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
|
|
|
|
format_exc_check_arg(
|
|
|
|
tstate, PyExc_NameError,
|
|
|
|
NAME_ERROR_MSG, name);
|
|
|
|
}
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Skip over inline cache */
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_GLOBAL);
|
|
|
|
STACK_GROW(push_null);
|
|
|
|
PUSH(v);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_GLOBAL_MODULE) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
|
|
|
|
PyDictObject *dict = (PyDictObject *)GLOBALS();
|
|
|
|
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
|
|
|
|
uint32_t version = read_u32(cache->module_keys_version);
|
|
|
|
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
|
|
|
|
assert(DK_IS_UNICODE(dict->ma_keys));
|
|
|
|
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(dict->ma_keys);
|
|
|
|
PyObject *res = entries[cache->index].me_value;
|
|
|
|
DEOPT_IF(res == NULL, LOAD_GLOBAL);
|
|
|
|
int push_null = oparg & 1;
|
|
|
|
PEEK(0) = NULL;
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_GLOBAL);
|
|
|
|
STAT_INC(LOAD_GLOBAL, hit);
|
|
|
|
STACK_GROW(push_null+1);
|
2022-11-10 18:25:33 +08:00
|
|
|
SET_TOP(Py_NewRef(res));
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_GLOBAL_BUILTIN) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
|
|
|
|
DEOPT_IF(!PyDict_CheckExact(BUILTINS()), LOAD_GLOBAL);
|
|
|
|
PyDictObject *mdict = (PyDictObject *)GLOBALS();
|
|
|
|
PyDictObject *bdict = (PyDictObject *)BUILTINS();
|
|
|
|
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
|
|
|
|
uint32_t mod_version = read_u32(cache->module_keys_version);
|
|
|
|
uint16_t bltn_version = cache->builtin_keys_version;
|
|
|
|
DEOPT_IF(mdict->ma_keys->dk_version != mod_version, LOAD_GLOBAL);
|
|
|
|
DEOPT_IF(bdict->ma_keys->dk_version != bltn_version, LOAD_GLOBAL);
|
|
|
|
assert(DK_IS_UNICODE(bdict->ma_keys));
|
|
|
|
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(bdict->ma_keys);
|
|
|
|
PyObject *res = entries[cache->index].me_value;
|
|
|
|
DEOPT_IF(res == NULL, LOAD_GLOBAL);
|
|
|
|
int push_null = oparg & 1;
|
|
|
|
PEEK(0) = NULL;
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_GLOBAL);
|
|
|
|
STAT_INC(LOAD_GLOBAL, hit);
|
|
|
|
STACK_GROW(push_null+1);
|
2022-11-10 18:25:33 +08:00
|
|
|
SET_TOP(Py_NewRef(res));
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(DELETE_FAST) {
|
|
|
|
PyObject *v = GETLOCAL(oparg);
|
2022-11-11 02:50:57 +08:00
|
|
|
if (v == NULL) goto unbound_local_error;
|
|
|
|
SETLOCAL(oparg, NULL);
|
|
|
|
DISPATCH();
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(MAKE_CELL) {
|
|
|
|
// "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);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(DELETE_DEREF) {
|
|
|
|
PyObject *cell = GETLOCAL(oparg);
|
|
|
|
PyObject *oldobj = PyCell_GET(cell);
|
2022-11-11 02:50:57 +08:00
|
|
|
// Can't use ERROR_IF here.
|
|
|
|
// Fortunately we don't need its superpower.
|
|
|
|
if (oldobj == NULL) {
|
|
|
|
format_exc_unbound(tstate, frame->f_code, oparg);
|
|
|
|
goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
PyCell_SET(cell, NULL);
|
|
|
|
Py_DECREF(oldobj);
|
|
|
|
DISPATCH();
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_CLASSDEREF) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *value;
|
|
|
|
PyObject *name, *locals = LOCALS();
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(locals);
|
|
|
|
assert(oparg >= 0 && oparg < frame->f_code->co_nlocalsplus);
|
|
|
|
name = PyTuple_GET_ITEM(frame->f_code->co_localsplusnames, oparg);
|
|
|
|
if (PyDict_CheckExact(locals)) {
|
|
|
|
value = PyDict_GetItemWithError(locals, name);
|
|
|
|
if (value != NULL) {
|
|
|
|
Py_INCREF(value);
|
|
|
|
}
|
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
value = PyObject_GetItem(locals, name);
|
|
|
|
if (value == NULL) {
|
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!value) {
|
|
|
|
PyObject *cell = GETLOCAL(oparg);
|
|
|
|
value = PyCell_GET(cell);
|
|
|
|
if (value == NULL) {
|
|
|
|
format_exc_unbound(tstate, frame->f_code, oparg);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_INCREF(value);
|
|
|
|
}
|
2022-12-28 09:11:03 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, value);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_DEREF) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *value;
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *cell = GETLOCAL(oparg);
|
2022-12-28 09:11:03 +08:00
|
|
|
value = PyCell_GET(cell);
|
2022-11-03 12:31:26 +08:00
|
|
|
if (value == NULL) {
|
|
|
|
format_exc_unbound(tstate, frame->f_code, oparg);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-12-28 09:11:03 +08:00
|
|
|
Py_INCREF(value);
|
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, value);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_DEREF) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *v = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *cell = GETLOCAL(oparg);
|
|
|
|
PyObject *oldobj = PyCell_GET(cell);
|
|
|
|
PyCell_SET(cell, v);
|
|
|
|
Py_XDECREF(oldobj);
|
2022-12-28 09:11:03 +08:00
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(COPY_FREE_VARS) {
|
|
|
|
/* Copy closure variables to free variables */
|
|
|
|
PyCodeObject *co = frame->f_code;
|
|
|
|
assert(PyFunction_Check(frame->f_funcobj));
|
|
|
|
PyObject *closure = ((PyFunctionObject *)frame->f_funcobj)->func_closure;
|
|
|
|
assert(oparg == co->co_nfreevars);
|
2023-01-04 23:41:39 +08:00
|
|
|
int offset = co->co_nlocalsplus - oparg;
|
2022-11-03 12:31:26 +08:00
|
|
|
for (int i = 0; i < oparg; ++i) {
|
|
|
|
PyObject *o = PyTuple_GET_ITEM(closure, i);
|
2022-11-10 18:25:33 +08:00
|
|
|
frame->localsplus[offset + i] = Py_NewRef(o);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BUILD_STRING) {
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject **pieces = &PEEK(oparg);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *str;
|
2023-01-18 07:59:19 +08:00
|
|
|
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
|
|
|
|
for (int i = 0; i < oparg; i++) {
|
|
|
|
Py_DECREF(pieces[i]);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2023-01-18 07:59:19 +08:00
|
|
|
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
|
|
|
|
STACK_SHRINK(oparg);
|
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, str);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BUILD_TUPLE) {
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject **values = &PEEK(oparg);
|
|
|
|
PyObject *tup;
|
|
|
|
tup = _PyTuple_FromArraySteal(values, oparg);
|
|
|
|
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
|
2022-11-03 12:31:26 +08:00
|
|
|
STACK_SHRINK(oparg);
|
2023-01-18 07:59:19 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, tup);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BUILD_LIST) {
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject **values = &PEEK(oparg);
|
|
|
|
PyObject *list;
|
|
|
|
list = _PyList_FromArraySteal(values, oparg);
|
|
|
|
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
|
2023-01-04 02:49:49 +08:00
|
|
|
STACK_SHRINK(oparg);
|
2023-01-18 07:59:19 +08:00
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, list);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LIST_EXTEND) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *iterable = PEEK(1);
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject *list = PEEK(2 + (oparg-1));
|
2022-11-03 12:31:26 +08: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);
|
|
|
|
}
|
|
|
|
Py_DECREF(iterable);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto pop_1_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
Py_DECREF(none_val);
|
|
|
|
Py_DECREF(iterable);
|
2022-12-28 09:11:03 +08:00
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(SET_UPDATE) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *iterable = PEEK(1);
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject *set = PEEK(2 + (oparg-1));
|
2022-11-03 12:31:26 +08:00
|
|
|
int err = _PySet_Update(set, iterable);
|
|
|
|
Py_DECREF(iterable);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (err < 0) goto pop_1_error;
|
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BUILD_SET) {
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject **values = &PEEK(oparg);
|
|
|
|
PyObject *set;
|
|
|
|
set = PySet_New(NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
int err = 0;
|
2023-01-18 07:59:19 +08:00
|
|
|
for (int i = 0; i < oparg; i++) {
|
|
|
|
PyObject *item = values[i];
|
2022-11-03 12:31:26 +08:00
|
|
|
if (err == 0)
|
|
|
|
err = PySet_Add(set, item);
|
|
|
|
Py_DECREF(item);
|
|
|
|
}
|
|
|
|
if (err != 0) {
|
|
|
|
Py_DECREF(set);
|
2023-01-18 07:59:19 +08:00
|
|
|
if (true) { STACK_SHRINK(oparg); goto error; }
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2023-01-18 07:59:19 +08:00
|
|
|
STACK_SHRINK(oparg);
|
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, set);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BUILD_MAP) {
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject **values = &PEEK(oparg*2);
|
|
|
|
PyObject *map;
|
|
|
|
map = _PyDict_FromItems(
|
|
|
|
values, 2,
|
|
|
|
values+1, 2,
|
2022-11-03 12:31:26 +08:00
|
|
|
oparg);
|
|
|
|
if (map == NULL)
|
|
|
|
goto error;
|
|
|
|
|
2023-01-18 07:59:19 +08:00
|
|
|
for (int i = 0; i < oparg; i++) {
|
|
|
|
Py_DECREF(values[i*2]);
|
|
|
|
Py_DECREF(values[i*2+1]);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2023-01-18 07:59:19 +08:00
|
|
|
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
|
|
|
|
STACK_SHRINK(oparg*2);
|
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, map);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(SETUP_ANNOTATIONS) {
|
|
|
|
int err;
|
|
|
|
PyObject *ann_dict;
|
|
|
|
if (LOCALS() == NULL) {
|
|
|
|
_PyErr_Format(tstate, PyExc_SystemError,
|
|
|
|
"no locals found when setting up annotations");
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
/* check if __annotations__ in locals()... */
|
|
|
|
if (PyDict_CheckExact(LOCALS())) {
|
|
|
|
ann_dict = _PyDict_GetItemWithError(LOCALS(),
|
|
|
|
&_Py_ID(__annotations__));
|
|
|
|
if (ann_dict == NULL) {
|
2022-12-28 09:11:03 +08:00
|
|
|
if (_PyErr_Occurred(tstate)) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
/* ...if not, create a new one */
|
|
|
|
ann_dict = PyDict_New();
|
2022-12-28 09:11:03 +08:00
|
|
|
if (ann_dict == NULL) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
err = PyDict_SetItem(LOCALS(), &_Py_ID(__annotations__),
|
|
|
|
ann_dict);
|
|
|
|
Py_DECREF(ann_dict);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (err) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* do the same if locals() is not a dict */
|
|
|
|
ann_dict = PyObject_GetItem(LOCALS(), &_Py_ID(__annotations__));
|
|
|
|
if (ann_dict == NULL) {
|
2022-12-28 09:11:03 +08:00
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
_PyErr_Clear(tstate);
|
|
|
|
ann_dict = PyDict_New();
|
2022-12-28 09:11:03 +08:00
|
|
|
if (ann_dict == NULL) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
err = PyObject_SetItem(LOCALS(), &_Py_ID(__annotations__),
|
|
|
|
ann_dict);
|
|
|
|
Py_DECREF(ann_dict);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (err) goto error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(ann_dict);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BUILD_CONST_KEY_MAP) {
|
2023-01-18 07:59:19 +08:00
|
|
|
PyObject *keys = PEEK(1);
|
|
|
|
PyObject **values = &PEEK(1 + oparg);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *map;
|
|
|
|
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-18 07:59:19 +08:00
|
|
|
goto error; // Pop the keys and values.
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
map = _PyDict_FromItems(
|
|
|
|
&PyTuple_GET_ITEM(keys, 0), 1,
|
2023-01-18 07:59:19 +08:00
|
|
|
values, 1, oparg);
|
|
|
|
Py_DECREF(keys);
|
|
|
|
for (int i = 0; i < oparg; i++) {
|
|
|
|
Py_DECREF(values[i]);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2023-01-18 07:59:19 +08:00
|
|
|
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
|
|
|
|
STACK_SHRINK(oparg);
|
|
|
|
POKE(1, map);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(DICT_UPDATE) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *update = PEEK(1);
|
|
|
|
PyObject *dict = PEEK(oparg + 1); // update is still on the stack
|
2022-11-03 12:31:26 +08: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);
|
|
|
|
}
|
|
|
|
Py_DECREF(update);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto pop_1_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
Py_DECREF(update);
|
2022-12-28 09:11:03 +08:00
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(DICT_MERGE) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *update = PEEK(1);
|
|
|
|
PyObject *dict = PEEK(oparg + 1); // update is still on the stack
|
2022-11-03 12:31:26 +08:00
|
|
|
|
|
|
|
if (_PyDict_MergeEx(dict, update, 2) < 0) {
|
2022-12-28 09:11:03 +08:00
|
|
|
format_kwargs_error(tstate, PEEK(3 + oparg), update);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(update);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto pop_1_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
Py_DECREF(update);
|
2022-12-28 09:11:03 +08:00
|
|
|
STACK_SHRINK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PREDICT(CALL_FUNCTION_EX);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(MAP_ADD) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *value = PEEK(1);
|
|
|
|
PyObject *key = PEEK(2);
|
|
|
|
PyObject *dict = PEEK(oparg + 2); // key, value are still on the stack
|
|
|
|
assert(PyDict_CheckExact(dict));
|
|
|
|
/* dict[key] = value */
|
|
|
|
// Do not DECREF INPUTS because the function steals the references
|
|
|
|
if (_PyDict_SetItem_Take2((PyDictObject *)dict, key, value) != 0) goto pop_2_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
STACK_SHRINK(2);
|
|
|
|
PREDICT(JUMP_BACKWARD);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR) {
|
|
|
|
PREDICTED(LOAD_ATTR);
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-10 02:50:09 +08:00
|
|
|
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *owner = TOP();
|
|
|
|
PyObject *name = GETITEM(names, oparg>>1);
|
|
|
|
next_instr--;
|
2022-11-18 07:09:18 +08:00
|
|
|
_Py_Specialize_LoadAttr(owner, next_instr, name);
|
2022-11-10 02:50:09 +08:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(LOAD_ATTR, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *name = GETITEM(names, oparg >> 1);
|
|
|
|
PyObject *owner = TOP();
|
|
|
|
if (oparg & 1) {
|
|
|
|
/* Designed to work in tandem with CALL. */
|
|
|
|
PyObject* meth = NULL;
|
|
|
|
|
|
|
|
int meth_found = _PyObject_GetMethod(owner, name, &meth);
|
|
|
|
|
|
|
|
if (meth == NULL) {
|
|
|
|
/* Most likely attribute wasn't found. */
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (meth_found) {
|
|
|
|
/* We can bypass temporary bound method object.
|
|
|
|
meth is unbound method and obj is self.
|
|
|
|
|
|
|
|
meth | self | arg1 | ... | argN
|
|
|
|
*/
|
|
|
|
SET_TOP(meth);
|
|
|
|
PUSH(owner); // self
|
|
|
|
}
|
|
|
|
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
|
|
|
|
*/
|
|
|
|
SET_TOP(NULL);
|
|
|
|
Py_DECREF(owner);
|
|
|
|
PUSH(meth);
|
|
|
|
}
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else {
|
|
|
|
PyObject *res = PyObject_GetAttr(owner, name);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(owner);
|
|
|
|
SET_TOP(res);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_INSTANCE_VALUE) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *owner = TOP();
|
|
|
|
PyObject *res;
|
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
|
|
|
|
uint32_t type_version = read_u32(cache->version);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(tp->tp_dictoffset < 0);
|
|
|
|
assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
|
|
|
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
|
|
|
|
DEOPT_IF(!_PyDictOrValues_IsValues(dorv), LOAD_ATTR);
|
|
|
|
res = _PyDictOrValues_GetValues(dorv)->values[cache->index];
|
|
|
|
DEOPT_IF(res == NULL, LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
Py_INCREF(res);
|
|
|
|
SET_TOP(NULL);
|
|
|
|
STACK_GROW((oparg & 1));
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(owner);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_MODULE) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *owner = TOP();
|
|
|
|
PyObject *res;
|
|
|
|
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
|
|
|
|
DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
|
|
|
|
PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
|
|
|
|
assert(dict != NULL);
|
|
|
|
DEOPT_IF(dict->ma_keys->dk_version != read_u32(cache->version),
|
|
|
|
LOAD_ATTR);
|
|
|
|
assert(dict->ma_keys->dk_kind == DICT_KEYS_UNICODE);
|
|
|
|
assert(cache->index < dict->ma_keys->dk_nentries);
|
|
|
|
PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + cache->index;
|
|
|
|
res = ep->me_value;
|
|
|
|
DEOPT_IF(res == NULL, LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
Py_INCREF(res);
|
|
|
|
SET_TOP(NULL);
|
|
|
|
STACK_GROW((oparg & 1));
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(owner);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_WITH_HINT) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *owner = TOP();
|
|
|
|
PyObject *res;
|
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
|
|
|
|
uint32_t type_version = read_u32(cache->version);
|
|
|
|
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));
|
|
|
|
PyObject *name = GETITEM(names, oparg>>1);
|
|
|
|
uint16_t hint = cache->index;
|
|
|
|
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);
|
|
|
|
res = ep->me_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
|
|
|
|
DEOPT_IF(ep->me_key != name, LOAD_ATTR);
|
|
|
|
res = ep->me_value;
|
|
|
|
}
|
|
|
|
DEOPT_IF(res == NULL, LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
Py_INCREF(res);
|
|
|
|
SET_TOP(NULL);
|
|
|
|
STACK_GROW((oparg & 1));
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(owner);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_SLOT) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *owner = TOP();
|
|
|
|
PyObject *res;
|
|
|
|
PyTypeObject *tp = Py_TYPE(owner);
|
|
|
|
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
|
|
|
|
uint32_t type_version = read_u32(cache->version);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
char *addr = (char *)owner + cache->index;
|
|
|
|
res = *(PyObject **)addr;
|
|
|
|
DEOPT_IF(res == NULL, LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
Py_INCREF(res);
|
|
|
|
SET_TOP(NULL);
|
|
|
|
STACK_GROW((oparg & 1));
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(owner);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_CLASS) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
_PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
|
|
|
|
|
|
|
|
PyObject *cls = TOP();
|
|
|
|
DEOPT_IF(!PyType_Check(cls), LOAD_ATTR);
|
|
|
|
uint32_t type_version = read_u32(cache->type_version);
|
|
|
|
DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version,
|
|
|
|
LOAD_ATTR);
|
|
|
|
assert(type_version != 0);
|
|
|
|
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
PyObject *res = read_obj(cache->descr);
|
|
|
|
assert(res != NULL);
|
|
|
|
Py_INCREF(res);
|
|
|
|
SET_TOP(NULL);
|
|
|
|
STACK_GROW((oparg & 1));
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(cls);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_PROPERTY) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
|
|
|
|
_PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
|
|
|
|
|
|
|
|
PyObject *owner = TOP();
|
|
|
|
PyTypeObject *cls = Py_TYPE(owner);
|
|
|
|
uint32_t type_version = read_u32(cache->type_version);
|
|
|
|
DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(type_version != 0);
|
|
|
|
PyObject *fget = read_obj(cache->descr);
|
|
|
|
assert(Py_IS_TYPE(fget, &PyFunction_Type));
|
|
|
|
PyFunctionObject *f = (PyFunctionObject *)fget;
|
|
|
|
uint32_t func_version = read_u32(cache->keys_version);
|
|
|
|
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 22:55:56 +08:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, f, 1);
|
2022-11-03 12:31:26 +08:00
|
|
|
SET_TOP(NULL);
|
|
|
|
int shrink_stack = !(oparg & 1);
|
|
|
|
STACK_SHRINK(shrink_stack);
|
|
|
|
new_frame->localsplus[0] = owner;
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
2022-11-18 03:36:03 +08:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
|
|
|
|
_PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
|
|
|
|
PyObject *owner = TOP();
|
|
|
|
PyTypeObject *cls = Py_TYPE(owner);
|
|
|
|
uint32_t type_version = read_u32(cache->type_version);
|
|
|
|
DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(type_version != 0);
|
|
|
|
PyObject *getattribute = read_obj(cache->descr);
|
|
|
|
assert(Py_IS_TYPE(getattribute, &PyFunction_Type));
|
|
|
|
PyFunctionObject *f = (PyFunctionObject *)getattribute;
|
|
|
|
uint32_t func_version = read_u32(cache->keys_version);
|
|
|
|
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-10 02:50:09 +08:00
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), LOAD_ATTR);
|
2022-11-03 12:31:26 +08:00
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
|
|
|
|
PyObject *name = GETITEM(names, oparg >> 1);
|
|
|
|
Py_INCREF(f);
|
2023-01-06 22:55:56 +08:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, f, 2);
|
2022-11-03 12:31:26 +08:00
|
|
|
SET_TOP(NULL);
|
|
|
|
int shrink_stack = !(oparg & 1);
|
|
|
|
STACK_SHRINK(shrink_stack);
|
|
|
|
new_frame->localsplus[0] = owner;
|
2022-11-10 18:25:33 +08:00
|
|
|
new_frame->localsplus[1] = Py_NewRef(name);
|
2022-11-03 12:31:26 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
2022-11-18 03:36:03 +08:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_ATTR_INSTANCE_VALUE) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *owner = PEEK(1);
|
|
|
|
PyObject *value = PEEK(2);
|
2022-12-14 19:12:53 +08:00
|
|
|
uint32_t type_version = read_u32(&next_instr[1].cache);
|
|
|
|
uint16_t index = read_u16(&next_instr[3].cache);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
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-09 05:31:27 +08:00
|
|
|
STACK_SHRINK(2);
|
|
|
|
JUMPBY(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_ATTR_WITH_HINT) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *owner = PEEK(1);
|
|
|
|
PyObject *value = PEEK(2);
|
2022-12-14 19:12:53 +08:00
|
|
|
uint32_t type_version = read_u32(&next_instr[1].cache);
|
|
|
|
uint16_t hint = read_u16(&next_instr[3].cache);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
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-10 02:50:09 +08:00
|
|
|
DEOPT_IF(_PyDictOrValues_IsValues(dorv), STORE_ATTR);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyDictObject *dict = (PyDictObject *)_PyDictOrValues_GetDict(dorv);
|
|
|
|
DEOPT_IF(dict == NULL, STORE_ATTR);
|
|
|
|
assert(PyDict_CheckExact((PyObject *)dict));
|
|
|
|
PyObject *name = GETITEM(names, oparg);
|
|
|
|
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-09 05:31:27 +08:00
|
|
|
PyObject *old_value;
|
2022-11-03 12:31:26 +08: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);
|
|
|
|
new_version = _PyDict_NotifyEvent(PyDict_EVENT_MODIFIED, dict, name, value);
|
|
|
|
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);
|
|
|
|
new_version = _PyDict_NotifyEvent(PyDict_EVENT_MODIFIED, dict, name, value);
|
|
|
|
ep->me_value = value;
|
|
|
|
}
|
|
|
|
Py_DECREF(old_value);
|
|
|
|
STAT_INC(STORE_ATTR, hit);
|
|
|
|
/* Ensure dict is GC tracked if it needs to be */
|
|
|
|
if (!_PyObject_GC_IS_TRACKED(dict) && _PyObject_GC_MAY_BE_TRACKED(value)) {
|
|
|
|
_PyObject_GC_TRACK(dict);
|
|
|
|
}
|
|
|
|
/* PEP 509 */
|
|
|
|
dict->ma_version_tag = new_version;
|
|
|
|
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-09 05:31:27 +08:00
|
|
|
STACK_SHRINK(2);
|
|
|
|
JUMPBY(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(STORE_ATTR_SLOT) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *owner = PEEK(1);
|
|
|
|
PyObject *value = PEEK(2);
|
2022-12-14 19:12:53 +08:00
|
|
|
uint32_t type_version = read_u32(&next_instr[1].cache);
|
|
|
|
uint16_t index = read_u16(&next_instr[3].cache);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
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-09 05:31:27 +08:00
|
|
|
char *addr = (char *)owner + index;
|
2022-11-03 12:31:26 +08:00
|
|
|
STAT_INC(STORE_ATTR, hit);
|
|
|
|
PyObject *old_value = *(PyObject **)addr;
|
|
|
|
*(PyObject **)addr = value;
|
|
|
|
Py_XDECREF(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-09 05:31:27 +08:00
|
|
|
STACK_SHRINK(2);
|
|
|
|
JUMPBY(4);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-11-10 02:50:09 +08:00
|
|
|
TARGET(COMPARE_OP) {
|
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-09 05:31:27 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *res;
|
2022-11-10 02:50:09 +08:00
|
|
|
STAT_INC(COMPARE_OP, deferred);
|
2023-01-12 04:40:43 +08:00
|
|
|
assert((oparg >> 4) <= Py_GE);
|
|
|
|
res = PyObject_RichCompare(left, right, oparg>>4);
|
2022-11-18 03:36:57 +08:00
|
|
|
Py_DECREF(left);
|
|
|
|
Py_DECREF(right);
|
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-09 05:31:27 +08:00
|
|
|
if (res == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, res);
|
2023-01-12 04:40:43 +08:00
|
|
|
JUMPBY(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2023-01-16 20:35:21 +08:00
|
|
|
TARGET(COMPARE_AND_BRANCH) {
|
|
|
|
PREDICTED(COMPARE_AND_BRANCH);
|
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2023-01-16 20:35:21 +08:00
|
|
|
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
2022-12-09 07:54:07 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
2023-01-16 20:35:21 +08:00
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_CompareAndBranch(left, right, next_instr, oparg);
|
|
|
|
DISPATCH_SAME_OPARG();
|
2022-12-09 07:54:07 +08:00
|
|
|
}
|
2023-01-16 20:35:21 +08:00
|
|
|
STAT_INC(COMPARE_AND_BRANCH, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2023-01-16 20:35:21 +08:00
|
|
|
assert((oparg >> 4) <= Py_GE);
|
|
|
|
PyObject *cond = PyObject_RichCompare(left, right, oparg>>4);
|
|
|
|
Py_DECREF(left);
|
|
|
|
Py_DECREF(right);
|
|
|
|
if (cond == NULL) goto pop_2_error;
|
|
|
|
assert(_Py_OPCODE(next_instr[1]) == POP_JUMP_IF_FALSE ||
|
|
|
|
_Py_OPCODE(next_instr[1]) == POP_JUMP_IF_TRUE);
|
|
|
|
bool jump_on_true = _Py_OPCODE(next_instr[1]) == POP_JUMP_IF_TRUE;
|
|
|
|
int offset = _Py_OPARG(next_instr[1]);
|
|
|
|
int err = PyObject_IsTrue(cond);
|
|
|
|
Py_DECREF(cond);
|
|
|
|
if (err < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (jump_on_true == (err != 0)) {
|
|
|
|
JUMPBY(offset);
|
2022-12-09 07:54:07 +08:00
|
|
|
}
|
|
|
|
STACK_SHRINK(2);
|
2023-01-16 20:35:21 +08:00
|
|
|
JUMPBY(2);
|
2022-12-09 07:54:07 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2023-01-16 20:35:21 +08:00
|
|
|
TARGET(COMPARE_AND_BRANCH_FLOAT) {
|
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_AND_BRANCH);
|
|
|
|
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_AND_BRANCH);
|
|
|
|
STAT_INC(COMPARE_AND_BRANCH, hit);
|
|
|
|
double dleft = PyFloat_AS_DOUBLE(left);
|
|
|
|
double dright = PyFloat_AS_DOUBLE(right);
|
|
|
|
// 1 if NaN, 2 if <, 4 if >, 8 if ==; this matches low four bits of the oparg
|
|
|
|
int sign_ish = COMPARISON_BIT(dleft, dright);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
|
|
|
|
if (sign_ish & oparg) {
|
|
|
|
int offset = _Py_OPARG(next_instr[1]);
|
|
|
|
JUMPBY(offset);
|
2022-12-09 07:54:07 +08:00
|
|
|
}
|
|
|
|
STACK_SHRINK(2);
|
2023-01-16 20:35:21 +08:00
|
|
|
JUMPBY(2);
|
2022-12-09 07:54:07 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2023-01-16 20:35:21 +08:00
|
|
|
TARGET(COMPARE_AND_BRANCH_INT) {
|
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(left), COMPARE_AND_BRANCH);
|
|
|
|
DEOPT_IF(!PyLong_CheckExact(right), COMPARE_AND_BRANCH);
|
|
|
|
DEOPT_IF((size_t)(Py_SIZE(left) + 1) > 2, COMPARE_AND_BRANCH);
|
|
|
|
DEOPT_IF((size_t)(Py_SIZE(right) + 1) > 2, COMPARE_AND_BRANCH);
|
|
|
|
STAT_INC(COMPARE_AND_BRANCH, hit);
|
|
|
|
assert(Py_ABS(Py_SIZE(left)) <= 1 && Py_ABS(Py_SIZE(right)) <= 1);
|
|
|
|
Py_ssize_t ileft = Py_SIZE(left) * ((PyLongObject *)left)->ob_digit[0];
|
|
|
|
Py_ssize_t iright = Py_SIZE(right) * ((PyLongObject *)right)->ob_digit[0];
|
|
|
|
// 2 if <, 4 if >, 8 if ==; this matches the low 4 bits of the oparg
|
|
|
|
int sign_ish = COMPARISON_BIT(ileft, iright);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
|
|
|
|
if (sign_ish & oparg) {
|
|
|
|
int offset = _Py_OPARG(next_instr[1]);
|
|
|
|
JUMPBY(offset);
|
2022-12-09 07:54:07 +08:00
|
|
|
}
|
2023-01-16 20:35:21 +08:00
|
|
|
STACK_SHRINK(2);
|
|
|
|
JUMPBY(2);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(COMPARE_AND_BRANCH_STR) {
|
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_AND_BRANCH);
|
|
|
|
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_AND_BRANCH);
|
|
|
|
STAT_INC(COMPARE_AND_BRANCH, hit);
|
|
|
|
int res = _PyUnicode_Equal(left, right);
|
|
|
|
assert((oparg >>4) == Py_EQ || (oparg >>4) == Py_NE);
|
|
|
|
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
|
|
|
|
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
|
|
|
|
assert(res == 0 || res == 1);
|
|
|
|
assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS);
|
|
|
|
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
|
|
|
|
if ((res + COMPARISON_NOT_EQUALS) & oparg) {
|
|
|
|
int offset = _Py_OPARG(next_instr[1]);
|
|
|
|
JUMPBY(offset);
|
2022-12-09 07:54:07 +08:00
|
|
|
}
|
|
|
|
STACK_SHRINK(2);
|
2023-01-16 20:35:21 +08:00
|
|
|
JUMPBY(2);
|
2022-12-09 07:54:07 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-11-03 12:31:26 +08:00
|
|
|
TARGET(IS_OP) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *b;
|
2022-11-03 12:31:26 +08:00
|
|
|
int res = Py_Is(left, right) ^ oparg;
|
|
|
|
Py_DECREF(left);
|
|
|
|
Py_DECREF(right);
|
2022-12-28 09:11:03 +08:00
|
|
|
b = Py_NewRef(res ? Py_True : Py_False);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, b);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CONTAINS_OP) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *b;
|
2022-11-03 12:31:26 +08:00
|
|
|
int res = PySequence_Contains(right, left);
|
|
|
|
Py_DECREF(left);
|
|
|
|
Py_DECREF(right);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (res < 0) goto pop_2_error;
|
|
|
|
b = Py_NewRef((res^oparg) ? Py_True : Py_False);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, b);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CHECK_EG_MATCH) {
|
|
|
|
PyObject *match_type = POP();
|
|
|
|
if (check_except_star_type_valid(tstate, match_type) < 0) {
|
|
|
|
Py_DECREF(match_type);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *exc_value = TOP();
|
|
|
|
PyObject *match = NULL, *rest = NULL;
|
|
|
|
int res = exception_group_match(exc_value, match_type,
|
|
|
|
&match, &rest);
|
|
|
|
Py_DECREF(match_type);
|
|
|
|
if (res < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (match == NULL || rest == NULL) {
|
|
|
|
assert(match == NULL);
|
|
|
|
assert(rest == NULL);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (Py_IsNone(match)) {
|
|
|
|
PUSH(match);
|
|
|
|
Py_XDECREF(rest);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Total or partial match - update the stack from
|
|
|
|
* [val]
|
|
|
|
* to
|
|
|
|
* [rest, match]
|
|
|
|
* (rest can be Py_None)
|
|
|
|
*/
|
|
|
|
|
|
|
|
SET_TOP(rest);
|
|
|
|
PUSH(match);
|
|
|
|
PyErr_SetExcInfo(NULL, Py_NewRef(match), NULL);
|
|
|
|
Py_DECREF(exc_value);
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CHECK_EXC_MATCH) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *right = PEEK(1);
|
|
|
|
PyObject *left = PEEK(2);
|
|
|
|
PyObject *b;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(PyExceptionInstance_Check(left));
|
|
|
|
if (check_except_type_valid(tstate, right) < 0) {
|
|
|
|
Py_DECREF(right);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (true) goto pop_1_error;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int res = PyErr_GivenExceptionMatches(left, right);
|
|
|
|
Py_DECREF(right);
|
2022-12-28 09:11:03 +08:00
|
|
|
b = Py_NewRef(res ? Py_True : Py_False);
|
|
|
|
POKE(1, b);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(IMPORT_NAME) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *fromlist = PEEK(1);
|
|
|
|
PyObject *level = PEEK(2);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *res;
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *name = GETITEM(names, oparg);
|
2022-11-03 12:31:26 +08:00
|
|
|
res = import_name(tstate, frame, name, fromlist, level);
|
|
|
|
Py_DECREF(level);
|
|
|
|
Py_DECREF(fromlist);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (res == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, res);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(IMPORT_FROM) {
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *from = PEEK(1);
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *res;
|
2022-12-28 09:11:03 +08:00
|
|
|
PyObject *name = GETITEM(names, oparg);
|
2022-11-03 12:31:26 +08:00
|
|
|
res = import_from(tstate, from, name);
|
2022-12-28 09:11:03 +08:00
|
|
|
if (res == NULL) goto error;
|
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, res);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(JUMP_FORWARD) {
|
|
|
|
JUMPBY(oparg);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(JUMP_BACKWARD) {
|
|
|
|
PREDICTED(JUMP_BACKWARD);
|
|
|
|
assert(oparg < INSTR_OFFSET());
|
|
|
|
JUMPBY(-oparg);
|
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(POP_JUMP_IF_FALSE) {
|
|
|
|
PREDICTED(POP_JUMP_IF_FALSE);
|
|
|
|
PyObject *cond = POP();
|
|
|
|
if (Py_IsTrue(cond)) {
|
|
|
|
_Py_DECREF_NO_DEALLOC(cond);
|
|
|
|
}
|
|
|
|
else if (Py_IsFalse(cond)) {
|
|
|
|
_Py_DECREF_NO_DEALLOC(cond);
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int err = PyObject_IsTrue(cond);
|
|
|
|
Py_DECREF(cond);
|
|
|
|
if (err > 0)
|
|
|
|
;
|
|
|
|
else if (err == 0) {
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(POP_JUMP_IF_TRUE) {
|
|
|
|
PyObject *cond = POP();
|
|
|
|
if (Py_IsFalse(cond)) {
|
|
|
|
_Py_DECREF_NO_DEALLOC(cond);
|
|
|
|
}
|
|
|
|
else if (Py_IsTrue(cond)) {
|
|
|
|
_Py_DECREF_NO_DEALLOC(cond);
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int err = PyObject_IsTrue(cond);
|
|
|
|
Py_DECREF(cond);
|
|
|
|
if (err > 0) {
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
else if (err == 0)
|
|
|
|
;
|
|
|
|
else
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(POP_JUMP_IF_NOT_NONE) {
|
|
|
|
PyObject *value = POP();
|
|
|
|
if (!Py_IsNone(value)) {
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
Py_DECREF(value);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(POP_JUMP_IF_NONE) {
|
|
|
|
PyObject *value = POP();
|
|
|
|
if (Py_IsNone(value)) {
|
|
|
|
_Py_DECREF_NO_DEALLOC(value);
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_DECREF(value);
|
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(JUMP_IF_FALSE_OR_POP) {
|
|
|
|
PyObject *cond = TOP();
|
|
|
|
int err;
|
|
|
|
if (Py_IsTrue(cond)) {
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
_Py_DECREF_NO_DEALLOC(cond);
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else if (Py_IsFalse(cond)) {
|
2022-11-03 12:31:26 +08:00
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else {
|
|
|
|
err = PyObject_IsTrue(cond);
|
|
|
|
if (err > 0) {
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
Py_DECREF(cond);
|
|
|
|
}
|
|
|
|
else if (err == 0) {
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(JUMP_IF_TRUE_OR_POP) {
|
|
|
|
PyObject *cond = TOP();
|
|
|
|
int err;
|
|
|
|
if (Py_IsFalse(cond)) {
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
_Py_DECREF_NO_DEALLOC(cond);
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else if (Py_IsTrue(cond)) {
|
2022-11-03 12:31:26 +08:00
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else {
|
|
|
|
err = PyObject_IsTrue(cond);
|
|
|
|
if (err > 0) {
|
|
|
|
JUMPBY(oparg);
|
|
|
|
}
|
|
|
|
else if (err == 0) {
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
Py_DECREF(cond);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
|
|
|
|
/* This bytecode is used in the `yield from` or `await` loop.
|
|
|
|
* If there is an interrupt, we want it handled in the innermost
|
|
|
|
* generator or coroutine, so we deliberately do not check it here.
|
|
|
|
* (see bpo-30039).
|
|
|
|
*/
|
|
|
|
JUMPBY(-oparg);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(GET_LEN) {
|
|
|
|
// PUSH(len(TOS))
|
|
|
|
Py_ssize_t len_i = PyObject_Length(TOP());
|
|
|
|
if (len_i < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PyObject *len_o = PyLong_FromSsize_t(len_i);
|
|
|
|
if (len_o == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PUSH(len_o);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(MATCH_CLASS) {
|
|
|
|
// Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
|
|
|
|
// None on failure.
|
|
|
|
PyObject *names = POP();
|
|
|
|
PyObject *type = POP();
|
|
|
|
PyObject *subject = TOP();
|
|
|
|
assert(PyTuple_CheckExact(names));
|
|
|
|
PyObject *attrs = match_class(tstate, subject, type, oparg, names);
|
|
|
|
Py_DECREF(names);
|
|
|
|
Py_DECREF(type);
|
|
|
|
if (attrs) {
|
|
|
|
// Success!
|
|
|
|
assert(PyTuple_CheckExact(attrs));
|
|
|
|
SET_TOP(attrs);
|
|
|
|
}
|
|
|
|
else if (_PyErr_Occurred(tstate)) {
|
|
|
|
// Error!
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// Failure!
|
2022-11-10 18:25:33 +08:00
|
|
|
SET_TOP(Py_NewRef(Py_None));
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
Py_DECREF(subject);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(MATCH_MAPPING) {
|
|
|
|
PyObject *subject = TOP();
|
|
|
|
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
|
|
|
|
PyObject *res = match ? Py_True : Py_False;
|
2022-11-10 18:25:33 +08:00
|
|
|
PUSH(Py_NewRef(res));
|
2022-11-03 12:31:26 +08:00
|
|
|
PREDICT(POP_JUMP_IF_FALSE);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(MATCH_SEQUENCE) {
|
|
|
|
PyObject *subject = TOP();
|
|
|
|
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
|
|
|
|
PyObject *res = match ? Py_True : Py_False;
|
2022-11-10 18:25:33 +08:00
|
|
|
PUSH(Py_NewRef(res));
|
2022-11-03 12:31:26 +08:00
|
|
|
PREDICT(POP_JUMP_IF_FALSE);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(MATCH_KEYS) {
|
|
|
|
// On successful match, PUSH(values). Otherwise, PUSH(None).
|
|
|
|
PyObject *keys = TOP();
|
|
|
|
PyObject *subject = SECOND();
|
|
|
|
PyObject *values_or_none = match_keys(tstate, subject, keys);
|
|
|
|
if (values_or_none == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PUSH(values_or_none);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(GET_ITER) {
|
|
|
|
/* before: [obj]; after [getiter(obj)] */
|
|
|
|
PyObject *iterable = TOP();
|
|
|
|
PyObject *iter = PyObject_GetIter(iterable);
|
|
|
|
Py_DECREF(iterable);
|
|
|
|
SET_TOP(iter);
|
|
|
|
if (iter == NULL)
|
|
|
|
goto error;
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(GET_YIELD_FROM_ITER) {
|
|
|
|
/* before: [obj]; after [getiter(obj)] */
|
|
|
|
PyObject *iterable = TOP();
|
|
|
|
PyObject *iter;
|
|
|
|
if (PyCoro_CheckExact(iterable)) {
|
|
|
|
/* `iterable` is a coroutine */
|
|
|
|
if (!(frame->f_code->co_flags & (CO_COROUTINE | CO_ITERABLE_COROUTINE))) {
|
|
|
|
/* and it is used in a 'yield from' expression of a
|
|
|
|
regular generator. */
|
|
|
|
Py_DECREF(iterable);
|
|
|
|
SET_TOP(NULL);
|
|
|
|
_PyErr_SetString(tstate, PyExc_TypeError,
|
|
|
|
"cannot 'yield from' a coroutine object "
|
|
|
|
"in a non-coroutine generator");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!PyGen_CheckExact(iterable)) {
|
|
|
|
/* `iterable` is not a generator. */
|
|
|
|
iter = PyObject_GetIter(iterable);
|
|
|
|
Py_DECREF(iterable);
|
|
|
|
SET_TOP(iter);
|
|
|
|
if (iter == NULL)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PREDICT(LOAD_CONST);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(FOR_ITER) {
|
|
|
|
PREDICTED(FOR_ITER);
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-10 02:50:09 +08:00
|
|
|
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_ForIter(TOP(), next_instr, oparg);
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(FOR_ITER, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 12:31:26 +08:00
|
|
|
/* before: [iter]; after: [iter, iter()] *or* [] */
|
|
|
|
PyObject *iter = TOP();
|
|
|
|
PyObject *next = (*Py_TYPE(iter)->tp_iternext)(iter);
|
|
|
|
if (next != NULL) {
|
|
|
|
PUSH(next);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER);
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else {
|
|
|
|
if (_PyErr_Occurred(tstate)) {
|
|
|
|
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
else if (tstate->c_tracefunc != NULL) {
|
|
|
|
call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, tstate, frame);
|
|
|
|
}
|
|
|
|
_PyErr_Clear(tstate);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
/* iterator ended normally */
|
|
|
|
assert(_Py_OPCODE(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg]) == END_FOR);
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
Py_DECREF(iter);
|
|
|
|
/* Skip END_FOR */
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(FOR_ITER_LIST) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
_PyListIterObject *it = (_PyListIterObject *)TOP();
|
|
|
|
DEOPT_IF(Py_TYPE(it) != &PyListIter_Type, FOR_ITER);
|
|
|
|
STAT_INC(FOR_ITER, hit);
|
|
|
|
PyListObject *seq = it->it_seq;
|
|
|
|
if (seq) {
|
|
|
|
if (it->it_index < PyList_GET_SIZE(seq)) {
|
|
|
|
PyObject *next = PyList_GET_ITEM(seq, it->it_index++);
|
2022-11-10 18:25:33 +08:00
|
|
|
PUSH(Py_NewRef(next));
|
2022-11-03 12:31:26 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER);
|
2022-11-11 02:50:57 +08:00
|
|
|
goto end_for_iter_list; // End of this instruction
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
it->it_seq = NULL;
|
|
|
|
Py_DECREF(seq);
|
|
|
|
}
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
Py_DECREF(it);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1);
|
2022-11-11 02:50:57 +08:00
|
|
|
end_for_iter_list:
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-12-09 18:27:01 +08:00
|
|
|
TARGET(FOR_ITER_TUPLE) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
_PyTupleIterObject *it = (_PyTupleIterObject *)TOP();
|
|
|
|
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
|
|
|
|
STAT_INC(FOR_ITER, hit);
|
|
|
|
PyTupleObject *seq = it->it_seq;
|
|
|
|
if (seq) {
|
|
|
|
if (it->it_index < PyTuple_GET_SIZE(seq)) {
|
|
|
|
PyObject *next = PyTuple_GET_ITEM(seq, it->it_index++);
|
|
|
|
PUSH(Py_NewRef(next));
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER);
|
|
|
|
goto end_for_iter_tuple; // End of this instruction
|
|
|
|
}
|
|
|
|
it->it_seq = NULL;
|
|
|
|
Py_DECREF(seq);
|
|
|
|
}
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
Py_DECREF(it);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1);
|
|
|
|
end_for_iter_tuple:
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-11-03 12:31:26 +08:00
|
|
|
TARGET(FOR_ITER_RANGE) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
_PyRangeIterObject *r = (_PyRangeIterObject *)TOP();
|
|
|
|
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
|
|
|
|
STAT_INC(FOR_ITER, hit);
|
|
|
|
_Py_CODEUNIT next = next_instr[INLINE_CACHE_ENTRIES_FOR_ITER];
|
|
|
|
assert(_PyOpcode_Deopt[_Py_OPCODE(next)] == STORE_FAST);
|
2022-12-01 05:04:30 +08:00
|
|
|
if (r->len <= 0) {
|
2022-11-03 12:31:26 +08:00
|
|
|
STACK_SHRINK(1);
|
|
|
|
Py_DECREF(r);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1);
|
|
|
|
}
|
2022-11-11 02:50:57 +08:00
|
|
|
else {
|
2022-12-01 05:04:30 +08:00
|
|
|
long value = r->start;
|
|
|
|
r->start = value + r->step;
|
|
|
|
r->len--;
|
2022-11-11 02:50:57 +08:00
|
|
|
if (_PyLong_AssignValue(&GETLOCAL(_Py_OPARG(next)), value) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
// The STORE_FAST is already done.
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER + 1);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-11-07 22:49:51 +08:00
|
|
|
TARGET(FOR_ITER_GEN) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyGenObject *gen = (PyGenObject *)TOP();
|
|
|
|
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;
|
|
|
|
frame->yield_offset = oparg;
|
2022-11-10 18:25:33 +08:00
|
|
|
_PyFrame_StackPush(gen_frame, Py_NewRef(Py_None));
|
2022-11-07 22:49:51 +08:00
|
|
|
gen->gi_frame_state = FRAME_EXECUTING;
|
|
|
|
gen->gi_exc_state.previous_item = tstate->exc_info;
|
|
|
|
tstate->exc_info = &gen->gi_exc_state;
|
2022-11-18 03:36:03 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER + oparg);
|
|
|
|
assert(_Py_OPCODE(*next_instr) == END_FOR);
|
|
|
|
DISPATCH_INLINED(gen_frame);
|
2022-11-07 22:49:51 +08:00
|
|
|
}
|
|
|
|
|
2022-11-03 12:31:26 +08:00
|
|
|
TARGET(BEFORE_ASYNC_WITH) {
|
|
|
|
PyObject *mgr = TOP();
|
|
|
|
PyObject *res;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
PyObject *exit = _PyObject_LookupSpecial(mgr, &_Py_ID(__aexit__));
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
SET_TOP(exit);
|
|
|
|
Py_DECREF(mgr);
|
|
|
|
res = _PyObject_CallNoArgs(enter);
|
|
|
|
Py_DECREF(enter);
|
|
|
|
if (res == NULL)
|
|
|
|
goto error;
|
|
|
|
PUSH(res);
|
|
|
|
PREDICT(GET_AWAITABLE);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BEFORE_WITH) {
|
|
|
|
PyObject *mgr = TOP();
|
|
|
|
PyObject *res;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
PyObject *exit = _PyObject_LookupSpecial(mgr, &_Py_ID(__exit__));
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
SET_TOP(exit);
|
|
|
|
Py_DECREF(mgr);
|
|
|
|
res = _PyObject_CallNoArgs(enter);
|
|
|
|
Py_DECREF(enter);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PUSH(res);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(WITH_EXCEPT_START) {
|
2022-11-23 08:04:57 +08:00
|
|
|
PyObject *val = PEEK(1);
|
|
|
|
PyObject *lasti = PEEK(3);
|
|
|
|
PyObject *exit_func = PEEK(4);
|
|
|
|
PyObject *res;
|
2022-11-03 12:31:26 +08:00
|
|
|
/* At the top of the stack are 4 values:
|
2022-11-23 08:04:57 +08: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 12:31:26 +08:00
|
|
|
We call FOURTH(type(TOP), TOP, GetTraceback(TOP)).
|
|
|
|
Then we push the __exit__ return value.
|
|
|
|
*/
|
2022-11-23 08:04:57 +08:00
|
|
|
PyObject *exc, *tb;
|
2022-11-03 12:31:26 +08:00
|
|
|
|
|
|
|
assert(val && PyExceptionInstance_Check(val));
|
|
|
|
exc = PyExceptionInstance_Class(val);
|
|
|
|
tb = PyException_GetTraceback(val);
|
|
|
|
Py_XDECREF(tb);
|
2022-11-23 08:04:57 +08:00
|
|
|
assert(PyLong_Check(lasti));
|
|
|
|
(void)lasti; // Shut up compiler warning if asserts are off
|
2022-11-03 12:31:26 +08:00
|
|
|
PyObject *stack[4] = {NULL, exc, val, tb};
|
|
|
|
res = PyObject_Vectorcall(exit_func, stack + 1,
|
|
|
|
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
|
2022-11-23 08:04:57 +08:00
|
|
|
if (res == NULL) goto error;
|
|
|
|
STACK_GROW(1);
|
|
|
|
POKE(1, res);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(PUSH_EXC_INFO) {
|
|
|
|
PyObject *value = TOP();
|
|
|
|
|
|
|
|
_PyErr_StackItem *exc_info = tstate->exc_info;
|
|
|
|
if (exc_info->exc_value != NULL) {
|
|
|
|
SET_TOP(exc_info->exc_value);
|
|
|
|
}
|
|
|
|
else {
|
2022-11-10 18:25:33 +08:00
|
|
|
SET_TOP(Py_NewRef(Py_None));
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
2022-11-10 18:25:33 +08:00
|
|
|
PUSH(Py_NewRef(value));
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(PyExceptionInstance_Check(value));
|
|
|
|
exc_info->exc_value = value;
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_METHOD_WITH_VALUES) {
|
|
|
|
/* Cached method object */
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *self = TOP();
|
|
|
|
PyTypeObject *self_cls = Py_TYPE(self);
|
|
|
|
_PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
|
|
|
|
uint32_t type_version = read_u32(cache->type_version);
|
|
|
|
assert(type_version != 0);
|
|
|
|
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(self_cls->tp_flags & Py_TPFLAGS_MANAGED_DICT);
|
|
|
|
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(self);
|
|
|
|
DEOPT_IF(!_PyDictOrValues_IsValues(dorv), LOAD_ATTR);
|
|
|
|
PyHeapTypeObject *self_heap_type = (PyHeapTypeObject *)self_cls;
|
|
|
|
DEOPT_IF(self_heap_type->ht_cached_keys->dk_version !=
|
|
|
|
read_u32(cache->keys_version), LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
PyObject *res = read_obj(cache->descr);
|
|
|
|
assert(res != NULL);
|
|
|
|
assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
2022-11-10 18:25:33 +08:00
|
|
|
SET_TOP(Py_NewRef(res));
|
2022-11-03 12:31:26 +08:00
|
|
|
PUSH(self);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_METHOD_NO_DICT) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *self = TOP();
|
|
|
|
PyTypeObject *self_cls = Py_TYPE(self);
|
|
|
|
_PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
|
|
|
|
uint32_t type_version = read_u32(cache->type_version);
|
|
|
|
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
assert(self_cls->tp_dictoffset == 0);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
PyObject *res = read_obj(cache->descr);
|
|
|
|
assert(res != NULL);
|
|
|
|
assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
2022-11-10 18:25:33 +08:00
|
|
|
SET_TOP(Py_NewRef(res));
|
2022-11-03 12:31:26 +08:00
|
|
|
PUSH(self);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(LOAD_ATTR_METHOD_LAZY_DICT) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
PyObject *self = TOP();
|
|
|
|
PyTypeObject *self_cls = Py_TYPE(self);
|
|
|
|
_PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
|
|
|
|
uint32_t type_version = read_u32(cache->type_version);
|
|
|
|
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
|
|
|
|
Py_ssize_t dictoffset = self_cls->tp_dictoffset;
|
|
|
|
assert(dictoffset > 0);
|
|
|
|
PyObject *dict = *(PyObject **)((char *)self + dictoffset);
|
|
|
|
/* This object has a __dict__, just not yet created */
|
|
|
|
DEOPT_IF(dict != NULL, LOAD_ATTR);
|
|
|
|
STAT_INC(LOAD_ATTR, hit);
|
|
|
|
PyObject *res = read_obj(cache->descr);
|
|
|
|
assert(res != NULL);
|
|
|
|
assert(_PyType_HasFeature(Py_TYPE(res), Py_TPFLAGS_METHOD_DESCRIPTOR));
|
2022-11-10 18:25:33 +08:00
|
|
|
SET_TOP(Py_NewRef(res));
|
2022-11-03 12:31:26 +08:00
|
|
|
PUSH(self);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
|
|
|
|
DEOPT_IF(is_method(stack_pointer, oparg), CALL);
|
|
|
|
PyObject *function = PEEK(oparg + 1);
|
|
|
|
DEOPT_IF(Py_TYPE(function) != &PyMethod_Type, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyObject *self = ((PyMethodObject *)function)->im_self;
|
2022-11-10 18:25:33 +08:00
|
|
|
PEEK(oparg + 1) = Py_NewRef(self);
|
|
|
|
PyObject *meth = ((PyMethodObject *)function)->im_func;
|
|
|
|
PEEK(oparg + 2) = Py_NewRef(meth);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(function);
|
|
|
|
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(KW_NAMES) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(oparg < PyTuple_GET_SIZE(consts));
|
2022-11-10 20:34:57 +08:00
|
|
|
kwnames = GETITEM(consts, oparg);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL) {
|
|
|
|
PREDICTED(CALL);
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-10 02:50:09 +08:00
|
|
|
_PyCallCache *cache = (_PyCallCache *)next_instr;
|
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int nargs = oparg + is_meth;
|
|
|
|
PyObject *callable = PEEK(nargs + 1);
|
|
|
|
next_instr--;
|
2022-11-10 20:34:57 +08:00
|
|
|
_Py_Specialize_Call(callable, next_instr, nargs, kwnames);
|
2022-11-10 02:50:09 +08:00
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
|
|
|
STAT_INC(CALL, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-03 12:31:26 +08:00
|
|
|
int total_args, is_meth;
|
|
|
|
is_meth = is_method(stack_pointer, oparg);
|
|
|
|
PyObject *function = PEEK(oparg + 1);
|
|
|
|
if (!is_meth && Py_TYPE(function) == &PyMethod_Type) {
|
|
|
|
PyObject *self = ((PyMethodObject *)function)->im_self;
|
2022-11-10 18:25:33 +08:00
|
|
|
PEEK(oparg+1) = Py_NewRef(self);
|
|
|
|
PyObject *meth = ((PyMethodObject *)function)->im_func;
|
|
|
|
PEEK(oparg+2) = Py_NewRef(meth);
|
2022-11-03 12:31:26 +08:00
|
|
|
Py_DECREF(function);
|
|
|
|
is_meth = 1;
|
|
|
|
}
|
|
|
|
total_args = oparg + is_meth;
|
|
|
|
function = PEEK(total_args + 1);
|
|
|
|
int positional_args = total_args - KWNAMES_LEN();
|
|
|
|
// Check if the call can be inlined or not
|
|
|
|
if (Py_TYPE(function) == &PyFunction_Type &&
|
|
|
|
tstate->interp->eval_frame == NULL &&
|
|
|
|
((PyFunctionObject *)function)->vectorcall == _PyFunction_Vectorcall)
|
|
|
|
{
|
|
|
|
int code_flags = ((PyCodeObject*)PyFunction_GET_CODE(function))->co_flags;
|
|
|
|
PyObject *locals = code_flags & CO_OPTIMIZED ? NULL : Py_NewRef(PyFunction_GET_GLOBALS(function));
|
|
|
|
STACK_SHRINK(total_args);
|
|
|
|
_PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit(
|
|
|
|
tstate, (PyFunctionObject *)function, locals,
|
2022-11-10 20:34:57 +08:00
|
|
|
stack_pointer, positional_args, kwnames
|
2022-11-03 12:31:26 +08:00
|
|
|
);
|
2022-11-10 20:34:57 +08:00
|
|
|
kwnames = NULL;
|
2022-11-03 12:31:26 +08:00
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
// 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;
|
|
|
|
}
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-18 03:36:03 +08:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
/* Callable is not a normal Python function */
|
|
|
|
PyObject *res;
|
|
|
|
if (cframe.use_tracing) {
|
|
|
|
res = trace_call_function(
|
|
|
|
tstate, function, stack_pointer-total_args,
|
2022-11-10 20:34:57 +08:00
|
|
|
positional_args, kwnames);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
res = PyObject_Vectorcall(
|
|
|
|
function, stack_pointer-total_args,
|
|
|
|
positional_args | PY_VECTORCALL_ARGUMENTS_OFFSET,
|
2022-11-10 20:34:57 +08:00
|
|
|
kwnames);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
2022-11-10 20:34:57 +08:00
|
|
|
kwnames = NULL;
|
2022-11-03 12:31:26 +08:00
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
Py_DECREF(function);
|
|
|
|
/* Clear the stack */
|
|
|
|
STACK_SHRINK(total_args);
|
|
|
|
for (int i = 0; i < total_args; i++) {
|
|
|
|
Py_DECREF(stack_pointer[i]);
|
|
|
|
}
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
PUSH(res);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_PY_EXACT_ARGS) {
|
|
|
|
PREDICTED(CALL_PY_EXACT_ARGS);
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, CALL);
|
|
|
|
_PyCallCache *cache = (_PyCallCache *)next_instr;
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int argcount = oparg + is_meth;
|
|
|
|
PyObject *callable = PEEK(argcount + 1);
|
|
|
|
DEOPT_IF(!PyFunction_Check(callable), CALL);
|
|
|
|
PyFunctionObject *func = (PyFunctionObject *)callable;
|
|
|
|
DEOPT_IF(func->func_version != read_u32(cache->func_version), CALL);
|
|
|
|
PyCodeObject *code = (PyCodeObject *)func->func_code;
|
|
|
|
DEOPT_IF(code->co_argcount != argcount, CALL);
|
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-01-06 22:55:56 +08:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, func, argcount);
|
2022-11-03 12:31:26 +08:00
|
|
|
STACK_SHRINK(argcount);
|
|
|
|
for (int i = 0; i < argcount; i++) {
|
|
|
|
new_frame->localsplus[i] = stack_pointer[i];
|
|
|
|
}
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-18 03:36:03 +08:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_PY_WITH_DEFAULTS) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
DEOPT_IF(tstate->interp->eval_frame, CALL);
|
|
|
|
_PyCallCache *cache = (_PyCallCache *)next_instr;
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int argcount = oparg + is_meth;
|
|
|
|
PyObject *callable = PEEK(argcount + 1);
|
|
|
|
DEOPT_IF(!PyFunction_Check(callable), CALL);
|
|
|
|
PyFunctionObject *func = (PyFunctionObject *)callable;
|
|
|
|
DEOPT_IF(func->func_version != read_u32(cache->func_version), CALL);
|
|
|
|
PyCodeObject *code = (PyCodeObject *)func->func_code;
|
|
|
|
DEOPT_IF(argcount > code->co_argcount, CALL);
|
|
|
|
int minargs = cache->min_args;
|
|
|
|
DEOPT_IF(argcount < minargs, CALL);
|
|
|
|
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
2023-01-06 22:55:56 +08:00
|
|
|
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, func, code->co_argcount);
|
2022-11-03 12:31:26 +08:00
|
|
|
STACK_SHRINK(argcount);
|
|
|
|
for (int i = 0; i < argcount; i++) {
|
|
|
|
new_frame->localsplus[i] = stack_pointer[i];
|
|
|
|
}
|
|
|
|
for (int i = argcount; i < code->co_argcount; i++) {
|
|
|
|
PyObject *def = PyTuple_GET_ITEM(func->func_defaults,
|
|
|
|
i - minargs);
|
2022-11-10 18:25:33 +08:00
|
|
|
new_frame->localsplus[i] = Py_NewRef(def);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-18 03:36:03 +08:00
|
|
|
DISPATCH_INLINED(new_frame);
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_TYPE_1) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
assert(oparg == 1);
|
|
|
|
DEOPT_IF(is_method(stack_pointer, 1), CALL);
|
|
|
|
PyObject *obj = TOP();
|
|
|
|
PyObject *callable = SECOND();
|
|
|
|
DEOPT_IF(callable != (PyObject *)&PyType_Type, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
|
|
|
PyObject *res = Py_NewRef(Py_TYPE(obj));
|
|
|
|
Py_DECREF(callable);
|
|
|
|
Py_DECREF(obj);
|
|
|
|
STACK_SHRINK(2);
|
|
|
|
SET_TOP(res);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_STR_1) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
assert(oparg == 1);
|
|
|
|
DEOPT_IF(is_method(stack_pointer, 1), CALL);
|
|
|
|
PyObject *callable = PEEK(2);
|
|
|
|
DEOPT_IF(callable != (PyObject *)&PyUnicode_Type, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyObject *arg = TOP();
|
|
|
|
PyObject *res = PyObject_Str(arg);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
Py_DECREF(&PyUnicode_Type);
|
|
|
|
STACK_SHRINK(2);
|
|
|
|
SET_TOP(res);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_TUPLE_1) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(oparg == 1);
|
|
|
|
DEOPT_IF(is_method(stack_pointer, 1), CALL);
|
|
|
|
PyObject *callable = PEEK(2);
|
|
|
|
DEOPT_IF(callable != (PyObject *)&PyTuple_Type, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyObject *arg = TOP();
|
|
|
|
PyObject *res = PySequence_Tuple(arg);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
Py_DECREF(&PyTuple_Type);
|
|
|
|
STACK_SHRINK(2);
|
|
|
|
SET_TOP(res);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_BUILTIN_CLASS) {
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
int kwnames_len = KWNAMES_LEN();
|
|
|
|
PyObject *callable = PEEK(total_args + 1);
|
|
|
|
DEOPT_IF(!PyType_Check(callable), CALL);
|
|
|
|
PyTypeObject *tp = (PyTypeObject *)callable;
|
|
|
|
DEOPT_IF(tp->tp_vectorcall == NULL, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
STACK_SHRINK(total_args);
|
|
|
|
PyObject *res = tp->tp_vectorcall((PyObject *)tp, stack_pointer,
|
2022-11-10 20:34:57 +08:00
|
|
|
total_args-kwnames_len, kwnames);
|
|
|
|
kwnames = NULL;
|
2022-11-03 12:31:26 +08:00
|
|
|
/* Free the arguments. */
|
|
|
|
for (int i = 0; i < total_args; i++) {
|
|
|
|
Py_DECREF(stack_pointer[i]);
|
|
|
|
}
|
|
|
|
Py_DECREF(tp);
|
|
|
|
STACK_SHRINK(1-is_meth);
|
|
|
|
SET_TOP(res);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_BUILTIN_O) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
/* Builtin METH_O functions */
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
DEOPT_IF(total_args != 1, CALL);
|
|
|
|
PyObject *callable = PEEK(total_args + 1);
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
PyObject *arg = TOP();
|
2022-11-16 01:53:39 +08:00
|
|
|
PyObject *res = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable), arg);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_LeaveRecursiveCallTstate(tstate);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
|
|
|
|
Py_DECREF(arg);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
SET_TOP(res);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_BUILTIN_FAST) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
/* Builtin METH_FASTCALL functions, without keywords */
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
PyObject *callable = PEEK(total_args + 1);
|
|
|
|
DEOPT_IF(!PyCFunction_CheckExact(callable), CALL);
|
|
|
|
DEOPT_IF(PyCFunction_GET_FLAGS(callable) != METH_FASTCALL,
|
|
|
|
CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
|
|
|
|
STACK_SHRINK(total_args);
|
|
|
|
/* res = func(self, args, nargs) */
|
|
|
|
PyObject *res = ((_PyCFunctionFast)(void(*)(void))cfunc)(
|
|
|
|
PyCFunction_GET_SELF(callable),
|
|
|
|
stack_pointer,
|
|
|
|
total_args);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
|
|
|
|
/* Free the arguments. */
|
|
|
|
for (int i = 0; i < total_args; i++) {
|
|
|
|
Py_DECREF(stack_pointer[i]);
|
|
|
|
}
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
PUSH(res);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
if (res == NULL) {
|
|
|
|
/* 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.
|
|
|
|
*/
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_BUILTIN_FAST_WITH_KEYWORDS) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
|
|
|
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
PyObject *callable = PEEK(total_args + 1);
|
|
|
|
DEOPT_IF(!PyCFunction_CheckExact(callable), CALL);
|
|
|
|
DEOPT_IF(PyCFunction_GET_FLAGS(callable) !=
|
|
|
|
(METH_FASTCALL | METH_KEYWORDS), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
STACK_SHRINK(total_args);
|
|
|
|
/* res = func(self, args, nargs, kwnames) */
|
|
|
|
_PyCFunctionFastWithKeywords cfunc =
|
|
|
|
(_PyCFunctionFastWithKeywords)(void(*)(void))
|
|
|
|
PyCFunction_GET_FUNCTION(callable);
|
|
|
|
PyObject *res = cfunc(
|
|
|
|
PyCFunction_GET_SELF(callable),
|
|
|
|
stack_pointer,
|
|
|
|
total_args - KWNAMES_LEN(),
|
2022-11-10 20:34:57 +08:00
|
|
|
kwnames
|
2022-11-03 12:31:26 +08:00
|
|
|
);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
2022-11-10 20:34:57 +08:00
|
|
|
kwnames = NULL;
|
2022-11-03 12:31:26 +08:00
|
|
|
|
|
|
|
/* Free the arguments. */
|
|
|
|
for (int i = 0; i < total_args; i++) {
|
|
|
|
Py_DECREF(stack_pointer[i]);
|
|
|
|
}
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
PUSH(res);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_LEN) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
/* len(o) */
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
DEOPT_IF(total_args != 1, CALL);
|
|
|
|
PyObject *callable = PEEK(total_args + 1);
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
DEOPT_IF(callable != interp->callable_cache.len, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyObject *arg = TOP();
|
|
|
|
Py_ssize_t len_i = PyObject_Length(arg);
|
|
|
|
if (len_i < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PyObject *res = PyLong_FromSsize_t(len_i);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_ISINSTANCE) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
/* isinstance(o, o2) */
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
PyObject *callable = PEEK(total_args + 1);
|
|
|
|
DEOPT_IF(total_args != 2, CALL);
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
DEOPT_IF(callable != interp->callable_cache.isinstance, CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyObject *cls = POP();
|
|
|
|
PyObject *inst = TOP();
|
|
|
|
int retval = PyObject_IsInstance(inst, cls);
|
|
|
|
if (retval < 0) {
|
|
|
|
Py_DECREF(cls);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
PyObject *res = PyBool_FromLong(retval);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(inst);
|
|
|
|
Py_DECREF(cls);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_LIST_APPEND) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(oparg == 1);
|
|
|
|
PyObject *callable = PEEK(3);
|
|
|
|
PyInterpreterState *interp = _PyInterpreterState_GET();
|
|
|
|
DEOPT_IF(callable != interp->callable_cache.list_append, CALL);
|
|
|
|
PyObject *list = SECOND();
|
|
|
|
DEOPT_IF(!PyList_Check(list), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
PyObject *arg = POP();
|
|
|
|
if (_PyList_AppendTakeRef((PyListObject *)list, arg) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
STACK_SHRINK(2);
|
|
|
|
Py_DECREF(list);
|
|
|
|
Py_DECREF(callable);
|
2022-11-11 00:46:56 +08:00
|
|
|
// CALL + POP_TOP
|
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL + 1);
|
|
|
|
assert(_Py_OPCODE(next_instr[-1]) == POP_TOP);
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
PyMethodDescrObject *callable =
|
|
|
|
(PyMethodDescrObject *)PEEK(total_args + 1);
|
|
|
|
DEOPT_IF(total_args != 2, CALL);
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(callable, &PyMethodDescr_Type), CALL);
|
|
|
|
PyMethodDef *meth = callable->d_method;
|
|
|
|
DEOPT_IF(meth->ml_flags != METH_O, CALL);
|
|
|
|
PyObject *arg = TOP();
|
|
|
|
PyObject *self = SECOND();
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(self, callable->d_common.d_type), 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;
|
|
|
|
}
|
2022-11-16 01:53:39 +08:00
|
|
|
PyObject *res = _PyCFunction_TrampolineCall(cfunc, self, arg);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_LeaveRecursiveCallTstate(tstate);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
Py_DECREF(self);
|
|
|
|
Py_DECREF(arg);
|
|
|
|
STACK_SHRINK(oparg + 1);
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS) {
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
PyMethodDescrObject *callable =
|
|
|
|
(PyMethodDescrObject *)PEEK(total_args + 1);
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(callable, &PyMethodDescr_Type), CALL);
|
|
|
|
PyMethodDef *meth = callable->d_method;
|
|
|
|
DEOPT_IF(meth->ml_flags != (METH_FASTCALL|METH_KEYWORDS), CALL);
|
|
|
|
PyTypeObject *d_type = callable->d_common.d_type;
|
|
|
|
PyObject *self = PEEK(total_args);
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(self, d_type), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
int nargs = total_args-1;
|
|
|
|
STACK_SHRINK(nargs);
|
|
|
|
_PyCFunctionFastWithKeywords cfunc =
|
|
|
|
(_PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
|
|
|
|
PyObject *res = cfunc(self, stack_pointer, nargs - KWNAMES_LEN(),
|
2022-11-10 20:34:57 +08:00
|
|
|
kwnames);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
2022-11-10 20:34:57 +08:00
|
|
|
kwnames = NULL;
|
2022-11-03 12:31:26 +08:00
|
|
|
|
|
|
|
/* Free the arguments. */
|
|
|
|
for (int i = 0; i < nargs; i++) {
|
|
|
|
Py_DECREF(stack_pointer[i]);
|
|
|
|
}
|
|
|
|
Py_DECREF(self);
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
assert(oparg == 0 || oparg == 1);
|
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
DEOPT_IF(total_args != 1, CALL);
|
|
|
|
PyMethodDescrObject *callable = (PyMethodDescrObject *)SECOND();
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(callable, &PyMethodDescr_Type), CALL);
|
|
|
|
PyMethodDef *meth = callable->d_method;
|
|
|
|
PyObject *self = TOP();
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(self, callable->d_common.d_type), CALL);
|
|
|
|
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;
|
|
|
|
}
|
2022-11-16 01:53:39 +08:00
|
|
|
PyObject *res = _PyCFunction_TrampolineCall(cfunc, self, NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
_Py_LeaveRecursiveCallTstate(tstate);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
Py_DECREF(self);
|
|
|
|
STACK_SHRINK(oparg + 1);
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_FAST) {
|
2022-11-10 20:34:57 +08:00
|
|
|
assert(kwnames == NULL);
|
2022-11-03 12:31:26 +08:00
|
|
|
int is_meth = is_method(stack_pointer, oparg);
|
|
|
|
int total_args = oparg + is_meth;
|
|
|
|
PyMethodDescrObject *callable =
|
|
|
|
(PyMethodDescrObject *)PEEK(total_args + 1);
|
|
|
|
/* Builtin METH_FASTCALL methods, without keywords */
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(callable, &PyMethodDescr_Type), CALL);
|
|
|
|
PyMethodDef *meth = callable->d_method;
|
|
|
|
DEOPT_IF(meth->ml_flags != METH_FASTCALL, CALL);
|
|
|
|
PyObject *self = PEEK(total_args);
|
|
|
|
DEOPT_IF(!Py_IS_TYPE(self, callable->d_common.d_type), CALL);
|
|
|
|
STAT_INC(CALL, hit);
|
|
|
|
_PyCFunctionFast cfunc =
|
|
|
|
(_PyCFunctionFast)(void(*)(void))meth->ml_meth;
|
|
|
|
int nargs = total_args-1;
|
|
|
|
STACK_SHRINK(nargs);
|
|
|
|
PyObject *res = cfunc(self, stack_pointer, nargs);
|
|
|
|
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
|
|
|
|
/* Clear the stack of the arguments. */
|
|
|
|
for (int i = 0; i < nargs; i++) {
|
|
|
|
Py_DECREF(stack_pointer[i]);
|
|
|
|
}
|
|
|
|
Py_DECREF(self);
|
|
|
|
STACK_SHRINK(2-is_meth);
|
|
|
|
SET_TOP(res);
|
|
|
|
Py_DECREF(callable);
|
|
|
|
if (res == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2022-11-11 00:46:56 +08:00
|
|
|
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
|
2022-11-03 12:31:26 +08:00
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CALL_FUNCTION_EX) {
|
|
|
|
PREDICTED(CALL_FUNCTION_EX);
|
|
|
|
PyObject *func, *callargs, *kwargs = NULL, *result;
|
|
|
|
if (oparg & 0x01) {
|
|
|
|
kwargs = POP();
|
|
|
|
// DICT_MERGE is called before this opcode if there are kwargs.
|
|
|
|
// It converts all dict subtypes in kwargs into regular dicts.
|
|
|
|
assert(PyDict_CheckExact(kwargs));
|
|
|
|
}
|
|
|
|
callargs = POP();
|
|
|
|
func = TOP();
|
|
|
|
if (!PyTuple_CheckExact(callargs)) {
|
|
|
|
if (check_args_iterable(tstate, func, callargs) < 0) {
|
|
|
|
Py_DECREF(callargs);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_SETREF(callargs, PySequence_Tuple(callargs));
|
|
|
|
if (callargs == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert(PyTuple_CheckExact(callargs));
|
|
|
|
|
|
|
|
result = do_call_core(tstate, func, callargs, kwargs, cframe.use_tracing);
|
|
|
|
Py_DECREF(func);
|
|
|
|
Py_DECREF(callargs);
|
|
|
|
Py_XDECREF(kwargs);
|
|
|
|
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
assert(TOP() == NULL);
|
|
|
|
SET_TOP(result);
|
|
|
|
if (result == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
CHECK_EVAL_BREAKER();
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(MAKE_FUNCTION) {
|
|
|
|
PyObject *codeobj = POP();
|
|
|
|
PyFunctionObject *func = (PyFunctionObject *)
|
|
|
|
PyFunction_New(codeobj, GLOBALS());
|
|
|
|
|
|
|
|
Py_DECREF(codeobj);
|
|
|
|
if (func == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (oparg & 0x08) {
|
|
|
|
assert(PyTuple_CheckExact(TOP()));
|
|
|
|
func->func_closure = POP();
|
|
|
|
}
|
|
|
|
if (oparg & 0x04) {
|
|
|
|
assert(PyTuple_CheckExact(TOP()));
|
|
|
|
func->func_annotations = POP();
|
|
|
|
}
|
|
|
|
if (oparg & 0x02) {
|
|
|
|
assert(PyDict_CheckExact(TOP()));
|
|
|
|
func->func_kwdefaults = POP();
|
|
|
|
}
|
|
|
|
if (oparg & 0x01) {
|
|
|
|
assert(PyTuple_CheckExact(TOP()));
|
|
|
|
func->func_defaults = POP();
|
|
|
|
}
|
|
|
|
|
2022-12-09 20:18:45 +08:00
|
|
|
func->func_version = ((PyCodeObject *)codeobj)->co_version;
|
2022-11-03 12:31:26 +08:00
|
|
|
PUSH((PyObject *)func);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(RETURN_GENERATOR) {
|
|
|
|
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 20:34:57 +08:00
|
|
|
assert(frame != &entry_frame);
|
|
|
|
_PyInterpreterFrame *prev = frame->previous;
|
|
|
|
_PyThreadState_PopFrame(tstate, frame);
|
|
|
|
frame = cframe.current_frame = prev;
|
|
|
|
_PyFrame_StackPush(frame, (PyObject *)gen);
|
|
|
|
goto resume_frame;
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(BUILD_SLICE) {
|
|
|
|
PyObject *start, *stop, *step, *slice;
|
|
|
|
if (oparg == 3)
|
|
|
|
step = POP();
|
|
|
|
else
|
|
|
|
step = NULL;
|
|
|
|
stop = POP();
|
|
|
|
start = TOP();
|
|
|
|
slice = PySlice_New(start, stop, step);
|
|
|
|
Py_DECREF(start);
|
|
|
|
Py_DECREF(stop);
|
|
|
|
Py_XDECREF(step);
|
|
|
|
SET_TOP(slice);
|
|
|
|
if (slice == NULL)
|
|
|
|
goto error;
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(FORMAT_VALUE) {
|
|
|
|
/* Handles f-string value formatting. */
|
|
|
|
PyObject *result;
|
|
|
|
PyObject *fmt_spec;
|
|
|
|
PyObject *value;
|
|
|
|
PyObject *(*conv_fn)(PyObject *);
|
|
|
|
int which_conversion = oparg & FVC_MASK;
|
|
|
|
int have_fmt_spec = (oparg & FVS_MASK) == FVS_HAVE_SPEC;
|
|
|
|
|
|
|
|
fmt_spec = have_fmt_spec ? POP() : NULL;
|
|
|
|
value = POP();
|
|
|
|
|
|
|
|
/* See if any conversion is specified. */
|
|
|
|
switch (which_conversion) {
|
|
|
|
case FVC_NONE: conv_fn = NULL; break;
|
|
|
|
case FVC_STR: conv_fn = PyObject_Str; break;
|
|
|
|
case FVC_REPR: conv_fn = PyObject_Repr; break;
|
|
|
|
case FVC_ASCII: conv_fn = PyObject_ASCII; break;
|
|
|
|
default:
|
|
|
|
_PyErr_Format(tstate, PyExc_SystemError,
|
|
|
|
"unexpected conversion flag %d",
|
|
|
|
which_conversion);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there's a conversion function, call it and replace
|
|
|
|
value with that result. Otherwise, just use value,
|
|
|
|
without conversion. */
|
|
|
|
if (conv_fn != NULL) {
|
|
|
|
result = conv_fn(value);
|
|
|
|
Py_DECREF(value);
|
|
|
|
if (result == NULL) {
|
|
|
|
Py_XDECREF(fmt_spec);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
value = result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If value is a unicode object, and there's no fmt_spec,
|
|
|
|
then we know the result of format(value) is value
|
|
|
|
itself. In that case, skip calling format(). I plan to
|
|
|
|
move this optimization in to PyObject_Format()
|
|
|
|
itself. */
|
|
|
|
if (PyUnicode_CheckExact(value) && fmt_spec == NULL) {
|
|
|
|
/* Do nothing, just transfer ownership to result. */
|
|
|
|
result = value;
|
|
|
|
} else {
|
|
|
|
/* Actually call format(). */
|
|
|
|
result = PyObject_Format(value, fmt_spec);
|
|
|
|
Py_DECREF(value);
|
|
|
|
Py_XDECREF(fmt_spec);
|
|
|
|
if (result == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PUSH(result);
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(COPY) {
|
|
|
|
assert(oparg != 0);
|
|
|
|
PyObject *peek = PEEK(oparg);
|
2022-11-10 18:25:33 +08:00
|
|
|
PUSH(Py_NewRef(peek));
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
2022-11-10 02:50:09 +08:00
|
|
|
TARGET(BINARY_OP) {
|
|
|
|
PREDICTED(BINARY_OP);
|
2022-11-18 09:06:07 +08:00
|
|
|
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 1, "incorrect cache size");
|
2022-11-16 11:59:19 +08:00
|
|
|
PyObject *rhs = PEEK(1);
|
|
|
|
PyObject *lhs = PEEK(2);
|
2022-11-18 03:36:57 +08:00
|
|
|
PyObject *res;
|
2023-01-20 02:14:55 +08:00
|
|
|
#if ENABLE_SPECIALIZATION
|
2022-11-03 12:31:26 +08:00
|
|
|
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
|
2022-11-10 02:50:09 +08:00
|
|
|
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
|
|
|
|
assert(cframe.use_tracing == 0);
|
2022-11-03 12:31:26 +08:00
|
|
|
next_instr--;
|
|
|
|
_Py_Specialize_BinaryOp(lhs, rhs, next_instr, oparg, &GETLOCAL(0));
|
|
|
|
DISPATCH_SAME_OPARG();
|
|
|
|
}
|
2022-11-10 02:50:09 +08:00
|
|
|
STAT_INC(BINARY_OP, deferred);
|
|
|
|
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
|
2023-01-20 02:14:55 +08:00
|
|
|
#endif /* ENABLE_SPECIALIZATION */
|
2022-11-18 03:36:57 +08:00
|
|
|
assert(0 <= oparg);
|
|
|
|
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
|
|
|
|
assert(binary_ops[oparg]);
|
|
|
|
res = binary_ops[oparg](lhs, rhs);
|
|
|
|
Py_DECREF(lhs);
|
|
|
|
Py_DECREF(rhs);
|
|
|
|
if (res == NULL) goto pop_2_error;
|
|
|
|
STACK_SHRINK(1);
|
|
|
|
POKE(1, res);
|
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-09 05:31:27 +08:00
|
|
|
JUMPBY(1);
|
2022-11-18 03:36:57 +08:00
|
|
|
DISPATCH();
|
2022-11-03 12:31:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(SWAP) {
|
|
|
|
assert(oparg != 0);
|
|
|
|
PyObject *top = TOP();
|
|
|
|
SET_TOP(PEEK(oparg));
|
|
|
|
PEEK(oparg) = top;
|
|
|
|
DISPATCH();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(EXTENDED_ARG) {
|
|
|
|
assert(oparg);
|
|
|
|
assert(cframe.use_tracing == 0);
|
2022-11-10 02:50:09 +08:00
|
|
|
opcode = _Py_OPCODE(*next_instr);
|
|
|
|
oparg = oparg << 8 | _Py_OPARG(*next_instr);
|
|
|
|
PRE_DISPATCH_GOTO();
|
2022-11-03 12:31:26 +08:00
|
|
|
DISPATCH_GOTO();
|
|
|
|
}
|
|
|
|
|
|
|
|
TARGET(CACHE) {
|
|
|
|
Py_UNREACHABLE();
|
|
|
|
}
|