summaryrefslogtreecommitdiffstats
path: root/Python/generated_cases.c.h
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2023-02-07 23:44:37 (GMT)
committerGitHub <noreply@github.com>2023-02-07 23:44:37 (GMT)
commitaacbdb0c650492756738b044e6ddf8b72f89a1a2 (patch)
treef36e5be44c5415e626b72f0255f46a1615eff29e /Python/generated_cases.c.h
parent753fc8a5d64369cd228c3e43fef1811ac3cfde83 (diff)
downloadcpython-aacbdb0c650492756738b044e6ddf8b72f89a1a2.zip
cpython-aacbdb0c650492756738b044e6ddf8b72f89a1a2.tar.gz
cpython-aacbdb0c650492756738b044e6ddf8b72f89a1a2.tar.bz2
gh-98831: Finish the UNPACK_SEQUENCE family (#101666)
New generator feature: Generate useful glue for output arrays, so you can just write values to the output array (no bounds checking). Rewrote UNPACK_SEQUENCE_TWO_TUPLE to use this, and also UNPACK_SEQUENCE_{TUPLE,LIST}.
Diffstat (limited to 'Python/generated_cases.c.h')
-rw-r--r--Python/generated_cases.c.h38
1 files changed, 21 insertions, 17 deletions
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index de98b1a..ded68d0 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -1125,6 +1125,7 @@
TARGET(UNPACK_SEQUENCE) {
PREDICTED(UNPACK_SEQUENCE);
+ static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
PyObject *seq = PEEK(1);
#if ENABLE_SPECIALIZATION
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
@@ -1149,48 +1150,51 @@
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
PyObject *seq = PEEK(1);
- PyObject *v1;
- PyObject *v0;
+ PyObject **values = stack_pointer - (1);
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
+ assert(oparg == 2);
STAT_INC(UNPACK_SEQUENCE, hit);
- v1 = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
- v0 = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
+ values[0] = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
+ values[1] = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
Py_DECREF(seq);
- STACK_GROW(1);
- POKE(1, v0);
- POKE(2, v1);
+ STACK_SHRINK(1);
+ STACK_GROW(oparg);
JUMPBY(1);
DISPATCH();
}
TARGET(UNPACK_SEQUENCE_TUPLE) {
- PyObject *seq = TOP();
+ PyObject *seq = PEEK(1);
+ PyObject **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);
- STACK_SHRINK(1);
PyObject **items = _PyTuple_ITEMS(seq);
- while (oparg--) {
- PUSH(Py_NewRef(items[oparg]));
+ for (int i = oparg; --i >= 0; ) {
+ *values++ = Py_NewRef(items[i]);
}
Py_DECREF(seq);
- JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE);
+ STACK_SHRINK(1);
+ STACK_GROW(oparg);
+ JUMPBY(1);
DISPATCH();
}
TARGET(UNPACK_SEQUENCE_LIST) {
- PyObject *seq = TOP();
+ PyObject *seq = PEEK(1);
+ PyObject **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);
- STACK_SHRINK(1);
PyObject **items = _PyList_ITEMS(seq);
- while (oparg--) {
- PUSH(Py_NewRef(items[oparg]));
+ for (int i = oparg; --i >= 0; ) {
+ *values++ = Py_NewRef(items[i]);
}
Py_DECREF(seq);
- JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE);
+ STACK_SHRINK(1);
+ STACK_GROW(oparg);
+ JUMPBY(1);
DISPATCH();
}