Skip to content

Instantly share code, notes, and snippets.

@markshannon

markshannon/cases.patch

Created November 21, 2023 17:07
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save markshannon/a9611f9b72db98dd23d17dfb33ad5aba to your computer and use it in GitHub Desktop.
Save markshannon/a9611f9b72db98dd23d17dfb33ad5aba to your computer and use it in GitHub Desktop.
Download ZIP
Raw
cases.patch
commit be741bcbc978520403c401b6ab6d2196ebe7971d
Author: Mark Shannon <mark@hotpy.org>
Date: Thu Nov 16 10:49:06 2023 +0000
Reorganize code gen
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 587efc9268a..dcc2cb05ac9 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -1,4 +1,4 @@
-// This file is generated by Tools/cases_generator/generate_cases.py
+// This file is generated by /home/mark/cpython/Tools/cases_generator/tier1_generator.py
// from:
// Python/bytecodes.c
// Do not edit!
@@ -16,13 +16,14 @@
PyObject *exit;
PyObject *res;
mgr = stack_pointer[-1];
+
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);
+ "'%.200s' object does not support the "
+ "asynchronous context manager protocol",
+ Py_TYPE(mgr)->tp_name);
}
GOTO_ERROR(error);
}
@@ -30,10 +31,10 @@
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);
+ "'%.200s' object does not support the "
+ "asynchronous context manager protocol "
+ "(missed __aexit__ method)",
+ Py_TYPE(mgr)->tp_name);
}
Py_DECREF(enter);
GOTO_ERROR(error);
@@ -45,12 +46,12 @@
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- STACK_GROW(1);
- stack_pointer[-2] = exit;
- stack_pointer[-1] = res;
+ stack_pointer[-1] = exit;
+ stack_pointer[0] = res;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(BEFORE_WITH) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -60,15 +61,14 @@
PyObject *res;
mgr = stack_pointer[-1];
/* pop the context manager, push its __exit__ and the
- * value returned from calling its __enter__
- */
- PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__enter__));
+ * value returned from calling its __enter__
+ */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);
+ "'%.200s' object does not support the "
+ "context manager protocol",
+ Py_TYPE(mgr)->tp_name);
}
GOTO_ERROR(error);
}
@@ -76,10 +76,10 @@
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);
+ "'%.200s' object does not support the "
+ "context manager protocol "
+ "(missed __exit__ method)",
+ Py_TYPE(mgr)->tp_name);
}
Py_DECREF(enter);
GOTO_ERROR(error);
@@ -91,19 +91,18 @@
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- STACK_GROW(1);
- stack_pointer[-2] = exit;
- stack_pointer[-1] = res;
+ stack_pointer[-1] = exit;
+ stack_pointer[0] = res;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(BINARY_OP) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(BINARY_OP);
PREDICTED(BINARY_OP);
_Py_CODEUNIT *this_instr = next_instr - 2;
- static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 1, "incorrect cache size");
PyObject *rhs;
PyObject *lhs;
PyObject *res;
@@ -112,8 +111,9 @@
lhs = stack_pointer[-2];
{
uint16_t counter = read_u16(&this_instr[1].cache);
+
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_BinaryOp(lhs, rhs, next_instr, oparg, LOCALS_ARRAY);
@@ -121,23 +121,24 @@
}
STAT_INC(BINARY_OP, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
assert(NB_ADD <= oparg);
assert(oparg <= NB_INPLACE_XOR);
}
// _BINARY_OP
{
+
assert(_PyEval_BinaryOps[oparg]);
res = _PyEval_BinaryOps[oparg](lhs, rhs);
Py_DECREF(lhs);
Py_DECREF(rhs);
if (res == NULL) goto pop_2_error;
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_OP_ADD_FLOAT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -154,17 +155,18 @@
}
// _BINARY_OP_ADD_FLOAT
{
+
STAT_INC(BINARY_OP, hit);
double dres =
- ((PyFloatObject *)left)->ob_fval +
- ((PyFloatObject *)right)->ob_fval;
+ ((PyFloatObject *)left)->ob_fval +
+ ((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_OP_ADD_INT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -181,17 +183,18 @@
}
// _BINARY_OP_ADD_INT
{
+
STAT_INC(BINARY_OP, hit);
res = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_OP_ADD_UNICODE) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -203,22 +206,24 @@
right = stack_pointer[-1];
left = stack_pointer[-2];
{
+
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
}
// _BINARY_OP_ADD_UNICODE
{
+
STAT_INC(BINARY_OP, hit);
res = PyUnicode_Concat(left, right);
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
if (res == NULL) goto pop_2_error;
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_OP_INPLACE_ADD_UNICODE) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -234,34 +239,34 @@
}
// _BINARY_OP_INPLACE_ADD_UNICODE
{
+
assert(next_instr->op.code == STORE_FAST);
PyObject **target_local = &GETLOCAL(next_instr->op.arg);
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);
+ *
+ * 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);
if (*target_local == NULL) goto pop_2_error;
// The STORE_FAST is already done.
- assert(next_instr->op.code == STORE_FAST);
+ assert(next_instr->op.code == STORE_FAST);
SKIP_OVER(1);
}
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(BINARY_OP_MULTIPLY_FLOAT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -278,17 +283,18 @@
}
// _BINARY_OP_MULTIPLY_FLOAT
{
+
STAT_INC(BINARY_OP, hit);
double dres =
- ((PyFloatObject *)left)->ob_fval *
- ((PyFloatObject *)right)->ob_fval;
+ ((PyFloatObject *)left)->ob_fval *
+ ((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_OP_MULTIPLY_INT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -305,17 +311,18 @@
}
// _BINARY_OP_MULTIPLY_INT
{
+
STAT_INC(BINARY_OP, hit);
res = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_OP_SUBTRACT_FLOAT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -327,22 +334,24 @@
right = stack_pointer[-1];
left = stack_pointer[-2];
{
+
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
}
// _BINARY_OP_SUBTRACT_FLOAT
{
+
STAT_INC(BINARY_OP, hit);
double dres =
- ((PyFloatObject *)left)->ob_fval -
- ((PyFloatObject *)right)->ob_fval;
+ ((PyFloatObject *)left)->ob_fval -
+ ((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_OP_SUBTRACT_INT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -359,17 +368,18 @@
}
// _BINARY_OP_SUBTRACT_INT
{
+
STAT_INC(BINARY_OP, hit);
res = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_SLICE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -381,10 +391,11 @@
stop = stack_pointer[-1];
start = stack_pointer[-2];
container = stack_pointer[-3];
+
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
// Can't use ERROR_IF() here, because we haven't
- // DECREF'ed container yet, and we still own slice.
- if (slice == NULL) {
+ // DECREF'ed container yet, and we still own slice.
+ if (slice == NULL) {
res = NULL;
}
else {
@@ -393,18 +404,17 @@
}
Py_DECREF(container);
if (res == NULL) goto pop_3_error;
- STACK_SHRINK(2);
- stack_pointer[-1] = res;
+ stack_pointer[-3] = res;
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(BINARY_SUBSCR) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(BINARY_SUBSCR);
PREDICTED(BINARY_SUBSCR);
_Py_CODEUNIT *this_instr = next_instr - 2;
- static_assert(INLINE_CACHE_ENTRIES_BINARY_SUBSCR == 1, "incorrect cache size");
PyObject *sub;
PyObject *container;
PyObject *res;
@@ -414,7 +424,7 @@
{
uint16_t counter = read_u16(&this_instr[1].cache);
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_BinarySubscr(container, sub, next_instr);
@@ -422,7 +432,7 @@
}
STAT_INC(BINARY_SUBSCR, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _BINARY_SUBSCR
{
@@ -431,11 +441,11 @@
Py_DECREF(sub);
if (res == NULL) goto pop_2_error;
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_SUBSCR_DICT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -445,6 +455,7 @@
PyObject *res;
sub = stack_pointer[-1];
dict = stack_pointer[-2];
+
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
int rc = PyDict_GetItemRef(dict, sub, &res);
@@ -454,11 +465,13 @@
Py_DECREF(dict);
Py_DECREF(sub);
if (rc <= 0) goto pop_2_error;
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ // not found or error
+
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_SUBSCR_GETITEM) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -489,7 +502,7 @@
frame->return_offset = (uint16_t)(next_instr - this_instr);
DISPATCH_INLINED(new_frame);
}
-
+
TARGET(BINARY_SUBSCR_LIST_INT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -501,9 +514,8 @@
list = stack_pointer[-2];
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
-
// Deopt unless 0 <= sub < PyList_Size(list)
- DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), BINARY_SUBSCR);
+DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), BINARY_SUBSCR);
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
DEOPT_IF(index >= PyList_GET_SIZE(list), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
@@ -512,11 +524,11 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_SUBSCR_STR_INT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -532,17 +544,17 @@
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index, BINARY_SUBSCR);
// Specialize for reading an ASCII character from any string:
- Py_UCS4 c = PyUnicode_READ_CHAR(str, index);
+ Py_UCS4 c = PyUnicode_READ_CHAR(str, index);
DEOPT_IF(Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c, BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
res = (PyObject*)&_Py_SINGLETON(strings).ascii[c];
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(str);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BINARY_SUBSCR_TUPLE_INT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -554,9 +566,8 @@
tuple = stack_pointer[-2];
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
-
// Deopt unless 0 <= sub < PyTuple_Size(list)
- DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), BINARY_SUBSCR);
+DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), BINARY_SUBSCR);
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
DEOPT_IF(index >= PyTuple_GET_SIZE(tuple), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
@@ -565,11 +576,11 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(tuple);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(BUILD_CONST_KEY_MAP) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -578,89 +589,88 @@
PyObject **values;
PyObject *map;
keys = stack_pointer[-1];
- values = stack_pointer - 1 - oparg;
+ values = &stack_pointer[-1 - oparg];
+
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
- "bad BUILD_CONST_KEY_MAP keys argument");
- GOTO_ERROR(error); // Pop the keys and values.
- }
+ "bad BUILD_CONST_KEY_MAP keys argument");
+ GOTO_ERROR(error); // Pop the keys and values.
+ }
map = _PyDict_FromItems(
- &PyTuple_GET_ITEM(keys, 0), 1,
- values, 1, oparg);
+ &PyTuple_GET_ITEM(keys, 0), 1,
+ values, 1, oparg);
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
- if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
- STACK_SHRINK(oparg);
- stack_pointer[-1] = map;
+ if (map == NULL) { stack_pointer += -1 - oparg; goto error; }
+ stack_pointer[-1 - oparg] = map;
+ stack_pointer += -oparg;
DISPATCH();
}
-
+
TARGET(BUILD_LIST) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(BUILD_LIST);
PyObject **values;
PyObject *list;
- values = stack_pointer - oparg;
+ values = &stack_pointer[-oparg];
list = _PyList_FromArraySteal(values, oparg);
- if (list == NULL) { STACK_SHRINK(oparg); goto error; }
- STACK_SHRINK(oparg);
- STACK_GROW(1);
- stack_pointer[-1] = list;
+ if (list == NULL) { stack_pointer += -oparg; goto error; }
+ stack_pointer[-oparg] = list;
+ stack_pointer += 1 - oparg;
DISPATCH();
}
-
+
TARGET(BUILD_MAP) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(BUILD_MAP);
PyObject **values;
PyObject *map;
- values = stack_pointer - oparg*2;
+ values = &stack_pointer[-oparg*2];
+
map = _PyDict_FromItems(
- values, 2,
- values+1, 2,
- oparg);
+ values, 2,
+ values+1, 2,
+ oparg);
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
- if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
- STACK_SHRINK(oparg*2);
- STACK_GROW(1);
- stack_pointer[-1] = map;
+ if (map == NULL) { stack_pointer += -oparg*2; goto error; }
+ stack_pointer[-oparg*2] = map;
+ stack_pointer += 1 - oparg*2;
DISPATCH();
}
-
+
TARGET(BUILD_SET) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(BUILD_SET);
PyObject **values;
PyObject *set;
- values = stack_pointer - oparg;
+ values = &stack_pointer[-oparg];
set = PySet_New(NULL);
if (set == NULL)
- GOTO_ERROR(error);
+ GOTO_ERROR(error);
int err = 0;
for (int i = 0; i < oparg; i++) {
PyObject *item = values[i];
if (err == 0)
- err = PySet_Add(set, item);
+ err = PySet_Add(set, item);
Py_DECREF(item);
}
if (err != 0) {
Py_DECREF(set);
- if (true) { STACK_SHRINK(oparg); goto error; }
+ if (true) { stack_pointer += -oparg; goto error; }
}
- STACK_SHRINK(oparg);
- STACK_GROW(1);
- stack_pointer[-1] = set;
+ stack_pointer[-oparg] = set;
+ stack_pointer += 1 - oparg;
DISPATCH();
}
-
+
TARGET(BUILD_SLICE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -669,80 +679,78 @@
PyObject *stop;
PyObject *start;
PyObject *slice;
- if (oparg == 3) { step = stack_pointer[-(oparg == 3 ? 1 : 0)]; }
- stop = stack_pointer[-1 - (oparg == 3 ? 1 : 0)];
- start = stack_pointer[-2 - (oparg == 3 ? 1 : 0)];
+ if (oparg == 3) { step = stack_pointer[-(((oparg == 3) ? 1 : 0))]; }
+ stop = stack_pointer[-1 - (((oparg == 3) ? 1 : 0))];
+ start = stack_pointer[-2 - (((oparg == 3) ? 1 : 0))];
+
slice = PySlice_New(start, stop, step);
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- STACK_SHRINK(((oparg == 3) ? 1 : 0));
- STACK_SHRINK(1);
- stack_pointer[-1] = slice;
+ if (slice == NULL) { stack_pointer += -2 - (((oparg == 3) ? 1 : 0)); goto error; }
+ stack_pointer[-2 - (((oparg == 3) ? 1 : 0))] = slice;
+ stack_pointer += -1 - (((oparg == 3) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(BUILD_STRING) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(BUILD_STRING);
PyObject **pieces;
PyObject *str;
- pieces = stack_pointer - oparg;
+ pieces = &stack_pointer[-oparg];
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
- if (str == NULL) { STACK_SHRINK(oparg); goto error; }
- STACK_SHRINK(oparg);
- STACK_GROW(1);
- stack_pointer[-1] = str;
+ if (str == NULL) { stack_pointer += -oparg; goto error; }
+ stack_pointer[-oparg] = str;
+ stack_pointer += 1 - oparg;
DISPATCH();
}
-
+
TARGET(BUILD_TUPLE) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(BUILD_TUPLE);
PyObject **values;
PyObject *tup;
- values = stack_pointer - oparg;
+ values = &stack_pointer[-oparg];
tup = _PyTuple_FromArraySteal(values, oparg);
- if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
- STACK_SHRINK(oparg);
- STACK_GROW(1);
- stack_pointer[-1] = tup;
+ if (tup == NULL) { stack_pointer += -oparg; goto error; }
+ stack_pointer[-oparg] = tup;
+ stack_pointer += 1 - oparg;
DISPATCH();
}
-
+
TARGET(CACHE) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(CACHE);
+
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
}
-
+
TARGET(CALL) {
frame->instr_ptr = next_instr;
next_instr += 4;
INSTRUCTION_STATS(CALL);
PREDICTED(CALL);
_Py_CODEUNIT *this_instr = next_instr - 4;
- static_assert(INLINE_CACHE_ENTRIES_CALL == 3, "incorrect cache size");
PyObject **args;
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
// _SPECIALIZE_CALL
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
{
uint16_t counter = read_u16(&this_instr[1].cache);
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_Call(callable, next_instr, oparg + (self_or_null != NULL));
@@ -750,12 +758,13 @@
}
STAT_INC(CALL, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _CALL
{
+
// oparg counts all of the args, but *not* self:
- int total_args = oparg;
+ int total_args = oparg;
if (self_or_null != NULL) {
args--;
total_args++;
@@ -771,7 +780,7 @@
callable = method;
}
// Check if the call can be inlined or not
- if (Py_TYPE(callable) == &PyFunction_Type &&
+ if (Py_TYPE(callable) == &PyFunction_Type &&
tstate->interp->eval_frame == NULL &&
((PyFunctionObject *)callable)->vectorcall == _PyFunction_Vectorcall)
{
@@ -782,10 +791,10 @@
args, total_args, NULL
);
// Manipulate stack directly since we leave using DISPATCH_INLINED().
- STACK_SHRINK(oparg + 2);
+ STACK_SHRINK(oparg + 2);
// The frame has stolen all the arguments from the stack,
- // so there is no need to clean them up.
- if (new_frame == NULL) {
+ // so there is no need to clean them up.
+ if (new_frame == NULL) {
GOTO_ERROR(error);
}
frame->return_offset = (uint16_t)(next_instr - this_instr);
@@ -798,7 +807,7 @@
NULL);
if (opcode == INSTRUMENTED_CALL) {
PyObject *arg = total_args == 0 ?
- &_PyInstrumentation_MISSING : args[0];
+ &_PyInstrumentation_MISSING : args[0];
if (res == NULL) {
_Py_call_instrumentation_exc2(
tstate, PY_MONITORING_EVENT_C_RAISE,
@@ -818,15 +827,14 @@
for (int i = 0; i < total_args; i++) {
Py_DECREF(args[i]);
}
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
}
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_ALLOC_AND_ENTER_INIT) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 4;
@@ -834,15 +842,15 @@
PyObject **args;
PyObject *null;
PyObject *callable;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
+
/* This instruction does the following:
- * 1. Creates the object (by calling ``object.__new__``)
- * 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
- * 3. Pushes the frame for ``__init__`` to the frame stack
- * */
- _PyCallCache *cache = (_PyCallCache *)&this_instr[1];
+ * 1. Creates the object (by calling ``object.__new__``)
+ * 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
+ * 3. Pushes the frame for ``__init__`` to the frame stack
+ * */_PyCallCache *cache = (_PyCallCache *)&this_instr[1];
DEOPT_IF(null != NULL, CALL);
DEOPT_IF(!PyType_Check(callable), CALL);
PyTypeObject *tp = (PyTypeObject *)callable;
@@ -880,23 +888,23 @@
frame = tstate->current_frame = init_frame;
CALL_STAT_INC(inlined_py_calls);
/* Account for pushing the extra frame.
- * We don't check recursion depth here,
- * as it will be checked after start_frame */
- tstate->py_recursion_remaining--;
+ * We don't check recursion depth here,
+ * as it will be checked after start_frame */tstate->py_recursion_remaining--;
goto start_frame;
}
-
+
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 4;
INSTRUCTION_STATS(CALL_BOUND_METHOD_EXACT_ARGS);
PyObject *null;
PyObject *callable;
+ PyObject *func;
PyObject *self;
PyObject *self_or_null;
- PyObject *func;
PyObject **args;
_PyInterpreterFrame *new_frame;
+ /* Skip 1 cache entry */
// _CHECK_PEP_523
{
DEOPT_IF(tstate->interp->eval_frame, CALL);
@@ -910,12 +918,13 @@
}
// _INIT_CALL_BOUND_METHOD_EXACT_ARGS
{
+
STAT_INC(CALL, hit);
self = Py_NewRef(((PyMethodObject *)callable)->im_self);
- stack_pointer[-1 - oparg] = self; // Patch stack as it is used by _INIT_CALL_PY_EXACT_ARGS
- func = Py_NewRef(((PyMethodObject *)callable)->im_func);
- stack_pointer[-2 - oparg] = func; // This is used by CALL, upon deoptimization
- Py_DECREF(callable);
+ stack_pointer[-1 - oparg] = self; // Patch stack as it is used by _INIT_CALL_PY_EXACT_ARGS
+ func = Py_NewRef(((PyMethodObject *)callable)->im_func);
+ stack_pointer[-2 - oparg] = func; // This is used by CALL, upon deoptimization
+ Py_DECREF(callable);
}
// _CHECK_FUNCTION_EXACT_ARGS
self_or_null = self;
@@ -930,13 +939,15 @@
}
// _CHECK_STACK_SPACE
{
+
PyFunctionObject *func = (PyFunctionObject *)callable;
PyCodeObject *code = (PyCodeObject *)func->func_code;
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), CALL);
DEOPT_IF(tstate->py_recursion_remaining <= 1, CALL);
}
// _INIT_CALL_PY_EXACT_ARGS
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
+ self_or_null = stack_pointer[-1 - oparg];
{
int argcount = oparg;
if (self_or_null != NULL) {
@@ -952,37 +963,39 @@
}
// _SAVE_RETURN_OFFSET
{
- #if TIER_ONE
+
+#if TIER_ONE
frame->return_offset = (uint16_t)(next_instr - this_instr);
- #endif
- #if TIER_TWO
+#endif
+#if TIER_TWO
frame->return_offset = oparg;
- #endif
+#endif
}
// _PUSH_FRAME
- STACK_SHRINK(oparg);
- STACK_SHRINK(2);
{
// Write it out explicitly because it's subtly different.
- // Eventually this should be the only occurrence of this code.
- assert(tstate->interp->eval_frame == NULL);
- STORE_SP();
+ // Eventually this should be the only occurrence of this code.
+ assert(tstate->interp->eval_frame == NULL);
+ stack_pointer += -2 - oparg;
+ _PyFrame_SetStackPointer(frame, stack_pointer);
new_frame->previous = frame;
CALL_STAT_INC(inlined_py_calls);
frame = tstate->current_frame = new_frame;
tstate->py_recursion_remaining--;
LOAD_SP();
LOAD_IP(0);
- #if LLTRACE && TIER_ONE
+#if LLTRACE && TIER_ONE
lltrace = maybe_lltrace_resume_frame(frame, &entry_frame, GLOBALS());
if (lltrace < 0) {
goto exit_unwind;
}
- #endif
+#endif
+
}
+ stack_pointer += (((0) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(CALL_BUILTIN_CLASS) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -991,9 +1004,10 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
+
int total_args = oparg;
if (self_or_null != NULL) {
args--;
@@ -1009,14 +1023,13 @@
Py_DECREF(args[i]);
}
Py_DECREF(tp);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_BUILTIN_FAST) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1025,9 +1038,10 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
+
/* Builtin METH_FASTCALL functions, without keywords */
int total_args = oparg;
if (self_or_null != NULL) {
@@ -1044,25 +1058,23 @@
args,
total_args);
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
-
/* Free the arguments. */
for (int i = 0; i < total_args; i++) {
Py_DECREF(args[i]);
}
Py_DECREF(callable);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- /* 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.
- */
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ /* 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.
+ */
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_BUILTIN_FAST_WITH_KEYWORDS) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1071,7 +1083,7 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
@@ -1085,24 +1097,22 @@
STAT_INC(CALL, hit);
/* res = func(self, args, nargs, kwnames) */
_PyCFunctionFastWithKeywords cfunc =
- (_PyCFunctionFastWithKeywords)(void(*)(void))
- PyCFunction_GET_FUNCTION(callable);
+ (_PyCFunctionFastWithKeywords)(void(*)(void))
+ PyCFunction_GET_FUNCTION(callable);
res = cfunc(PyCFunction_GET_SELF(callable), args, total_args, NULL);
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
-
/* Free the arguments. */
for (int i = 0; i < total_args; i++) {
Py_DECREF(args[i]);
}
Py_DECREF(callable);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_BUILTIN_O) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1111,7 +1121,7 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
/* Builtin METH_O functions */
@@ -1126,25 +1136,23 @@
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")) {
+ // function calls.
+ if (_Py_EnterRecursiveCallTstate(tstate, " while calling a Python object")) {
GOTO_ERROR(error);
}
PyObject *arg = args[0];
res = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable), arg);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
-
Py_DECREF(arg);
Py_DECREF(callable);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_FUNCTION_EX) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -1155,12 +1163,13 @@
PyObject *callargs;
PyObject *func;
PyObject *result;
- if (oparg & 1) { kwargs = stack_pointer[-(oparg & 1 ? 1 : 0)]; }
- callargs = stack_pointer[-1 - (oparg & 1 ? 1 : 0)];
- func = stack_pointer[-3 - (oparg & 1 ? 1 : 0)];
+ if (oparg & 1) { kwargs = stack_pointer[-((oparg & 1))]; }
+ callargs = stack_pointer[-1 - ((oparg & 1))];
+ func = stack_pointer[-3 - ((oparg & 1))];
+
// DICT_MERGE is called before this opcode if there are kwargs.
- // It converts all dict subtypes in kwargs into regular dicts.
- assert(kwargs == NULL || PyDict_CheckExact(kwargs));
+ // It converts all dict subtypes in kwargs into regular dicts.
+ assert(kwargs == NULL || PyDict_CheckExact(kwargs));
if (!PyTuple_CheckExact(callargs)) {
if (check_args_iterable(tstate, func, callargs) < 0) {
GOTO_ERROR(error);
@@ -1177,7 +1186,7 @@
!PyFunction_Check(func) && !PyMethod_Check(func)
) {
PyObject *arg = PyTuple_GET_SIZE(callargs) > 0 ?
- PyTuple_GET_ITEM(callargs, 0) : Py_None;
+ PyTuple_GET_ITEM(callargs, 0) : Py_None;
int err = _Py_call_instrumentation_2args(
tstate, PY_MONITORING_EVENT_CALL,
frame, this_instr, func, arg);
@@ -1205,12 +1214,11 @@
Py_ssize_t nargs = PyTuple_GET_SIZE(callargs);
int code_flags = ((PyCodeObject *)PyFunction_GET_CODE(func))->co_flags;
PyObject *locals = code_flags & CO_OPTIMIZED ? NULL : Py_NewRef(PyFunction_GET_GLOBALS(func));
-
_PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit_Ex(tstate,
- (PyFunctionObject *)func, locals,
- nargs, callargs, kwargs);
+ (PyFunctionObject *)func, locals,
+ nargs, callargs, kwargs);
// Need to manually shrink the stack since we exit with DISPATCH_INLINED.
- STACK_SHRINK(oparg + 3);
+ STACK_SHRINK(oparg + 3);
if (new_frame == NULL) {
GOTO_ERROR(error);
}
@@ -1224,14 +1232,13 @@
Py_DECREF(callargs);
Py_XDECREF(kwargs);
assert(PEEK(2 + (oparg & 1)) == NULL);
- if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- STACK_SHRINK(((oparg & 1) ? 1 : 0));
- STACK_SHRINK(2);
- stack_pointer[-1] = result;
+ if (result == NULL) { stack_pointer += -3 - ((oparg & 1)); goto error; }
+ stack_pointer[-3 - ((oparg & 1))] = result;
+ stack_pointer += -2 - ((oparg & 1));
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_INTRINSIC_1) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -1246,7 +1253,7 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(CALL_INTRINSIC_2) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -1261,11 +1268,11 @@
Py_DECREF(value2);
Py_DECREF(value1);
if (res == NULL) goto pop_2_error;
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(CALL_ISINSTANCE) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1274,9 +1281,10 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
+
/* isinstance(o, o2) */
int total_args = oparg;
if (self_or_null != NULL) {
@@ -1295,17 +1303,15 @@
}
res = PyBool_FromLong(retval);
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
-
Py_DECREF(inst);
Py_DECREF(cls);
Py_DECREF(callable);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
DISPATCH();
}
-
+
TARGET(CALL_KW) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -1318,11 +1324,12 @@
PyObject *callable;
PyObject *res;
kwnames = stack_pointer[-1];
- args = stack_pointer - 1 - oparg;
+ args = &stack_pointer[-1 - oparg];
self_or_null = stack_pointer[-2 - oparg];
callable = stack_pointer[-3 - oparg];
+
// oparg counts all of the args, but *not* self:
- int total_args = oparg;
+ int total_args = oparg;
if (self_or_null != NULL) {
args--;
total_args++;
@@ -1339,7 +1346,7 @@
}
int positional_args = total_args - (int)PyTuple_GET_SIZE(kwnames);
// Check if the call can be inlined or not
- if (Py_TYPE(callable) == &PyFunction_Type &&
+ if (Py_TYPE(callable) == &PyFunction_Type &&
tstate->interp->eval_frame == NULL &&
((PyFunctionObject *)callable)->vectorcall == _PyFunction_Vectorcall)
{
@@ -1351,10 +1358,10 @@
);
Py_DECREF(kwnames);
// Manipulate stack directly since we leave using DISPATCH_INLINED().
- STACK_SHRINK(oparg + 3);
+ STACK_SHRINK(oparg + 3);
// The frame has stolen all the arguments from the stack,
- // so there is no need to clean them up.
- if (new_frame == NULL) {
+ // so there is no need to clean them up.
+ if (new_frame == NULL) {
GOTO_ERROR(error);
}
assert(next_instr - this_instr == 1);
@@ -1368,7 +1375,7 @@
kwnames);
if (opcode == INSTRUMENTED_CALL_KW) {
PyObject *arg = total_args == 0 ?
- &_PyInstrumentation_MISSING : args[0];
+ &_PyInstrumentation_MISSING : args[0];
if (res == NULL) {
_Py_call_instrumentation_exc2(
tstate, PY_MONITORING_EVENT_C_RAISE,
@@ -1389,14 +1396,13 @@
for (int i = 0; i < total_args; i++) {
Py_DECREF(args[i]);
}
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_3_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(2);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -3 - oparg; goto error; }
+ stack_pointer[-3 - oparg] = res;
+ stack_pointer += -2 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_LEN) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1405,7 +1411,7 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
/* len(o) */
@@ -1425,16 +1431,14 @@
}
res = PyLong_FromSsize_t(len_i);
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
-
Py_DECREF(callable);
Py_DECREF(arg);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
DISPATCH();
}
-
+
TARGET(CALL_LIST_APPEND) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1442,9 +1446,10 @@
PyObject **args;
PyObject *self;
PyObject *callable;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
+
assert(oparg == 1);
PyInterpreterState *interp = tstate->interp;
DEOPT_IF(callable != interp->callable_cache.list_append, CALL);
@@ -1452,17 +1457,17 @@
DEOPT_IF(!PyList_Check(self), CALL);
STAT_INC(CALL, hit);
if (_PyList_AppendTakeRef((PyListObject *)self, args[0]) < 0) {
- goto pop_1_error; // Since arg is DECREF'ed already
- }
+ goto pop_1_error; // Since arg is DECREF'ed already
+ }
Py_DECREF(self);
Py_DECREF(callable);
STACK_SHRINK(3);
// Skip POP_TOP
- assert(next_instr->op.code == POP_TOP);
+ assert(next_instr->op.code == POP_TOP);
SKIP_OVER(1);
DISPATCH();
}
-
+
TARGET(CALL_METHOD_DESCRIPTOR_FAST) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1471,9 +1476,10 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
+
int total_args = oparg;
if (self_or_null != NULL) {
args--;
@@ -1488,7 +1494,7 @@
DEOPT_IF(!Py_IS_TYPE(self, method->d_common.d_type), CALL);
STAT_INC(CALL, hit);
_PyCFunctionFast cfunc =
- (_PyCFunctionFast)(void(*)(void))meth->ml_meth;
+ (_PyCFunctionFast)(void(*)(void))meth->ml_meth;
int nargs = total_args - 1;
res = cfunc(self, args + 1, nargs);
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
@@ -1497,14 +1503,13 @@
Py_DECREF(args[i]);
}
Py_DECREF(callable);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1513,7 +1518,7 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
int total_args = oparg;
@@ -1531,23 +1536,21 @@
STAT_INC(CALL, hit);
int nargs = total_args - 1;
_PyCFunctionFastWithKeywords cfunc =
- (_PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
+ (_PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
res = cfunc(self, args + 1, nargs, NULL);
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
-
/* Free the arguments. */
for (int i = 0; i < total_args; i++) {
Py_DECREF(args[i]);
}
Py_DECREF(callable);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_METHOD_DESCRIPTOR_NOARGS) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1556,7 +1559,7 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
assert(oparg == 0 || oparg == 1);
@@ -1575,8 +1578,8 @@
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")) {
+ // function calls.
+ if (_Py_EnterRecursiveCallTstate(tstate, " while calling a Python object")) {
GOTO_ERROR(error);
}
res = _PyCFunction_TrampolineCall(cfunc, self, NULL);
@@ -1584,14 +1587,13 @@
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
Py_DECREF(self);
Py_DECREF(callable);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_METHOD_DESCRIPTOR_O) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1600,7 +1602,7 @@
PyObject *self_or_null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
int total_args = oparg;
@@ -1619,8 +1621,8 @@
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")) {
+ // function calls.
+ if (_Py_EnterRecursiveCallTstate(tstate, " while calling a Python object")) {
GOTO_ERROR(error);
}
res = _PyCFunction_TrampolineCall(cfunc, self, arg);
@@ -1629,14 +1631,13 @@
Py_DECREF(self);
Py_DECREF(arg);
Py_DECREF(callable);
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_PY_EXACT_ARGS) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1645,6 +1646,7 @@
PyObject *callable;
PyObject **args;
_PyInterpreterFrame *new_frame;
+ /* Skip 1 cache entry */
// _CHECK_PEP_523
{
DEOPT_IF(tstate->interp->eval_frame, CALL);
@@ -1662,13 +1664,15 @@
}
// _CHECK_STACK_SPACE
{
+
PyFunctionObject *func = (PyFunctionObject *)callable;
PyCodeObject *code = (PyCodeObject *)func->func_code;
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), CALL);
DEOPT_IF(tstate->py_recursion_remaining <= 1, CALL);
}
// _INIT_CALL_PY_EXACT_ARGS
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
+ self_or_null = stack_pointer[-1 - oparg];
{
int argcount = oparg;
if (self_or_null != NULL) {
@@ -1684,37 +1688,39 @@
}
// _SAVE_RETURN_OFFSET
{
- #if TIER_ONE
+
+#if TIER_ONE
frame->return_offset = (uint16_t)(next_instr - this_instr);
- #endif
- #if TIER_TWO
+#endif
+#if TIER_TWO
frame->return_offset = oparg;
- #endif
+#endif
}
// _PUSH_FRAME
- STACK_SHRINK(oparg);
- STACK_SHRINK(2);
{
// Write it out explicitly because it's subtly different.
- // Eventually this should be the only occurrence of this code.
- assert(tstate->interp->eval_frame == NULL);
- STORE_SP();
+ // Eventually this should be the only occurrence of this code.
+ assert(tstate->interp->eval_frame == NULL);
+ stack_pointer += -2 - oparg;
+ _PyFrame_SetStackPointer(frame, stack_pointer);
new_frame->previous = frame;
CALL_STAT_INC(inlined_py_calls);
frame = tstate->current_frame = new_frame;
tstate->py_recursion_remaining--;
LOAD_SP();
LOAD_IP(0);
- #if LLTRACE && TIER_ONE
+#if LLTRACE && TIER_ONE
lltrace = maybe_lltrace_resume_frame(frame, &entry_frame, GLOBALS());
if (lltrace < 0) {
goto exit_unwind;
}
- #endif
+#endif
+
}
+ stack_pointer += (((0) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(CALL_PY_WITH_DEFAULTS) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1722,7 +1728,7 @@
PyObject **args;
PyObject *self_or_null;
PyObject *callable;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
uint32_t func_version = read_u32(&this_instr[2].cache);
@@ -1754,11 +1760,11 @@
new_frame->localsplus[i] = Py_NewRef(def);
}
// Manipulate stack and cache directly since we leave using DISPATCH_INLINED().
- STACK_SHRINK(oparg + 2);
+ STACK_SHRINK(oparg + 2);
frame->return_offset = (uint16_t)(next_instr - this_instr);
DISPATCH_INLINED(new_frame);
}
-
+
TARGET(CALL_STR_1) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1767,9 +1773,10 @@
PyObject *null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
+
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
DEOPT_IF(callable != (PyObject *)&PyUnicode_Type, CALL);
@@ -1777,15 +1784,14 @@
PyObject *arg = args[0];
res = PyObject_Str(arg);
Py_DECREF(arg);
- Py_DECREF(&PyUnicode_Type); // I.e., callable
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ Py_DECREF(&PyUnicode_Type); // I.e., callable
+if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_TUPLE_1) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1794,7 +1800,7 @@
PyObject *null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
assert(oparg == 1);
@@ -1804,15 +1810,14 @@
PyObject *arg = args[0];
res = PySequence_Tuple(arg);
Py_DECREF(arg);
- Py_DECREF(&PyTuple_Type); // I.e., tuple
- if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ Py_DECREF(&PyTuple_Type); // I.e., tuple
+if (res == NULL) { stack_pointer += -2 - oparg; goto error; }
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
DISPATCH();
}
-
+
TARGET(CALL_TYPE_1) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -1821,7 +1826,7 @@
PyObject *null;
PyObject *callable;
PyObject *res;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
assert(oparg == 1);
@@ -1831,13 +1836,13 @@
STAT_INC(CALL, hit);
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
- Py_DECREF(&PyType_Type); // I.e., callable
- STACK_SHRINK(oparg);
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ Py_DECREF(&PyType_Type); // I.e., callable
+
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
DISPATCH();
}
-
+
TARGET(CHECK_EG_MATCH) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -1848,7 +1853,7 @@
PyObject *match;
match_type = stack_pointer[-1];
exc_value = stack_pointer[-2];
- if (_PyEval_CheckExceptStarTypeValid(tstate, match_type) < 0) {
+ if (_PyEval_CheckExceptStarTypeValid(tstate, match_type) < 0) {
Py_DECREF(exc_value);
Py_DECREF(match_type);
if (true) goto pop_2_error;
@@ -1857,7 +1862,7 @@
match = NULL;
rest = NULL;
int res = _PyEval_ExceptionGroupMatch(exc_value, match_type,
- &match, &rest);
+ &match, &rest);
Py_DECREF(exc_value);
Py_DECREF(match_type);
if (res < 0) goto pop_2_error;
@@ -1872,7 +1877,7 @@
stack_pointer[-1] = match;
DISPATCH();
}
-
+
TARGET(CHECK_EXC_MATCH) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -1884,8 +1889,8 @@
left = stack_pointer[-2];
assert(PyExceptionInstance_Check(left));
if (_PyEval_CheckExceptTypeValid(tstate, right) < 0) {
- Py_DECREF(right);
- if (true) goto pop_1_error;
+ Py_DECREF(right);
+ if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
@@ -1894,7 +1899,7 @@
stack_pointer[-1] = b;
DISPATCH();
}
-
+
TARGET(CLEANUP_THROW) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -1922,19 +1927,18 @@
monitor_reraise(tstate, frame, this_instr);
goto exception_unwind;
}
- STACK_SHRINK(1);
- stack_pointer[-2] = none;
- stack_pointer[-1] = value;
+ stack_pointer[-3] = none;
+ stack_pointer[-2] = value;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(COMPARE_OP) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(COMPARE_OP);
PREDICTED(COMPARE_OP);
_Py_CODEUNIT *this_instr = next_instr - 2;
- static_assert(INLINE_CACHE_ENTRIES_COMPARE_OP == 1, "incorrect cache size");
PyObject *right;
PyObject *left;
PyObject *res;
@@ -1943,8 +1947,9 @@
left = stack_pointer[-2];
{
uint16_t counter = read_u16(&this_instr[1].cache);
+
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_CompareOp(left, right, next_instr, oparg);
@@ -1952,7 +1957,7 @@
}
STAT_INC(COMPARE_OP, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _COMPARE_OP
{
@@ -1968,11 +1973,11 @@
res = res_bool ? Py_True : Py_False;
}
}
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(COMPARE_OP_FLOAT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -1988,16 +1993,17 @@
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);
+ int sign_ish = COMPARISON_BIT(dleft, dright);
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
// It's always a bool, so we don't care about oparg & 16.
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(COMPARE_OP_INT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -2013,20 +2019,21 @@
DEOPT_IF(!_PyLong_IsCompact((PyLongObject *)right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
assert(_PyLong_DigitCount((PyLongObject *)left) <= 1 &&
- _PyLong_DigitCount((PyLongObject *)right) <= 1);
+ _PyLong_DigitCount((PyLongObject *)right) <= 1);
Py_ssize_t ileft = _PyLong_CompactValue((PyLongObject *)left);
Py_ssize_t iright = _PyLong_CompactValue((PyLongObject *)right);
// 2 if <, 4 if >, 8 if ==; this matches the low 4 bits of the oparg
- int sign_ish = COMPARISON_BIT(ileft, iright);
+ int sign_ish = COMPARISON_BIT(ileft, iright);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
// It's always a bool, so we don't care about oparg & 16.
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(COMPARE_OP_STR) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -2048,11 +2055,12 @@
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
// It's always a bool, so we don't care about oparg & 16.
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(CONTAINS_OP) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2062,16 +2070,16 @@
PyObject *b;
right = stack_pointer[-1];
left = stack_pointer[-2];
- int res = PySequence_Contains(right, left);
+ int res = PySequence_Contains(right, left);
Py_DECREF(left);
Py_DECREF(right);
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
- STACK_SHRINK(1);
- stack_pointer[-1] = b;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(CONVERT_VALUE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2079,7 +2087,8 @@
PyObject *value;
PyObject *result;
value = stack_pointer[-1];
- convertion_func_ptr conv_fn;
+
+ convertion_func_ptr conv_fn;
assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
conv_fn = CONVERSION_FUNCTIONS[oparg];
result = conv_fn(value);
@@ -2088,7 +2097,7 @@
stack_pointer[-1] = result;
DISPATCH();
}
-
+
TARGET(COPY) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2096,13 +2105,14 @@
PyObject *bottom;
PyObject *top;
bottom = stack_pointer[-1 - (oparg-1)];
+
assert(oparg > 0);
top = Py_NewRef(bottom);
- STACK_GROW(1);
- stack_pointer[-1] = top;
+ stack_pointer[0] = top;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(COPY_FREE_VARS) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2119,7 +2129,7 @@
}
DISPATCH();
}
-
+
TARGET(DELETE_ATTR) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2130,19 +2140,20 @@
int err = PyObject_DelAttr(owner, name);
Py_DECREF(owner);
if (err) goto pop_1_error;
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(DELETE_DEREF) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(DELETE_DEREF);
+
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
// Can't use ERROR_IF here.
- // Fortunately we don't need its superpower.
- if (oldobj == NULL) {
+ // Fortunately we don't need its superpower.
+ if (oldobj == NULL) {
_PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg);
GOTO_ERROR(error);
}
@@ -2150,7 +2161,7 @@
Py_DECREF(oldobj);
DISPATCH();
}
-
+
TARGET(DELETE_FAST) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2160,7 +2171,7 @@
SETLOCAL(oparg, NULL);
DISPATCH();
}
-
+
TARGET(DELETE_GLOBAL) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2169,16 +2180,16 @@
int err;
err = PyDict_DelItem(GLOBALS(), name);
// Can't use ERROR_IF here.
- if (err != 0) {
+ if (err != 0) {
if (_PyErr_ExceptionMatches(tstate, PyExc_KeyError)) {
_PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
- NAME_ERROR_MSG, name);
+ NAME_ERROR_MSG, name);
}
GOTO_ERROR(error);
}
DISPATCH();
}
-
+
TARGET(DELETE_NAME) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2188,20 +2199,20 @@
int err;
if (ns == NULL) {
_PyErr_Format(tstate, PyExc_SystemError,
- "no locals when deleting %R", name);
+ "no locals when deleting %R", name);
GOTO_ERROR(error);
}
err = PyObject_DelItem(ns, name);
// Can't use ERROR_IF here.
- if (err != 0) {
+ if (err != 0) {
_PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
- NAME_ERROR_MSG,
- name);
+ NAME_ERROR_MSG,
+ name);
GOTO_ERROR(error);
}
DISPATCH();
}
-
+
TARGET(DELETE_SUBSCR) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2215,10 +2226,10 @@
Py_DECREF(container);
Py_DECREF(sub);
if (err) goto pop_2_error;
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(DICT_MERGE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2229,16 +2240,17 @@
update = stack_pointer[-1];
dict = stack_pointer[-2 - (oparg - 1)];
callable = stack_pointer[-5 - (oparg - 1)];
+
if (_PyDict_MergeEx(dict, update, 2) < 0) {
_PyEval_FormatKwargsError(tstate, callable, update);
Py_DECREF(update);
if (true) goto pop_1_error;
}
Py_DECREF(update);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(DICT_UPDATE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2250,17 +2262,17 @@
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);
+ "'%.200s' object is not a mapping",
+ Py_TYPE(update)->tp_name);
}
Py_DECREF(update);
if (true) goto pop_1_error;
}
Py_DECREF(update);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(END_ASYNC_FOR) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2281,29 +2293,29 @@
monitor_reraise(tstate, frame, this_instr);
goto exception_unwind;
}
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(END_FOR) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(END_FOR);
PyObject *value;
- // POP_TOP
+ // _POP_TOP
value = stack_pointer[-1];
{
Py_DECREF(value);
}
- // POP_TOP
+ // _POP_TOP
value = stack_pointer[-2];
{
Py_DECREF(value);
}
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(END_SEND) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2312,19 +2324,20 @@
PyObject *receiver;
value = stack_pointer[-1];
receiver = stack_pointer[-2];
+
Py_DECREF(receiver);
- STACK_SHRINK(1);
- stack_pointer[-1] = value;
+ stack_pointer[-2] = value;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(ENTER_EXECUTOR) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(ENTER_EXECUTOR);
+
TIER_ONE_ONLY
CHECK_EVAL_BREAKER();
-
PyCodeObject *code = _PyFrame_GetCode(frame);
_PyExecutorObject *executor = (_PyExecutorObject *)code->co_executors->executors[oparg&255];
int original_oparg = executor->vm_data.oparg | (oparg & 0xfffff00);
@@ -2342,13 +2355,14 @@
}
goto enter_tier_one;
}
-
+
TARGET(EXIT_INIT_CHECK) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(EXIT_INIT_CHECK);
PyObject *should_be_none;
should_be_none = stack_pointer[-1];
+
assert(STACK_LEVEL() == 2);
if (should_be_none != Py_None) {
PyErr_Format(PyExc_TypeError,
@@ -2356,21 +2370,22 @@
Py_TYPE(should_be_none)->tp_name);
GOTO_ERROR(error);
}
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(EXTENDED_ARG) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(EXTENDED_ARG);
+
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
}
-
+
TARGET(FORMAT_SIMPLE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2379,8 +2394,7 @@
PyObject *res;
value = stack_pointer[-1];
/* If value is a unicode object, then we know the result
- * of format(value) is value itself. */
- if (!PyUnicode_CheckExact(value)) {
+ * of format(value) is value itself. */if (!PyUnicode_CheckExact(value)) {
res = PyObject_Format(value, NULL);
Py_DECREF(value);
if (res == NULL) goto pop_1_error;
@@ -2391,7 +2405,7 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(FORMAT_WITH_SPEC) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2405,18 +2419,17 @@
Py_DECREF(value);
Py_DECREF(fmt_spec);
if (res == NULL) goto pop_2_error;
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(FOR_ITER) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(FOR_ITER);
PREDICTED(FOR_ITER);
_Py_CODEUNIT *this_instr = next_instr - 2;
- static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
PyObject *iter;
PyObject *next;
// _SPECIALIZE_FOR_ITER
@@ -2424,7 +2437,7 @@
{
uint16_t counter = read_u16(&this_instr[1].cache);
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_ForIter(iter, next_instr, oparg);
@@ -2432,7 +2445,7 @@
}
STAT_INC(FOR_ITER, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _FOR_ITER
{
@@ -2448,7 +2461,7 @@
}
/* iterator ended normally */
assert(next_instr[oparg].op.code == END_FOR ||
- next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
+ next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
Py_DECREF(iter);
STACK_SHRINK(1);
/* Jump forward oparg, then skip following END_FOR instruction */
@@ -2456,18 +2469,20 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
+
}
- STACK_GROW(1);
- stack_pointer[-1] = next;
+ stack_pointer[0] = next;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(FOR_ITER_GEN) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(FOR_ITER_GEN);
PyObject *iter;
iter = stack_pointer[-1];
+
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -2479,18 +2494,19 @@
gen->gi_exc_state.previous_item = tstate->exc_info;
tstate->exc_info = &gen->gi_exc_state;
assert(next_instr[oparg].op.code == END_FOR ||
- next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
+ next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
assert(next_instr - this_instr + oparg <= UINT16_MAX);
frame->return_offset = (uint16_t)(next_instr - this_instr + oparg);
DISPATCH_INLINED(gen_frame);
}
-
+
TARGET(FOR_ITER_LIST) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(FOR_ITER_LIST);
PyObject *iter;
PyObject *next;
+ /* Skip 1 cache entry */
// _ITER_CHECK_LIST
iter = stack_pointer[-1];
{
@@ -2498,6 +2514,7 @@
}
// _ITER_JUMP_LIST
{
+
_PyListIterObject *it = (_PyListIterObject *)iter;
assert(Py_TYPE(iter) == &PyListIter_Type);
STAT_INC(FOR_ITER, hit);
@@ -2516,6 +2533,7 @@
}
// _ITER_NEXT_LIST
{
+
_PyListIterObject *it = (_PyListIterObject *)iter;
assert(Py_TYPE(iter) == &PyListIter_Type);
PyListObject *seq = it->it_seq;
@@ -2523,25 +2541,28 @@
assert(it->it_index < PyList_GET_SIZE(seq));
next = Py_NewRef(PyList_GET_ITEM(seq, it->it_index++));
}
- STACK_GROW(1);
- stack_pointer[-1] = next;
+ stack_pointer[0] = next;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(FOR_ITER_RANGE) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(FOR_ITER_RANGE);
PyObject *iter;
PyObject *next;
+ /* Skip 1 cache entry */
// _ITER_CHECK_RANGE
iter = stack_pointer[-1];
{
+
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
}
// _ITER_JUMP_RANGE
{
+
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
assert(Py_TYPE(r) == &PyRangeIter_Type);
STAT_INC(FOR_ITER, hit);
@@ -2549,12 +2570,13 @@
STACK_SHRINK(1);
Py_DECREF(r);
// Jump over END_FOR instruction.
- JUMPBY(oparg + 1);
+ JUMPBY(oparg + 1);
DISPATCH();
}
}
// _ITER_NEXT_RANGE
{
+
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
assert(Py_TYPE(r) == &PyRangeIter_Type);
assert(r->len > 0);
@@ -2564,17 +2586,18 @@
next = PyLong_FromLong(value);
if (next == NULL) goto error;
}
- STACK_GROW(1);
- stack_pointer[-1] = next;
+ stack_pointer[0] = next;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(FOR_ITER_TUPLE) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(FOR_ITER_TUPLE);
PyObject *iter;
PyObject *next;
+ /* Skip 1 cache entry */
// _ITER_CHECK_TUPLE
iter = stack_pointer[-1];
{
@@ -2582,6 +2605,7 @@
}
// _ITER_JUMP_TUPLE
{
+
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
assert(Py_TYPE(iter) == &PyTupleIter_Type);
STAT_INC(FOR_ITER, hit);
@@ -2600,6 +2624,7 @@
}
// _ITER_NEXT_TUPLE
{
+
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
assert(Py_TYPE(iter) == &PyTupleIter_Type);
PyTupleObject *seq = it->it_seq;
@@ -2607,11 +2632,11 @@
assert(it->it_index < PyTuple_GET_SIZE(seq));
next = Py_NewRef(PyTuple_GET_ITEM(seq, it->it_index++));
}
- STACK_GROW(1);
- stack_pointer[-1] = next;
+ stack_pointer[0] = next;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(GET_AITER) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2621,16 +2646,15 @@
obj = stack_pointer[-1];
unaryfunc getter = NULL;
PyTypeObject *type = Py_TYPE(obj);
-
if (type->tp_as_async != NULL) {
getter = type->tp_as_async->am_aiter;
}
if (getter == NULL) {
_PyErr_Format(tstate, PyExc_TypeError,
- "'async for' requires an object with "
- "__aiter__ method, got %.100s",
- type->tp_name);
+ "'async for' requires an object with "
+ "__aiter__ method, got %.100s",
+ type->tp_name);
Py_DECREF(obj);
if (true) goto pop_1_error;
}
@@ -2640,19 +2664,19 @@
if (iter == NULL) goto pop_1_error;
if (Py_TYPE(iter)->tp_as_async == NULL ||
- Py_TYPE(iter)->tp_as_async->am_anext == 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);
+ "'async for' received an object from __aiter__ "
+ "that does not implement __anext__: %.100s",
+ Py_TYPE(iter)->tp_name);
Py_DECREF(iter);
if (true) goto pop_1_error;
}
stack_pointer[-1] = iter;
DISPATCH();
}
-
+
TARGET(GET_ANEXT) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2663,13 +2687,13 @@
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(error);
}
- } else {
+ }
+ else {
if (type->tp_as_async != NULL){
getter = type->tp_as_async->am_anext;
}
@@ -2682,9 +2706,9 @@
}
else {
_PyErr_Format(tstate, PyExc_TypeError,
- "'async for' requires an iterator with "
- "__anext__ method, got %.100s",
- type->tp_name);
+ "'async for' requires an iterator with "
+ "__anext__ method, got %.100s",
+ type->tp_name);
GOTO_ERROR(error);
}
@@ -2695,18 +2719,18 @@
"'async for' received an invalid object "
"from __anext__: %.100s",
Py_TYPE(next_iter)->tp_name);
-
Py_DECREF(next_iter);
GOTO_ERROR(error);
- } else {
+ }
+ else {
Py_DECREF(next_iter);
}
}
- STACK_GROW(1);
- stack_pointer[-1] = awaitable;
+ stack_pointer[0] = awaitable;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(GET_AWAITABLE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2715,11 +2739,9 @@
PyObject *iter;
iterable = stack_pointer[-1];
iter = _PyCoro_GetAwaitableIter(iterable);
-
if (iter == NULL) {
_PyEval_FormatAwaitableError(tstate, Py_TYPE(iterable), oparg);
}
-
Py_DECREF(iterable);
if (iter != NULL && PyCoro_CheckExact(iter)) {
@@ -2727,20 +2749,18 @@
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);
+ being awaited on. */Py_DECREF(yf);
Py_CLEAR(iter);
_PyErr_SetString(tstate, PyExc_RuntimeError,
- "coroutine is being awaited already");
+ "coroutine is being awaited already");
/* The code below jumps to `error` if `iter` is NULL. */
}
}
-
if (iter == NULL) goto pop_1_error;
stack_pointer[-1] = iter;
DISPATCH();
}
-
+
TARGET(GET_ITER) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2748,6 +2768,7 @@
PyObject *iterable;
PyObject *iter;
iterable = stack_pointer[-1];
+
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
Py_DECREF(iterable);
@@ -2755,7 +2776,7 @@
stack_pointer[-1] = iter;
DISPATCH();
}
-
+
TARGET(GET_LEN) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2764,15 +2785,15 @@
PyObject *len_o;
obj = stack_pointer[-1];
// PUSH(len(TOS))
- Py_ssize_t len_i = PyObject_Length(obj);
+ Py_ssize_t len_i = PyObject_Length(obj);
if (len_i < 0) goto error;
len_o = PyLong_FromSsize_t(len_i);
if (len_o == NULL) goto error;
- STACK_GROW(1);
- stack_pointer[-1] = len_o;
+ stack_pointer[0] = len_o;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(GET_YIELD_FROM_ITER) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2780,15 +2801,15 @@
PyObject *iterable;
PyObject *iter;
iterable = stack_pointer[-1];
+
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
if (!(_PyFrame_GetCode(frame)->co_flags & (CO_COROUTINE | CO_ITERABLE_COROUTINE))) {
/* and it is used in a 'yield from' expression of a
- regular generator. */
- _PyErr_SetString(tstate, PyExc_TypeError,
- "cannot 'yield from' a coroutine object "
- "in a non-coroutine generator");
+ regular generator. */_PyErr_SetString(tstate, PyExc_TypeError,
+ "cannot 'yield from' a coroutine object "
+ "in a non-coroutine generator");
GOTO_ERROR(error);
}
iter = iterable;
@@ -2807,7 +2828,7 @@
stack_pointer[-1] = iter;
DISPATCH();
}
-
+
TARGET(IMPORT_FROM) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2819,11 +2840,11 @@
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- STACK_GROW(1);
- stack_pointer[-1] = res;
+ stack_pointer[0] = res;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(IMPORT_NAME) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2839,35 +2860,37 @@
Py_DECREF(level);
Py_DECREF(fromlist);
if (res == NULL) goto pop_2_error;
- STACK_SHRINK(1);
- stack_pointer[-1] = res;
+ stack_pointer[-2] = res;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_CALL) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 4;
INSTRUCTION_STATS(INSTRUMENTED_CALL);
+
int is_meth = PEEK(oparg + 1) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(oparg + 2);
PyObject *arg = total_args == 0 ?
- &_PyInstrumentation_MISSING : PEEK(total_args);
+ &_PyInstrumentation_MISSING : PEEK(total_args);
int err = _Py_call_instrumentation_2args(
- tstate, PY_MONITORING_EVENT_CALL,
- frame, this_instr, function, arg);
+ tstate, PY_MONITORING_EVENT_CALL,
+ frame, this_instr, function, arg);
if (err) goto error;
INCREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
GO_TO_INSTRUCTION(CALL);
}
-
+
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(INSTRUMENTED_CALL_FUNCTION_EX);
+
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
}
-
+
TARGET(INSTRUMENTED_CALL_KW) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2876,14 +2899,14 @@
int total_args = oparg + is_meth;
PyObject *function = PEEK(oparg + 3);
PyObject *arg = total_args == 0 ? &_PyInstrumentation_MISSING
- : PEEK(total_args + 1);
+ : PEEK(total_args + 1);
int err = _Py_call_instrumentation_2args(
- tstate, PY_MONITORING_EVENT_CALL,
- frame, this_instr, function, arg);
+ tstate, PY_MONITORING_EVENT_CALL,
+ frame, this_instr, function, arg);
if (err) goto error;
GO_TO_INSTRUCTION(CALL_KW);
}
-
+
TARGET(INSTRUMENTED_END_FOR) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2894,8 +2917,7 @@
receiver = stack_pointer[-2];
TIER_ONE_ONLY
/* Need to create a fake StopIteration error here,
- * to conform to PEP 380 */
- if (PyGen_Check(receiver)) {
+ * to conform to PEP 380 */if (PyGen_Check(receiver)) {
PyErr_SetObject(PyExc_StopIteration, value);
if (monitor_stop_iteration(tstate, frame, this_instr)) {
GOTO_ERROR(error);
@@ -2904,10 +2926,10 @@
}
Py_DECREF(receiver);
Py_DECREF(value);
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_END_SEND) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2925,15 +2947,16 @@
PyErr_SetRaisedException(NULL);
}
Py_DECREF(receiver);
- STACK_SHRINK(1);
- stack_pointer[-1] = value;
+ stack_pointer[-2] = value;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_FOR_ITER) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(INSTRUMENTED_FOR_ITER);
+
_Py_CODEUNIT *target;
PyObject *iter = TOP();
PyObject *next = (*Py_TYPE(iter)->tp_iternext)(iter);
@@ -2951,7 +2974,7 @@
}
/* iterator ended normally */
assert(next_instr[oparg].op.code == END_FOR ||
- next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
+ next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
STACK_SHRINK(1);
Py_DECREF(iter);
/* Skip END_FOR */
@@ -2960,11 +2983,12 @@
INSTRUMENTED_JUMP(this_instr, target, PY_MONITORING_EVENT_BRANCH);
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_INSTRUCTION) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(INSTRUMENTED_INSTRUCTION);
+
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, this_instr);
if (next_opcode < 0) goto error;
@@ -2976,7 +3000,7 @@
opcode = next_opcode;
DISPATCH_GOTO();
}
-
+
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -2985,7 +3009,7 @@
INSTRUMENTED_JUMP(this_instr, next_instr - oparg, PY_MONITORING_EVENT_JUMP);
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_JUMP_FORWARD) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -2993,32 +3017,33 @@
INSTRUMENTED_JUMP(this_instr, next_instr + oparg, PY_MONITORING_EVENT_JUMP);
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(INSTRUMENTED_LOAD_SUPER_ATTR);
// cancel out the decrement that will happen in LOAD_SUPER_ATTR; we
- // don't want to specialize instrumented instructions
- INCREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
+ // don't want to specialize instrumented instructions
+ INCREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
GO_TO_INSTRUCTION(LOAD_SUPER_ATTR);
}
-
+
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(INSTRUMENTED_POP_JUMP_IF_FALSE);
+
PyObject *cond = POP();
assert(PyBool_Check(cond));
int flag = Py_IsFalse(cond);
int offset = flag * oparg;
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache = (this_instr[1].cache << 1) | flag;
- #endif
+#endif
INSTRUMENTED_JUMP(this_instr, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -3033,13 +3058,13 @@
Py_DECREF(value);
offset = 0;
}
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache = (this_instr[1].cache << 1) | flag;
- #endif
+#endif
INSTRUMENTED_JUMP(this_instr, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -3054,13 +3079,13 @@
Py_DECREF(value);
offset = oparg;
}
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache = (this_instr[1].cache << 1) | !nflag;
- #endif
+#endif
INSTRUMENTED_JUMP(this_instr, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -3069,13 +3094,13 @@
assert(PyBool_Check(cond));
int flag = Py_IsTrue(cond);
int offset = flag * oparg;
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache = (this_instr[1].cache << 1) | flag;
- #endif
+#endif
INSTRUMENTED_JUMP(this_instr, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_RESUME) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3094,7 +3119,7 @@
}
_PyFrame_SetStackPointer(frame, stack_pointer);
int err = _Py_call_instrumentation(
- tstate, oparg > 0, frame, this_instr);
+ tstate, oparg > 0, frame, this_instr);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (err) goto error;
if (frame->instr_ptr != this_instr) {
@@ -3105,15 +3130,16 @@
}
DISPATCH();
}
-
+
TARGET(INSTRUMENTED_RETURN_CONST) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(INSTRUMENTED_RETURN_CONST);
+
PyObject *retval = GETITEM(FRAME_CO_CONSTS, oparg);
int err = _Py_call_instrumentation_arg(
- tstate, PY_MONITORING_EVENT_PY_RETURN,
- frame, this_instr, retval);
+ tstate, PY_MONITORING_EVENT_PY_RETURN,
+ frame, this_instr, retval);
if (err) GOTO_ERROR(error);
Py_INCREF(retval);
assert(EMPTY());
@@ -3121,14 +3147,14 @@
_Py_LeaveRecursiveCallPy(tstate);
assert(frame != &entry_frame);
// GH-99729: We need to unlink the frame *before* clearing it:
- _PyInterpreterFrame *dying = frame;
+ _PyInterpreterFrame *dying = frame;
frame = tstate->current_frame = dying->previous;
_PyEval_FrameClearAndPop(tstate, dying);
_PyFrame_StackPush(frame, retval);
LOAD_IP(frame->return_offset);
goto resume_frame;
}
-
+
TARGET(INSTRUMENTED_RETURN_VALUE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3136,8 +3162,8 @@
PyObject *retval;
retval = stack_pointer[-1];
int err = _Py_call_instrumentation_arg(
- tstate, PY_MONITORING_EVENT_PY_RETURN,
- frame, this_instr, retval);
+ tstate, PY_MONITORING_EVENT_PY_RETURN,
+ frame, this_instr, retval);
if (err) GOTO_ERROR(error);
STACK_SHRINK(1);
assert(EMPTY());
@@ -3145,20 +3171,21 @@
_Py_LeaveRecursiveCallPy(tstate);
assert(frame != &entry_frame);
// GH-99729: We need to unlink the frame *before* clearing it:
- _PyInterpreterFrame *dying = frame;
+ _PyInterpreterFrame *dying = frame;
frame = tstate->current_frame = dying->previous;
_PyEval_FrameClearAndPop(tstate, dying);
_PyFrame_StackPush(frame, retval);
LOAD_IP(frame->return_offset);
goto resume_frame;
}
-
+
TARGET(INSTRUMENTED_YIELD_VALUE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(INSTRUMENTED_YIELD_VALUE);
PyObject *retval;
retval = stack_pointer[-1];
+
assert(frame != &entry_frame);
frame->instr_ptr = next_instr;
PyGenObject *gen = _PyFrame_GetGenerator(frame);
@@ -3167,8 +3194,8 @@
gen->gi_frame_state = FRAME_SUSPENDED + oparg;
_PyFrame_SetStackPointer(frame, stack_pointer - 1);
int err = _Py_call_instrumentation_arg(
- tstate, PY_MONITORING_EVENT_PY_YIELD,
- frame, this_instr, retval);
+ tstate, PY_MONITORING_EVENT_PY_YIELD,
+ frame, this_instr, retval);
if (err) GOTO_ERROR(error);
tstate->exc_info = gen->gi_exc_state.previous_item;
gen->gi_exc_state.previous_item = NULL;
@@ -3182,7 +3209,7 @@
LOAD_IP(1 + INLINE_CACHE_ENTRIES_SEND);
goto resume_frame;
}
-
+
TARGET(INTERPRETER_EXIT) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3197,7 +3224,7 @@
tstate->c_recursion_remaining += PY_EVAL_C_STACK_UNITS;
return retval;
}
-
+
TARGET(IS_OP) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3207,15 +3234,16 @@
PyObject *b;
right = stack_pointer[-1];
left = stack_pointer[-2];
+
int res = Py_Is(left, right) ^ oparg;
Py_DECREF(left);
Py_DECREF(right);
b = res ? Py_True : Py_False;
- STACK_SHRINK(1);
- stack_pointer[-1] = b;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(JUMP_BACKWARD) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -3223,20 +3251,19 @@
CHECK_EVAL_BREAKER();
assert(oparg <= INSTR_OFFSET());
JUMPBY(-oparg);
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache += (1 << OPTIMIZER_BITS_IN_COUNTER);
/* We are using unsigned values, but we really want signed values, so
- * do the 2s complement comparison manually */
- uint16_t ucounter = this_instr[1].cache + (1 << 15);
+ * do the 2s complement comparison manually */uint16_t ucounter = this_instr[1].cache + (1 << 15);
uint16_t threshold = tstate->interp->optimizer_backedge_threshold + (1 << 15);
// Double-check that the opcode isn't instrumented or something:
- if (ucounter > threshold && this_instr->op.code == JUMP_BACKWARD) {
+ if (ucounter > threshold && this_instr->op.code == JUMP_BACKWARD) {
OPT_STAT_INC(attempts);
int optimized = _PyOptimizer_BackEdge(frame, this_instr, next_instr, stack_pointer);
if (optimized < 0) goto error;
if (optimized) {
// Rewind and enter the executor:
- assert(this_instr->op.code == ENTER_EXECUTOR);
+ assert(this_instr->op.code == ENTER_EXECUTOR);
next_instr = this_instr;
this_instr[1].cache &= ((1 << OPTIMIZER_BITS_IN_COUNTER) - 1);
}
@@ -3252,23 +3279,23 @@
this_instr[1].cache = ((1 << 16) - ((1 << OPTIMIZER_BITS_IN_COUNTER) << backoff)) | backoff;
}
}
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
DISPATCH();
}
-
+
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(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);
+ * 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(JUMP_FORWARD) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3276,7 +3303,7 @@
JUMPBY(oparg);
DISPATCH();
}
-
+
TARGET(LIST_APPEND) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3286,10 +3313,10 @@
v = stack_pointer[-1];
list = stack_pointer[-2 - (oparg-1)];
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(LIST_EXTEND) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3298,43 +3325,43 @@
PyObject *list;
iterable = stack_pointer[-1];
list = stack_pointer[-2 - (oparg-1)];
+
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)))
+ (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);
+ "Value after * must be an iterable, not %.200s",
+ Py_TYPE(iterable)->tp_name);
}
Py_DECREF(iterable);
if (true) goto pop_1_error;
}
assert(Py_IsNone(none_val));
Py_DECREF(iterable);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(LOAD_ASSERTION_ERROR) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(LOAD_ASSERTION_ERROR);
PyObject *value;
value = Py_NewRef(PyExc_AssertionError);
- STACK_GROW(1);
- stack_pointer[-1] = value;
+ stack_pointer[0] = value;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_ATTR) {
frame->instr_ptr = next_instr;
next_instr += 10;
INSTRUCTION_STATS(LOAD_ATTR);
PREDICTED(LOAD_ATTR);
_Py_CODEUNIT *this_instr = next_instr - 10;
- static_assert(INLINE_CACHE_ENTRIES_LOAD_ATTR == 9, "incorrect cache size");
PyObject *owner;
PyObject *attr;
PyObject *self_or_null = NULL;
@@ -3342,8 +3369,9 @@
owner = stack_pointer[-1];
{
uint16_t counter = read_u16(&this_instr[1].cache);
+
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
next_instr = this_instr;
@@ -3352,7 +3380,7 @@
}
STAT_INC(LOAD_ATTR, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _LOAD_ATTR
{
@@ -3364,18 +3392,16 @@
/* We can bypass temporary bound method object.
meth is unbound method and obj is self.
meth | self | arg1 | ... | argN
- */
- assert(attr != NULL); // No errors on this branch
- self_or_null = owner; // Transfer ownership
- }
+ */assert(attr != NULL); // No errors on this branch
+ self_or_null = owner; // Transfer ownership
+ }
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
- */
- Py_DECREF(owner);
+ */Py_DECREF(owner);
if (attr == NULL) goto pop_1_error;
self_or_null = NULL;
}
@@ -3387,12 +3413,12 @@
if (attr == NULL) goto pop_1_error;
}
}
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = attr;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = self_or_null; }
+ stack_pointer[-1] = attr;
+ if (oparg & 1) stack_pointer[0] = self_or_null;
+ stack_pointer += ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_CLASS) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
@@ -3400,6 +3426,7 @@
PyObject *owner;
PyObject *attr;
PyObject *null = NULL;
+ /* Skip 1 cache entry */
// _CHECK_ATTR_CLASS
owner = stack_pointer[-1];
{
@@ -3408,6 +3435,7 @@
assert(type_version != 0);
DEOPT_IF(((PyTypeObject *)owner)->tp_version_tag != type_version, LOAD_ATTR);
}
+ /* Skip 2 cache entries */
// _LOAD_ATTR_CLASS
{
PyObject *descr = read_obj(&this_instr[6].cache);
@@ -3417,12 +3445,12 @@
null = NULL;
Py_DECREF(owner);
}
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = attr;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ stack_pointer[-1] = attr;
+ if (oparg & 1) stack_pointer[0] = null;
+ stack_pointer += ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
@@ -3432,6 +3460,7 @@
uint32_t type_version = read_u32(&this_instr[2].cache);
uint32_t func_version = read_u32(&this_instr[4].cache);
PyObject *getattribute = read_obj(&this_instr[6].cache);
+
assert((oparg & 1) == 0);
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
@@ -3445,18 +3474,17 @@
assert(code->co_argcount == 2);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), LOAD_ATTR);
STAT_INC(LOAD_ATTR, hit);
-
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 1);
Py_INCREF(f);
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, f, 2);
// Manipulate stack directly because we exit with DISPATCH_INLINED().
- STACK_SHRINK(1);
+ STACK_SHRINK(1);
new_frame->localsplus[0] = owner;
new_frame->localsplus[1] = Py_NewRef(name);
frame->return_offset = (uint16_t)(next_instr - this_instr);
DISPATCH_INLINED(new_frame);
}
-
+
TARGET(LOAD_ATTR_INSTANCE_VALUE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
@@ -3464,6 +3492,7 @@
PyObject *owner;
PyObject *attr;
PyObject *null = NULL;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -3474,6 +3503,7 @@
}
// _CHECK_MANAGED_OBJECT_HAS_VALUES
{
+
assert(Py_TYPE(owner)->tp_dictoffset < 0);
assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
@@ -3490,19 +3520,21 @@
null = NULL;
Py_DECREF(owner);
}
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = attr;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ /* Skip 5 cache entries */
+ stack_pointer[-1] = attr;
+ if (oparg & 1) stack_pointer[0] = null;
+ stack_pointer += ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_METHOD_LAZY_DICT) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
INSTRUCTION_STATS(LOAD_ATTR_METHOD_LAZY_DICT);
PyObject *owner;
PyObject *attr;
- PyObject *self;
+ PyObject *self = NULL;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -3513,12 +3545,14 @@
}
// _CHECK_ATTR_METHOD_LAZY_DICT
{
+
Py_ssize_t dictoffset = Py_TYPE(owner)->tp_dictoffset;
assert(dictoffset > 0);
PyObject *dict = *(PyObject **)((char *)owner + dictoffset);
/* This object has a __dict__, just not yet created */
DEOPT_IF(dict != NULL, LOAD_ATTR);
}
+ /* Skip 2 cache entries */
// _LOAD_ATTR_METHOD_LAZY_DICT
{
PyObject *descr = read_obj(&this_instr[6].cache);
@@ -3529,19 +3563,20 @@
attr = Py_NewRef(descr);
self = owner;
}
- STACK_GROW(1);
- stack_pointer[-2] = attr;
- stack_pointer[-1] = self;
+ stack_pointer[-1] = attr;
+ if (1) stack_pointer[0] = self;
+ stack_pointer += (((1) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_METHOD_NO_DICT) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
INSTRUCTION_STATS(LOAD_ATTR_METHOD_NO_DICT);
PyObject *owner;
PyObject *attr;
- PyObject *self;
+ PyObject *self = NULL;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -3550,9 +3585,11 @@
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
}
+ /* Skip 2 cache entries */
// _LOAD_ATTR_METHOD_NO_DICT
{
PyObject *descr = read_obj(&this_instr[6].cache);
+
assert(oparg & 1);
assert(Py_TYPE(owner)->tp_dictoffset == 0);
STAT_INC(LOAD_ATTR, hit);
@@ -3561,19 +3598,20 @@
attr = Py_NewRef(descr);
self = owner;
}
- STACK_GROW(1);
- stack_pointer[-2] = attr;
- stack_pointer[-1] = self;
+ stack_pointer[-1] = attr;
+ if (1) stack_pointer[0] = self;
+ stack_pointer += (((1) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_METHOD_WITH_VALUES) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
INSTRUCTION_STATS(LOAD_ATTR_METHOD_WITH_VALUES);
PyObject *owner;
PyObject *attr;
- PyObject *self;
+ PyObject *self = NULL;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -3584,6 +3622,7 @@
}
// _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT
{
+
assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
DEOPT_IF(!_PyDictOrValues_IsValues(*dorv) && !_PyObject_MakeInstanceAttributesFromDict(owner, dorv), LOAD_ATTR);
@@ -3606,12 +3645,12 @@
assert(_PyType_HasFeature(Py_TYPE(attr), Py_TPFLAGS_METHOD_DESCRIPTOR));
self = owner;
}
- STACK_GROW(1);
- stack_pointer[-2] = attr;
- stack_pointer[-1] = self;
+ stack_pointer[-1] = attr;
+ if (1) stack_pointer[0] = self;
+ stack_pointer += (((1) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_MODULE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
@@ -3619,6 +3658,7 @@
PyObject *owner;
PyObject *attr;
PyObject *null = NULL;
+ /* Skip 1 cache entry */
// _CHECK_ATTR_MODULE
owner = stack_pointer[-1];
{
@@ -3642,18 +3682,20 @@
null = NULL;
Py_DECREF(owner);
}
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = attr;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ /* Skip 5 cache entries */
+ stack_pointer[-1] = attr;
+ if (oparg & 1) stack_pointer[0] = null;
+ stack_pointer += ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_NONDESCRIPTOR_NO_DICT) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
INSTRUCTION_STATS(LOAD_ATTR_NONDESCRIPTOR_NO_DICT);
PyObject *owner;
PyObject *attr;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -3662,9 +3704,11 @@
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
}
+ /* Skip 2 cache entries */
// _LOAD_ATTR_NONDESCRIPTOR_NO_DICT
{
PyObject *descr = read_obj(&this_instr[6].cache);
+
assert((oparg & 1) == 0);
assert(Py_TYPE(owner)->tp_dictoffset == 0);
STAT_INC(LOAD_ATTR, hit);
@@ -3673,15 +3717,17 @@
attr = Py_NewRef(descr);
}
stack_pointer[-1] = attr;
+ stack_pointer += (((0) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
INSTRUCTION_STATS(LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES);
PyObject *owner;
PyObject *attr;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -3692,6 +3738,7 @@
}
// _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT
{
+
assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
PyDictOrValues *dorv = _PyObject_DictOrValuesPointer(owner);
DEOPT_IF(!_PyDictOrValues_IsValues(*dorv) && !_PyObject_MakeInstanceAttributesFromDict(owner, dorv), LOAD_ATTR);
@@ -3706,6 +3753,7 @@
// _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES
{
PyObject *descr = read_obj(&this_instr[6].cache);
+
assert((oparg & 1) == 0);
STAT_INC(LOAD_ATTR, hit);
assert(descr != NULL);
@@ -3713,9 +3761,10 @@
attr = Py_NewRef(descr);
}
stack_pointer[-1] = attr;
+ stack_pointer += (((0) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_PROPERTY) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
@@ -3727,7 +3776,6 @@
PyObject *fget = read_obj(&this_instr[6].cache);
assert((oparg & 1) == 0);
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
-
PyTypeObject *cls = Py_TYPE(owner);
DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR);
assert(type_version != 0);
@@ -3742,12 +3790,12 @@
Py_INCREF(fget);
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, f, 1);
// Manipulate stack directly because we exit with DISPATCH_INLINED().
- STACK_SHRINK(1);
+ STACK_SHRINK(1);
new_frame->localsplus[0] = owner;
frame->return_offset = (uint16_t)(next_instr - this_instr);
DISPATCH_INLINED(new_frame);
}
-
+
TARGET(LOAD_ATTR_SLOT) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
@@ -3755,6 +3803,7 @@
PyObject *owner;
PyObject *attr;
PyObject *null = NULL;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -3766,6 +3815,7 @@
// _LOAD_ATTR_SLOT
{
uint16_t index = read_u16(&this_instr[4].cache);
+
char *addr = (char *)owner + index;
attr = *(PyObject **)addr;
DEOPT_IF(attr == NULL, LOAD_ATTR);
@@ -3774,12 +3824,13 @@
null = NULL;
Py_DECREF(owner);
}
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = attr;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ /* Skip 5 cache entries */
+ stack_pointer[-1] = attr;
+ if (oparg & 1) stack_pointer[0] = null;
+ stack_pointer += ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_ATTR_WITH_HINT) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 10;
@@ -3787,6 +3838,7 @@
PyObject *owner;
PyObject *attr;
PyObject *null = NULL;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -3797,6 +3849,7 @@
}
// _CHECK_ATTR_WITH_HINT
{
+
assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
DEOPT_IF(_PyDictOrValues_IsValues(dorv), LOAD_ATTR);
@@ -3827,12 +3880,13 @@
null = NULL;
Py_DECREF(owner);
}
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = attr;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ /* Skip 5 cache entries */
+ stack_pointer[-1] = attr;
+ if (oparg & 1) stack_pointer[0] = null;
+ stack_pointer += ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_BUILD_CLASS) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3841,14 +3895,14 @@
if (PyMapping_GetOptionalItem(BUILTINS(), &_Py_ID(__build_class__), &bc) < 0) goto error;
if (bc == NULL) {
_PyErr_SetString(tstate, PyExc_NameError,
- "__build_class__ not found");
+ "__build_class__ not found");
if (true) goto error;
}
- STACK_GROW(1);
- stack_pointer[-1] = bc;
+ stack_pointer[0] = bc;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_CONST) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3856,16 +3910,17 @@
PyObject *value;
value = GETITEM(FRAME_CO_CONSTS, oparg);
Py_INCREF(value);
- STACK_GROW(1);
- stack_pointer[-1] = value;
+ stack_pointer[0] = value;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_DEREF) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(LOAD_DEREF);
PyObject *value;
+
PyObject *cell = GETLOCAL(oparg);
value = PyCell_GET(cell);
if (value == NULL) {
@@ -3873,11 +3928,11 @@
if (true) goto error;
}
Py_INCREF(value);
- STACK_GROW(1);
- stack_pointer[-1] = value;
+ stack_pointer[0] = value;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_FAST) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3886,11 +3941,11 @@
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
- STACK_GROW(1);
- stack_pointer[-1] = value;
+ stack_pointer[0] = value;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_FAST_AND_CLEAR) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3898,12 +3953,12 @@
PyObject *value;
value = GETLOCAL(oparg);
// do not use SETLOCAL here, it decrefs the old value
- GETLOCAL(oparg) = NULL;
- STACK_GROW(1);
- stack_pointer[-1] = value;
+ GETLOCAL(oparg) = NULL;
+ stack_pointer[0] = value;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_FAST_CHECK) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3912,29 +3967,30 @@
value = GETLOCAL(oparg);
if (value == NULL) goto unbound_local_error;
Py_INCREF(value);
- STACK_GROW(1);
- stack_pointer[-1] = value;
+ stack_pointer[0] = value;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_FAST_LOAD_FAST) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(LOAD_FAST_LOAD_FAST);
PyObject *value1;
PyObject *value2;
+
uint32_t oparg1 = oparg >> 4;
uint32_t oparg2 = oparg & 15;
value1 = GETLOCAL(oparg1);
value2 = GETLOCAL(oparg2);
Py_INCREF(value1);
Py_INCREF(value2);
- STACK_GROW(2);
- stack_pointer[-2] = value1;
- stack_pointer[-1] = value2;
+ stack_pointer[0] = value1;
+ stack_pointer[1] = value2;
+ stack_pointer += 2;
DISPATCH();
}
-
+
TARGET(LOAD_FROM_DICT_OR_DEREF) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3942,6 +3998,7 @@
PyObject *class_dict;
PyObject *value;
class_dict = stack_pointer[-1];
+
PyObject *name;
assert(class_dict);
assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);
@@ -3962,7 +4019,7 @@
stack_pointer[-1] = value;
DISPATCH();
}
-
+
TARGET(LOAD_FROM_DICT_OR_GLOBALS) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -3984,8 +4041,8 @@
}
if (v == NULL) {
_PyEval_FormatExcCheckArg(
- tstate, PyExc_NameError,
- NAME_ERROR_MSG, name);
+ tstate, PyExc_NameError,
+ NAME_ERROR_MSG, name);
GOTO_ERROR(error);
}
}
@@ -3994,21 +4051,21 @@
stack_pointer[-1] = v;
DISPATCH();
}
-
+
TARGET(LOAD_GLOBAL) {
frame->instr_ptr = next_instr;
next_instr += 5;
INSTRUCTION_STATS(LOAD_GLOBAL);
PREDICTED(LOAD_GLOBAL);
_Py_CODEUNIT *this_instr = next_instr - 5;
- static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size");
PyObject *res;
PyObject *null = NULL;
// _SPECIALIZE_LOAD_GLOBAL
{
uint16_t counter = read_u16(&this_instr[1].cache);
+
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
next_instr = this_instr;
@@ -4017,7 +4074,7 @@
}
STAT_INC(LOAD_GLOBAL, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _LOAD_GLOBAL
{
@@ -4026,14 +4083,13 @@
&& PyDict_CheckExact(BUILTINS()))
{
res = _PyDict_LoadGlobal((PyDictObject *)GLOBALS(),
- (PyDictObject *)BUILTINS(),
- name);
+ (PyDictObject *)BUILTINS(),
+ name);
if (res == NULL) {
if (!_PyErr_Occurred(tstate)) {
/* _PyDict_LoadGlobal() returns NULL without raising
- * an exception if the key doesn't exist */
- _PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
- NAME_ERROR_MSG, name);
+ * an exception if the key doesn't exist */_PyEval_FormatExcCheckArg(tstate, PyExc_NameError,
+ NAME_ERROR_MSG, name);
}
if (true) goto error;
}
@@ -4048,27 +4104,27 @@
if (PyMapping_GetOptionalItem(BUILTINS(), name, &res) < 0) goto error;
if (res == NULL) {
_PyEval_FormatExcCheckArg(
- tstate, PyExc_NameError,
- NAME_ERROR_MSG, name);
+ tstate, PyExc_NameError,
+ NAME_ERROR_MSG, name);
if (true) goto error;
}
}
}
null = NULL;
}
- STACK_GROW(1);
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = res;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ stack_pointer[0] = res;
+ if (oparg & 1) stack_pointer[1] = null;
+ stack_pointer += 1 + ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_GLOBAL_BUILTIN) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 5;
INSTRUCTION_STATS(LOAD_GLOBAL_BUILTIN);
PyObject *res;
PyObject *null = NULL;
+ /* Skip 1 cache entry */
// _GUARD_GLOBALS_VERSION
{
uint16_t version = read_u16(&this_instr[2].cache);
@@ -4088,6 +4144,7 @@
// _LOAD_GLOBAL_BUILTINS
{
uint16_t index = read_u16(&this_instr[4].cache);
+
PyDictObject *bdict = (PyDictObject *)BUILTINS();
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(bdict->ma_keys);
res = entries[index].me_value;
@@ -4096,19 +4153,19 @@
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
}
- STACK_GROW(1);
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = res;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ stack_pointer[0] = res;
+ if (oparg & 1) stack_pointer[1] = null;
+ stack_pointer += 1 + ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_GLOBAL_MODULE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 5;
INSTRUCTION_STATS(LOAD_GLOBAL_MODULE);
PyObject *res;
PyObject *null = NULL;
+ /* Skip 1 cache entry */
// _GUARD_GLOBALS_VERSION
{
uint16_t version = read_u16(&this_instr[2].cache);
@@ -4117,9 +4174,11 @@
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
assert(DK_IS_UNICODE(dict->ma_keys));
}
+ /* Skip 1 cache entry */
// _LOAD_GLOBAL_MODULE
{
uint16_t index = read_u16(&this_instr[4].cache);
+
PyDictObject *dict = (PyDictObject *)GLOBALS();
PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(dict->ma_keys);
res = entries[index].me_value;
@@ -4128,13 +4187,12 @@
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
}
- STACK_GROW(1);
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = res;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ stack_pointer[0] = res;
+ if (oparg & 1) stack_pointer[1] = null;
+ stack_pointer += 1 + ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_LOCALS) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4143,24 +4201,25 @@
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
- "no locals found");
+ "no locals found");
if (true) goto error;
}
Py_INCREF(locals);
- STACK_GROW(1);
- stack_pointer[-1] = locals;
+ stack_pointer[0] = locals;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_NAME) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(LOAD_NAME);
PyObject *v;
+
PyObject *mod_or_class_dict = LOCALS();
if (mod_or_class_dict == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
- "no locals found");
+ "no locals found");
if (true) goto error;
}
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
@@ -4177,24 +4236,23 @@
}
if (v == NULL) {
_PyEval_FormatExcCheckArg(
- tstate, PyExc_NameError,
- NAME_ERROR_MSG, name);
+ tstate, PyExc_NameError,
+ NAME_ERROR_MSG, name);
GOTO_ERROR(error);
}
}
}
- STACK_GROW(1);
- stack_pointer[-1] = v;
+ stack_pointer[0] = v;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(LOAD_SUPER_ATTR) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(LOAD_SUPER_ATTR);
PREDICTED(LOAD_SUPER_ATTR);
_Py_CODEUNIT *this_instr = next_instr - 2;
- static_assert(INLINE_CACHE_ENTRIES_LOAD_SUPER_ATTR == 1, "incorrect cache size");
PyObject *class;
PyObject *global_super;
PyObject *self;
@@ -4205,8 +4263,9 @@
global_super = stack_pointer[-3];
{
uint16_t counter = read_u16(&this_instr[1].cache);
+
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
int load_method = oparg & 1;
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
@@ -4215,7 +4274,7 @@
}
STAT_INC(LOAD_SUPER_ATTR, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _LOAD_SUPER_ATTR
self = stack_pointer[-1];
@@ -4224,13 +4283,15 @@
if (opcode == INSTRUMENTED_LOAD_SUPER_ATTR) {
PyObject *arg = oparg & 2 ? class : &_PyInstrumentation_MISSING;
int err = _Py_call_instrumentation_2args(
- tstate, PY_MONITORING_EVENT_CALL,
- frame, this_instr, global_super, arg);
+ tstate, PY_MONITORING_EVENT_CALL,
+ frame, this_instr, global_super, arg);
if (err) goto pop_3_error;
}
// we make no attempt to optimize here; specializations should
- // handle any case whose performance we care about
- PyObject *stack[] = {class, self};
+ // handle any case whose performance we care about
+ PyObject *stack[] = {
+ class, self}
+ ;
PyObject *super = PyObject_Vectorcall(global_super, stack, oparg & 2, NULL);
if (opcode == INSTRUMENTED_LOAD_SUPER_ATTR) {
PyObject *arg = oparg & 2 ? class : &_PyInstrumentation_MISSING;
@@ -4258,13 +4319,12 @@
if (attr == NULL) goto pop_3_error;
null = NULL;
}
- STACK_SHRINK(2);
- STACK_GROW(((oparg & 1) ? 1 : 0));
- stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = attr;
- if (oparg & 1) { stack_pointer[-(oparg & 1 ? 1 : 0)] = null; }
+ stack_pointer[-3] = attr;
+ if (oparg & 1) stack_pointer[-2] = null;
+ stack_pointer += -2 + ((oparg & 1));
DISPATCH();
}
-
+
TARGET(LOAD_SUPER_ATTR_ATTR) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -4286,11 +4346,11 @@
Py_DECREF(class);
Py_DECREF(self);
if (attr == NULL) goto pop_3_error;
- STACK_SHRINK(2);
- stack_pointer[-1] = attr;
+ stack_pointer[-3] = attr;
+ stack_pointer += -2 + (((0) ? 1 : 0));
DISPATCH();
}
-
+
TARGET(LOAD_SUPER_ATTR_METHOD) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -4311,7 +4371,7 @@
PyTypeObject *cls = (PyTypeObject *)class;
int method_found = 0;
attr = _PySuper_Lookup(cls, self, name,
- Py_TYPE(self)->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
+ Py_TYPE(self)->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
Py_DECREF(global_super);
Py_DECREF(class);
if (attr == NULL) {
@@ -4320,23 +4380,24 @@
}
if (method_found) {
self_or_null = self; // transfer ownership
- } else {
+ }
+ else {
Py_DECREF(self);
self_or_null = NULL;
}
- STACK_SHRINK(1);
- stack_pointer[-2] = attr;
- stack_pointer[-1] = self_or_null;
+ stack_pointer[-3] = attr;
+ stack_pointer[-2] = self_or_null;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(MAKE_CELL) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(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);
+ // via PyFrame_LocalsToFast() before MAKE_CELL has run).
+ PyObject *initial = GETLOCAL(oparg);
PyObject *cell = PyCell_New(initial);
if (cell == NULL) {
GOTO_ERROR(error);
@@ -4344,7 +4405,7 @@
SETLOCAL(oparg, cell);
DISPATCH();
}
-
+
TARGET(MAKE_FUNCTION) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4352,10 +4413,9 @@
PyObject *codeobj;
PyObject *func;
codeobj = stack_pointer[-1];
-
+
PyFunctionObject *func_obj = (PyFunctionObject *)
- PyFunction_New(codeobj, GLOBALS());
-
+ PyFunction_New(codeobj, GLOBALS());
Py_DECREF(codeobj);
if (func_obj == NULL) {
GOTO_ERROR(error);
@@ -4367,7 +4427,7 @@
stack_pointer[-1] = func;
DISPATCH();
}
-
+
TARGET(MAP_ADD) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4381,11 +4441,11 @@
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;
- STACK_SHRINK(2);
+if (_PyDict_SetItem_Take2((PyDictObject *)dict, key, value) != 0) goto pop_2_error;
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(MATCH_CLASS) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4397,25 +4457,27 @@
names = stack_pointer[-1];
type = stack_pointer[-2];
subject = stack_pointer[-3];
+
// Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
- // None on failure.
- assert(PyTuple_CheckExact(names));
+ // None on failure.
+ assert(PyTuple_CheckExact(names));
attrs = _PyEval_MatchClass(tstate, subject, type, oparg, names);
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
if (attrs) {
- assert(PyTuple_CheckExact(attrs)); // Success!
- }
+ assert(PyTuple_CheckExact(attrs)); // Success!
+ }
else {
if (_PyErr_Occurred(tstate)) goto pop_3_error;
- attrs = Py_None; // Failure!
- }
- STACK_SHRINK(2);
- stack_pointer[-1] = attrs;
+ // Error!
+ attrs = Py_None; // Failure!
+ }
+ stack_pointer[-3] = attrs;
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(MATCH_KEYS) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4426,13 +4488,13 @@
keys = stack_pointer[-1];
subject = stack_pointer[-2];
// On successful match, PUSH(values). Otherwise, PUSH(None).
- values_or_none = _PyEval_MatchKeys(tstate, subject, keys);
+ values_or_none = _PyEval_MatchKeys(tstate, subject, keys);
if (values_or_none == NULL) goto error;
- STACK_GROW(1);
- stack_pointer[-1] = values_or_none;
+ stack_pointer[0] = values_or_none;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(MATCH_MAPPING) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4442,11 +4504,11 @@
subject = stack_pointer[-1];
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- STACK_GROW(1);
- stack_pointer[-1] = res;
+ stack_pointer[0] = res;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(MATCH_SEQUENCE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4456,18 +4518,18 @@
subject = stack_pointer[-1];
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- STACK_GROW(1);
- stack_pointer[-1] = res;
+ stack_pointer[0] = res;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(NOP) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(NOP);
DISPATCH();
}
-
+
TARGET(POP_EXCEPT) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4476,26 +4538,27 @@
exc_value = stack_pointer[-1];
_PyErr_StackItem *exc_info = tstate->exc_info;
Py_XSETREF(exc_info->exc_value, exc_value);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(POP_JUMP_IF_FALSE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(POP_JUMP_IF_FALSE);
PyObject *cond;
cond = stack_pointer[-1];
+
assert(PyBool_Check(cond));
int flag = Py_IsFalse(cond);
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache = (this_instr[1].cache << 1) | flag;
- #endif
+#endif
JUMPBY(oparg * flag);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(POP_JUMP_IF_NONE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -4519,15 +4582,15 @@
{
assert(PyBool_Check(cond));
int flag = Py_IsTrue(cond);
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache = (this_instr[1].cache << 1) | flag;
- #endif
+#endif
JUMPBY(oparg * flag);
}
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(POP_JUMP_IF_NOT_NONE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -4551,15 +4614,15 @@
{
assert(PyBool_Check(cond));
int flag = Py_IsFalse(cond);
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache = (this_instr[1].cache << 1) | flag;
- #endif
+#endif
JUMPBY(oparg * flag);
}
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(POP_JUMP_IF_TRUE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -4568,14 +4631,14 @@
cond = stack_pointer[-1];
assert(PyBool_Check(cond));
int flag = Py_IsTrue(cond);
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
this_instr[1].cache = (this_instr[1].cache << 1) | flag;
- #endif
+#endif
JUMPBY(oparg * flag);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(POP_TOP) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4583,10 +4646,10 @@
PyObject *value;
value = stack_pointer[-1];
Py_DECREF(value);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(PUSH_EXC_INFO) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4594,6 +4657,7 @@
PyObject *new_exc;
PyObject *prev_exc;
new_exc = stack_pointer[-1];
+
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -4603,53 +4667,56 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- STACK_GROW(1);
- stack_pointer[-2] = prev_exc;
- stack_pointer[-1] = new_exc;
+ stack_pointer[-1] = prev_exc;
+ stack_pointer[0] = new_exc;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(PUSH_NULL) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(PUSH_NULL);
PyObject *res;
res = NULL;
- STACK_GROW(1);
- stack_pointer[-1] = res;
+ stack_pointer[0] = res;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(RAISE_VARARGS) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(RAISE_VARARGS);
PyObject **args;
- args = stack_pointer - oparg;
+ args = &stack_pointer[-oparg];
+
TIER_ONE_ONLY
PyObject *cause = NULL, *exc = NULL;
switch (oparg) {
- case 2:
+ case 2:
cause = args[1];
/* fall through */
- case 1:
+ case 1:
exc = args[0];
/* fall through */
- case 0:
+ case 0:
if (do_raise(tstate, exc, cause)) {
assert(oparg == 0);
monitor_reraise(tstate, frame, this_instr);
goto exception_unwind;
}
break;
- default:
+ default:
_PyErr_SetString(tstate, PyExc_SystemError,
- "bad RAISE_VARARGS oparg");
+ "bad RAISE_VARARGS oparg");
break;
}
- if (true) { STACK_SHRINK(oparg); goto error; }
+ if (true) { stack_pointer += -oparg; goto error; }
+ stack_pointer += -oparg;
+ DISPATCH();
}
-
+
TARGET(RERAISE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4657,7 +4724,8 @@
PyObject *exc;
PyObject **values;
exc = stack_pointer[-1];
- values = stack_pointer - 1 - oparg;
+ values = &stack_pointer[-1 - oparg];
+
TIER_ONE_ONLY
assert(oparg >= 0 && oparg <= 2);
if (oparg) {
@@ -4678,27 +4746,27 @@
monitor_reraise(tstate, frame, this_instr);
goto exception_unwind;
}
-
+
TARGET(RESERVED) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(RESERVED);
+
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
}
-
+
TARGET(RESUME) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(RESUME);
PREDICTED(RESUME);
_Py_CODEUNIT *this_instr = next_instr - 1;
- static_assert(0 == 0, "incorrect cache size");
TIER_ONE_ONLY
assert(frame == tstate->current_frame);
uintptr_t global_version =
- _Py_atomic_load_uintptr_relaxed(&tstate->interp->ceval.eval_breaker) &
- ~_PY_EVAL_EVENTS_MASK;
+ _Py_atomic_load_uintptr_relaxed(&tstate->interp->ceval.eval_breaker) &
+ ~_PY_EVAL_EVENTS_MASK;
uintptr_t code_version = _PyFrame_GetCode(frame)->_co_instrumentation_version;
assert((code_version & 255) == 0);
if (code_version != global_version) {
@@ -4714,7 +4782,7 @@
}
DISPATCH();
}
-
+
TARGET(RESUME_CHECK) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4729,48 +4797,51 @@
DEOPT_IF(eval_breaker != version, RESUME);
DISPATCH();
}
-
+
TARGET(RETURN_CONST) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(RETURN_CONST);
PyObject *value;
PyObject *retval;
- // LOAD_CONST
+ // _LOAD_CONST
{
+
value = GETITEM(FRAME_CO_CONSTS, oparg);
Py_INCREF(value);
}
// _POP_FRAME
retval = value;
{
- assert(EMPTY());
- #if TIER_ONE
+
+#if TIER_ONE
assert(frame != &entry_frame);
- #endif
- STORE_SP();
+#endif
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ assert(EMPTY());
_Py_LeaveRecursiveCallPy(tstate);
// GH-99729: We need to unlink the frame *before* clearing it:
- _PyInterpreterFrame *dying = frame;
+ _PyInterpreterFrame *dying = frame;
frame = tstate->current_frame = dying->previous;
_PyEval_FrameClearAndPop(tstate, dying);
_PyFrame_StackPush(frame, retval);
LOAD_SP();
LOAD_IP(frame->return_offset);
- #if LLTRACE && TIER_ONE
+#if LLTRACE && TIER_ONE
lltrace = maybe_lltrace_resume_frame(frame, &entry_frame, GLOBALS());
if (lltrace < 0) {
goto exit_unwind;
}
- #endif
+#endif
}
DISPATCH();
}
-
+
TARGET(RETURN_GENERATOR) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(RETURN_GENERATOR);
+
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4794,22 +4865,22 @@
LOAD_IP(frame->return_offset);
goto resume_frame;
}
-
+
TARGET(RETURN_VALUE) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(RETURN_VALUE);
PyObject *retval;
retval = stack_pointer[-1];
- STACK_SHRINK(1);
- assert(EMPTY());
- #if TIER_ONE
+#if TIER_ONE
assert(frame != &entry_frame);
- #endif
- STORE_SP();
+#endif
+ stack_pointer += -1;
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ assert(EMPTY());
_Py_LeaveRecursiveCallPy(tstate);
// GH-99729: We need to unlink the frame *before* clearing it:
- _PyInterpreterFrame *dying = frame;
+ _PyInterpreterFrame *dying = frame;
frame = tstate->current_frame = dying->previous;
_PyEval_FrameClearAndPop(tstate, dying);
_PyFrame_StackPush(frame, retval);
@@ -4823,14 +4894,13 @@
#endif
DISPATCH();
}
-
+
TARGET(SEND) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(SEND);
PREDICTED(SEND);
_Py_CODEUNIT *this_instr = next_instr - 2;
- static_assert(INLINE_CACHE_ENTRIES_SEND == 1, "incorrect cache size");
PyObject *receiver;
PyObject *v;
PyObject *retval;
@@ -4838,8 +4908,9 @@
receiver = stack_pointer[-2];
{
uint16_t counter = read_u16(&this_instr[1].cache);
+
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_Send(receiver, next_instr);
@@ -4847,7 +4918,7 @@
}
STAT_INC(SEND, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _SEND
v = stack_pointer[-1];
@@ -4892,7 +4963,7 @@
stack_pointer[-1] = retval;
DISPATCH();
}
-
+
TARGET(SEND_GEN) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 2;
@@ -4916,16 +4987,17 @@
frame->return_offset = (uint16_t)(next_instr - this_instr + oparg);
DISPATCH_INLINED(gen_frame);
}
-
+
TARGET(SETUP_ANNOTATIONS) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(SETUP_ANNOTATIONS);
+
int err;
PyObject *ann_dict;
if (LOCALS() == NULL) {
_PyErr_Format(tstate, PyExc_SystemError,
- "no locals found when setting up annotations");
+ "no locals found when setting up annotations");
if (true) goto error;
}
/* check if __annotations__ in locals()... */
@@ -4934,7 +5006,7 @@
ann_dict = PyDict_New();
if (ann_dict == NULL) goto error;
err = PyObject_SetItem(LOCALS(), &_Py_ID(__annotations__),
- ann_dict);
+ ann_dict);
Py_DECREF(ann_dict);
if (err) goto error;
}
@@ -4943,7 +5015,7 @@
}
DISPATCH();
}
-
+
TARGET(SET_ADD) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4955,10 +5027,10 @@
int err = PySet_Add(set, v);
Py_DECREF(v);
if (err) goto pop_1_error;
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(SET_FUNCTION_ATTRIBUTE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -4967,35 +5039,36 @@
PyObject *attr;
func = stack_pointer[-1];
attr = stack_pointer[-2];
+
assert(PyFunction_Check(func));
PyFunctionObject *func_obj = (PyFunctionObject *)func;
switch(oparg) {
case MAKE_FUNCTION_CLOSURE:
- assert(func_obj->func_closure == NULL);
- func_obj->func_closure = attr;
- break;
+ assert(func_obj->func_closure == NULL);
+ func_obj->func_closure = attr;
+ break;
case MAKE_FUNCTION_ANNOTATIONS:
- assert(func_obj->func_annotations == NULL);
- func_obj->func_annotations = attr;
- break;
+ assert(func_obj->func_annotations == NULL);
+ func_obj->func_annotations = attr;
+ break;
case MAKE_FUNCTION_KWDEFAULTS:
- assert(PyDict_CheckExact(attr));
- assert(func_obj->func_kwdefaults == NULL);
- func_obj->func_kwdefaults = attr;
- break;
+ assert(PyDict_CheckExact(attr));
+ assert(func_obj->func_kwdefaults == NULL);
+ func_obj->func_kwdefaults = attr;
+ break;
case MAKE_FUNCTION_DEFAULTS:
- assert(PyTuple_CheckExact(attr));
- assert(func_obj->func_defaults == NULL);
- func_obj->func_defaults = attr;
- break;
+ assert(PyTuple_CheckExact(attr));
+ assert(func_obj->func_defaults == NULL);
+ func_obj->func_defaults = attr;
+ break;
default:
- Py_UNREACHABLE();
+ Py_UNREACHABLE();
}
- STACK_SHRINK(1);
- stack_pointer[-1] = func;
+ stack_pointer[-2] = func;
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(SET_UPDATE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5007,17 +5080,16 @@
int err = _PySet_Update(set, iterable);
Py_DECREF(iterable);
if (err < 0) goto pop_1_error;
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(STORE_ATTR) {
frame->instr_ptr = next_instr;
next_instr += 5;
INSTRUCTION_STATS(STORE_ATTR);
PREDICTED(STORE_ATTR);
_Py_CODEUNIT *this_instr = next_instr - 5;
- static_assert(INLINE_CACHE_ENTRIES_STORE_ATTR == 4, "incorrect cache size");
PyObject *owner;
PyObject *v;
// _SPECIALIZE_STORE_ATTR
@@ -5025,7 +5097,7 @@
{
uint16_t counter = read_u16(&this_instr[1].cache);
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
next_instr = this_instr;
@@ -5034,7 +5106,7 @@
}
STAT_INC(STORE_ATTR, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _STORE_ATTR
v = stack_pointer[-2];
@@ -5045,26 +5117,29 @@
Py_DECREF(owner);
if (err) goto pop_2_error;
}
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(STORE_ATTR_INSTANCE_VALUE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 5;
INSTRUCTION_STATS(STORE_ATTR_INSTANCE_VALUE);
PyObject *owner;
PyObject *value;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
uint32_t type_version = read_u32(&this_instr[2].cache);
+
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
}
// _GUARD_DORV_VALUES
{
+
assert(Py_TYPE(owner)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
PyDictOrValues dorv = *_PyObject_DictOrValuesPointer(owner);
DEOPT_IF(!_PyDictOrValues_IsValues(dorv), STORE_ATTR);
@@ -5086,16 +5161,17 @@
}
Py_DECREF(owner);
}
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(STORE_ATTR_SLOT) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 5;
INSTRUCTION_STATS(STORE_ATTR_SLOT);
PyObject *owner;
PyObject *value;
+ /* Skip 1 cache entry */
// _GUARD_TYPE_VERSION
owner = stack_pointer[-1];
{
@@ -5108,6 +5184,7 @@
value = stack_pointer[-2];
{
uint16_t index = read_u16(&this_instr[4].cache);
+
char *addr = (char *)owner + index;
STAT_INC(STORE_ATTR, hit);
PyObject *old_value = *(PyObject **)addr;
@@ -5115,10 +5192,10 @@
Py_XDECREF(old_value);
Py_DECREF(owner);
}
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(STORE_ATTR_WITH_HINT) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 5;
@@ -5167,10 +5244,10 @@
/* PEP 509 */
dict->ma_version_tag = new_version;
Py_DECREF(owner);
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(STORE_DEREF) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5181,10 +5258,10 @@
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
Py_XDECREF(oldobj);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(STORE_FAST) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5192,10 +5269,10 @@
PyObject *value;
value = stack_pointer[-1];
SETLOCAL(oparg, value);
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(STORE_FAST_LOAD_FAST) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5211,7 +5288,7 @@
stack_pointer[-1] = value2;
DISPATCH();
}
-
+
TARGET(STORE_FAST_STORE_FAST) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5224,24 +5301,25 @@
uint32_t oparg2 = oparg & 15;
SETLOCAL(oparg1, value1);
SETLOCAL(oparg2, value2);
- STACK_SHRINK(2);
+ stack_pointer += -2;
DISPATCH();
}
-
+
TARGET(STORE_GLOBAL) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(STORE_GLOBAL);
PyObject *v;
v = stack_pointer[-1];
+
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
Py_DECREF(v);
if (err) goto pop_1_error;
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(STORE_NAME) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5253,20 +5331,20 @@
int err;
if (ns == NULL) {
_PyErr_Format(tstate, PyExc_SystemError,
- "no locals found when storing %R", name);
+ "no locals found when storing %R", name);
Py_DECREF(v);
if (true) goto pop_1_error;
}
if (PyDict_CheckExact(ns))
- err = PyDict_SetItem(ns, name, v);
+ err = PyDict_SetItem(ns, name, v);
else
- err = PyObject_SetItem(ns, name, v);
+ err = PyObject_SetItem(ns, name, v);
Py_DECREF(v);
if (err) goto pop_1_error;
- STACK_SHRINK(1);
+ stack_pointer += -1;
DISPATCH();
}
-
+
TARGET(STORE_SLICE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5291,17 +5369,16 @@
Py_DECREF(v);
Py_DECREF(container);
if (err) goto pop_4_error;
- STACK_SHRINK(4);
+ stack_pointer += -4;
DISPATCH();
}
-
+
TARGET(STORE_SUBSCR) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(STORE_SUBSCR);
PREDICTED(STORE_SUBSCR);
_Py_CODEUNIT *this_instr = next_instr - 2;
- static_assert(INLINE_CACHE_ENTRIES_STORE_SUBSCR == 1, "incorrect cache size");
PyObject *sub;
PyObject *container;
PyObject *v;
@@ -5310,8 +5387,9 @@
container = stack_pointer[-2];
{
uint16_t counter = read_u16(&this_instr[1].cache);
+
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_StoreSubscr(container, sub, next_instr);
@@ -5319,7 +5397,7 @@
}
STAT_INC(STORE_SUBSCR, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _STORE_SUBSCR
v = stack_pointer[-3];
@@ -5331,10 +5409,10 @@
Py_DECREF(sub);
if (err) goto pop_3_error;
}
- STACK_SHRINK(3);
+ stack_pointer += -3;
DISPATCH();
}
-
+
TARGET(STORE_SUBSCR_DICT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -5350,10 +5428,10 @@
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub, value);
Py_DECREF(dict);
if (err) goto pop_3_error;
- STACK_SHRINK(3);
+ stack_pointer += -3;
DISPATCH();
}
-
+
TARGET(STORE_SUBSCR_LIST_INT) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -5366,24 +5444,22 @@
value = stack_pointer[-3];
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
-
// Ensure nonnegative, zero-or-one-digit ints.
- DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), STORE_SUBSCR);
+DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub), STORE_SUBSCR);
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
// Ensure index < len(list)
- DEOPT_IF(index >= PyList_GET_SIZE(list), STORE_SUBSCR);
+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);
- STACK_SHRINK(3);
+ stack_pointer += -3;
DISPATCH();
}
-
+
TARGET(SWAP) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5392,19 +5468,19 @@
PyObject *bottom;
top = stack_pointer[-1];
bottom = stack_pointer[-2 - (oparg-2)];
+
assert(oparg >= 2);
stack_pointer[-2 - (oparg-2)] = top;
stack_pointer[-1] = bottom;
DISPATCH();
}
-
+
TARGET(TO_BOOL) {
frame->instr_ptr = next_instr;
next_instr += 4;
INSTRUCTION_STATS(TO_BOOL);
PREDICTED(TO_BOOL);
_Py_CODEUNIT *this_instr = next_instr - 4;
- static_assert(INLINE_CACHE_ENTRIES_TO_BOOL == 3, "incorrect cache size");
PyObject *value;
PyObject *res;
// _SPECIALIZE_TO_BOOL
@@ -5412,7 +5488,7 @@
{
uint16_t counter = read_u16(&this_instr[1].cache);
TIER_ONE_ONLY
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_ToBool(value, next_instr);
@@ -5420,7 +5496,7 @@
}
STAT_INC(TO_BOOL, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
}
// _TO_BOOL
{
@@ -5432,7 +5508,7 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(TO_BOOL_ALWAYS_TRUE) {
_Py_CODEUNIT *this_instr = frame->instr_ptr = next_instr;
next_instr += 4;
@@ -5441,8 +5517,9 @@
PyObject *res;
value = stack_pointer[-1];
uint32_t version = read_u32(&this_instr[2].cache);
+
// This one is a bit weird, because we expect *some* failures:
- assert(version);
+ assert(version);
DEOPT_IF(Py_TYPE(value)->tp_version_tag != version, TO_BOOL);
STAT_INC(TO_BOOL, hit);
Py_DECREF(value);
@@ -5450,7 +5527,7 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(TO_BOOL_BOOL) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -5461,7 +5538,7 @@
STAT_INC(TO_BOOL, hit);
DISPATCH();
}
-
+
TARGET(TO_BOOL_INT) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -5482,7 +5559,7 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(TO_BOOL_LIST) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -5497,7 +5574,7 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(TO_BOOL_NONE) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -5506,13 +5583,13 @@
PyObject *res;
value = stack_pointer[-1];
// This one is a bit weird, because we expect *some* failures:
- DEOPT_IF(!Py_IsNone(value), TO_BOOL);
+DEOPT_IF(!Py_IsNone(value), TO_BOOL);
STAT_INC(TO_BOOL, hit);
res = Py_False;
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(TO_BOOL_STR) {
frame->instr_ptr = next_instr;
next_instr += 4;
@@ -5534,7 +5611,7 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(UNARY_INVERT) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5542,13 +5619,14 @@
PyObject *value;
PyObject *res;
value = stack_pointer[-1];
+
res = PyNumber_Invert(value);
Py_DECREF(value);
if (res == NULL) goto pop_1_error;
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(UNARY_NEGATIVE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5562,7 +5640,7 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(UNARY_NOT) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5575,35 +5653,35 @@
stack_pointer[-1] = res;
DISPATCH();
}
-
+
TARGET(UNPACK_EX) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(UNPACK_EX);
PyObject *seq;
seq = stack_pointer[-1];
+
int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
PyObject **top = stack_pointer + totalargs - 1;
int res = _PyEval_UnpackIterable(tstate, seq, oparg & 0xFF, oparg >> 8, top);
Py_DECREF(seq);
if (res == 0) goto pop_1_error;
- STACK_GROW((oparg & 0xFF) + (oparg >> 8));
+ stack_pointer += (oparg >> 8) + (oparg & 0xFF);
DISPATCH();
}
-
+
TARGET(UNPACK_SEQUENCE) {
frame->instr_ptr = next_instr;
next_instr += 2;
INSTRUCTION_STATS(UNPACK_SEQUENCE);
PREDICTED(UNPACK_SEQUENCE);
_Py_CODEUNIT *this_instr = next_instr - 2;
- static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
PyObject *seq;
// _SPECIALIZE_UNPACK_SEQUENCE
seq = stack_pointer[-1];
{
uint16_t counter = read_u16(&this_instr[1].cache);
- #if ENABLE_SPECIALIZATION
+#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
_Py_Specialize_UnpackSequence(seq, next_instr, oparg);
@@ -5611,22 +5689,22 @@
}
STAT_INC(UNPACK_SEQUENCE, deferred);
DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
- #endif /* ENABLE_SPECIALIZATION */
+#endif /* ENABLE_SPECIALIZATION */
(void)seq;
(void)counter;
}
// _UNPACK_SEQUENCE
{
+
PyObject **top = stack_pointer + oparg - 1;
int res = _PyEval_UnpackIterable(tstate, seq, oparg, -1, top);
Py_DECREF(seq);
if (res == 0) goto pop_1_error;
}
- STACK_SHRINK(1);
- STACK_GROW(oparg);
+ stack_pointer += -1 + oparg;
DISPATCH();
}
-
+
TARGET(UNPACK_SEQUENCE_LIST) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -5634,7 +5712,7 @@
PyObject *seq;
PyObject **values;
seq = stack_pointer[-1];
- values = stack_pointer - 1;
+ values = &stack_pointer[-1];
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -5643,11 +5721,10 @@
*values++ = Py_NewRef(items[i]);
}
Py_DECREF(seq);
- STACK_SHRINK(1);
- STACK_GROW(oparg);
+ stack_pointer += -1 + oparg;
DISPATCH();
}
-
+
TARGET(UNPACK_SEQUENCE_TUPLE) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -5655,7 +5732,7 @@
PyObject *seq;
PyObject **values;
seq = stack_pointer[-1];
- values = stack_pointer - 1;
+ values = &stack_pointer[-1];
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -5664,11 +5741,10 @@
*values++ = Py_NewRef(items[i]);
}
Py_DECREF(seq);
- STACK_SHRINK(1);
- STACK_GROW(oparg);
+ stack_pointer += -1 + oparg;
DISPATCH();
}
-
+
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
frame->instr_ptr = next_instr;
next_instr += 2;
@@ -5676,7 +5752,7 @@
PyObject *seq;
PyObject **values;
seq = stack_pointer[-1];
- values = stack_pointer - 1;
+ values = &stack_pointer[-1];
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
assert(oparg == 2);
@@ -5684,11 +5760,10 @@
values[0] = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
values[1] = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
Py_DECREF(seq);
- STACK_SHRINK(1);
- STACK_GROW(oparg);
+ stack_pointer += -1 + oparg;
DISPATCH();
}
-
+
TARGET(WITH_EXCEPT_START) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5700,6 +5775,7 @@
val = stack_pointer[-1];
lasti = stack_pointer[-3];
exit_func = stack_pointer[-4];
+
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -5707,9 +5783,7 @@
- exit_func: FOURTH = the context.__exit__ bound method
We call FOURTH(type(TOP), TOP, GetTraceback(TOP)).
Then we push the __exit__ return value.
- */
- PyObject *exc, *tb;
-
+ */PyObject *exc, *tb;
assert(val && PyExceptionInstance_Check(val));
exc = PyExceptionInstance_Class(val);
tb = PyException_GetTraceback(val);
@@ -5721,15 +5795,17 @@
}
assert(PyLong_Check(lasti));
(void)lasti; // Shut up compiler warning if asserts are off
- PyObject *stack[4] = {NULL, exc, val, tb};
+ PyObject *stack[4] = {
+ NULL, exc, val, tb}
+ ;
res = PyObject_Vectorcall(exit_func, stack + 1,
- 3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+ 3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- STACK_GROW(1);
- stack_pointer[-1] = res;
+ stack_pointer[0] = res;
+ stack_pointer += 1;
DISPATCH();
}
-
+
TARGET(YIELD_VALUE) {
frame->instr_ptr = next_instr;
next_instr += 1;
@@ -5737,9 +5813,9 @@
PyObject *retval;
retval = stack_pointer[-1];
// 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(frame != &entry_frame);
+ // The compiler treats any exception raised here as a failed close()
+ // or throw() call.
+ assert(frame != &entry_frame);
frame->instr_ptr = next_instr;
PyGenObject *gen = _PyFrame_GetGenerator(frame);
assert(FRAME_SUSPENDED_YIELD_FROM == FRAME_SUSPENDED + 1);
@@ -5758,5 +5834,5 @@
LOAD_IP(1 + INLINE_CACHE_ENTRIES_SEND);
goto resume_frame;
}
-
+
#undef TIER_ONE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment