https://github.com/python/cpython/commit/f15999da9218942ac99211b1b68c3743d0813db6
commit: f15999da9218942ac99211b1b68c3743d0813db6
branch: main
author: Andrew Svetlov <[email protected]>
committer: asvetlov <[email protected]>
date: 2026-11-19T21:21:51+01:00
summary:

gh-161875: Push NULL and None in GET_AWAITABLE (#161876)

* Push NULL and None in GET_AWAITABLE

Every await site compiled to GET_AWAITABLE; PUSH_NULL; LOAD_CONST None;
SEND. GET_AWAITABLE is always followed by that pair, so let it push
(iter, NULL, None) itself. `await f()` now compiles to
CALL; GET_AWAITABLE; SEND, saving two dispatches per await.

The tier-2 optimizer gets an override so the NULL and None slots are
known constants.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

* Add NEWS entry

Co-Authored-By: Claude Opus 5.5 <[email protected]>

---------

Co-authored-by: Claude Opus 5.5 <[email protected]>

files:
A 
Misc/NEWS.d/next/Core_and_Builtins/2026-11-12-14-37-21.gh-issue-161875.W-nGSw.rst
M Doc/library/dis.rst
M Include/internal/pycore_magic_number.h
M Include/internal/pycore_opcode_metadata.h
M Include/internal/pycore_uop_ids.h
M Include/internal/pycore_uop_metadata.h
M Lib/test/test_dis.py
M Modules/_testinternalcapi/test_cases.c.h
M Python/bytecodes.c
M Python/codegen.c
M Python/executor_cases.c.h
M Python/generated_cases.c.h
M Python/optimizer_bytecodes.c
M Python/optimizer_cases.c.h

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 16c2dab5b8adba1..4d1740fe468a0a8 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -817,7 +817,8 @@ not have to be) the original ``STACK[-2]``.
 
 .. opcode:: GET_AWAITABLE (where)
 
-   Implements ``STACK[-1] = get_awaitable(STACK[-1])``, where 
``get_awaitable(o)``
+   Replaces ``STACK[-1]`` with ``get_awaitable(STACK[-1])``, ``NULL`` and
+   ``None``, ready for :opcode:`SEND`. ``get_awaitable(o)``
    returns ``o`` if ``o`` is a coroutine object or a generator object with
    the :data:`~inspect.CO_ITERABLE_COROUTINE` flag, or resolves
    ``o.__await__``.
@@ -833,6 +834,10 @@ not have to be) the original ``STACK[-2]``.
    .. versionchanged:: 3.11
       Previously, this instruction did not have an oparg.
 
+   .. versionchanged:: next
+      Also pushes ``NULL`` and ``None``, which were previously pushed by
+      separate instructions.
+
 
 .. opcode:: GET_AITER
 
diff --git a/Include/internal/pycore_magic_number.h 
b/Include/internal/pycore_magic_number.h
index 15d3ad6f3a336b7..8413528c0a26839 100644
--- a/Include/internal/pycore_magic_number.h
+++ b/Include/internal/pycore_magic_number.h
@@ -304,6 +304,7 @@ Known values:
     Python 3.16a1 3704 (Replace DELETE_ATTR with PUSH_NULL; STORE_ATTR)
     Python 3.16a1 3705 (Add INTRINSIC_ADD_CONDITIONAL_ANNOTATION)
     Python 3.16a1 3706 (Add INTRINSIC_MATCH_CLASS_ISINSTANCE)
+    Python 3.16a1 3707 (GET_AWAITABLE also pushes NULL and None for SEND)
 
     Python 3.17 will start with 3750
 
@@ -313,7 +314,7 @@ Known values:
 
 */
 
-#define PYC_MAGIC_NUMBER 3706
+#define PYC_MAGIC_NUMBER 3707
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
    (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \
diff --git a/Include/internal/pycore_opcode_metadata.h 
b/Include/internal/pycore_opcode_metadata.h
index 04b826ed09144e7..ca1004816d8b00d 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -716,7 +716,7 @@ int _PyOpcode_num_pushed(int opcode, int oparg)  {
         case GET_ANEXT:
             return 2;
         case GET_AWAITABLE:
-            return 1;
+            return 3;
         case GET_ITER:
             return 2;
         case GET_ITER_SELF:
diff --git a/Include/internal/pycore_uop_ids.h 
b/Include/internal/pycore_uop_ids.h
index ba6e0252024a6df..8006830801916a9 100644
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -690,7 +690,7 @@ enum {
     _FOR_ITER_VIRTUAL_TIER_TWO_r23,
     _GET_AITER_r11,
     _GET_ANEXT_r12,
-    _GET_AWAITABLE_r11,
+    _GET_AWAITABLE_r13,
     _GET_ITER_r12,
     _GET_ITER_TRAD_r12,
     _GET_LEN_r12,
diff --git a/Include/internal/pycore_uop_metadata.h 
b/Include/internal/pycore_uop_metadata.h
index 0cd82c53aa932ae..e746fd7c3b79b0b 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -1639,7 +1639,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
         .best = { 1, 1, 1, 1 },
         .entries = {
             { -1, -1, -1 },
-            { 1, 1, _GET_AWAITABLE_r11 },
+            { 3, 1, _GET_AWAITABLE_r13 },
             { -1, -1, -1 },
             { -1, -1, -1 },
         },
@@ -4284,7 +4284,7 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
     [_RETURN_VALUE_r11] = _RETURN_VALUE,
     [_GET_AITER_r11] = _GET_AITER,
     [_GET_ANEXT_r12] = _GET_ANEXT,
-    [_GET_AWAITABLE_r11] = _GET_AWAITABLE,
+    [_GET_AWAITABLE_r13] = _GET_AWAITABLE,
     [_SEND_GEN_FRAME_r33] = _SEND_GEN_FRAME,
     [_GUARD_TOS_IS_NONE_r01] = _GUARD_TOS_IS_NONE,
     [_GUARD_TOS_IS_NONE_r11] = _GUARD_TOS_IS_NONE,
@@ -5238,7 +5238,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = 
{
     [_GET_ANEXT] = "_GET_ANEXT",
     [_GET_ANEXT_r12] = "_GET_ANEXT_r12",
     [_GET_AWAITABLE] = "_GET_AWAITABLE",
-    [_GET_AWAITABLE_r11] = "_GET_AWAITABLE_r11",
+    [_GET_AWAITABLE_r13] = "_GET_AWAITABLE_r13",
     [_GET_ITER] = "_GET_ITER",
     [_GET_ITER_r12] = "_GET_ITER_r12",
     [_GET_ITER_TRAD] = "_GET_ITER_TRAD",
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 709fa374704f1f5..2c3972c7394d01b 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -615,8 +615,6 @@ async def _asyncwith(c):
                 LOAD_SPECIAL             2 (__aenter__)
                 CALL                     0
                 GET_AWAITABLE            1
-                PUSH_NULL
-                LOAD_COMMON_CONSTANT     7 (None)
         L2:     SEND                     4 (to L5)
         L3:     YIELD_VALUE              1
         L4:     RESUME                   3
@@ -632,8 +630,6 @@ async def _asyncwith(c):
                 LOAD_COMMON_CONSTANT     7 (None)
                 CALL                     3
                 GET_AWAITABLE            2
-                PUSH_NULL
-                LOAD_COMMON_CONSTANT     7 (None)
         L8:     SEND                     4 (to L11)
         L9:     YIELD_VALUE              1
        L10:     RESUME                   3
@@ -647,14 +643,12 @@ async def _asyncwith(c):
                 RETURN_VALUE
 
 %4d   L12:     CLEANUP_THROW
-       L13:     JUMP_BACKWARD_NO_INTERRUPT 28 (to L5)
+       L13:     JUMP_BACKWARD_NO_INTERRUPT 26 (to L5)
        L14:     CLEANUP_THROW
        L15:     JUMP_BACKWARD_NO_INTERRUPT 10 (to L11)
        L16:     PUSH_EXC_INFO
                 WITH_EXCEPT_START
                 GET_AWAITABLE            2
-                PUSH_NULL
-                LOAD_COMMON_CONSTANT     7 (None)
        L17:     SEND                     5 (to L21)
        L18:     YIELD_VALUE              1
        L19:     RESUME                   3
diff --git 
a/Misc/NEWS.d/next/Core_and_Builtins/2026-11-12-14-37-21.gh-issue-161875.W-nGSw.rst
 
b/Misc/NEWS.d/next/Core_and_Builtins/2026-11-12-14-37-21.gh-issue-161875.W-nGSw.rst
new file mode 100644
index 000000000000000..693f39a2bef9177
--- /dev/null
+++ 
b/Misc/NEWS.d/next/Core_and_Builtins/2026-11-12-14-37-21.gh-issue-161875.W-nGSw.rst
@@ -0,0 +1,3 @@
+The :opcode:`GET_AWAITABLE` instruction now also pushes the ``NULL`` and
+``None`` that start the :opcode:`SEND` loop, so ``await`` no longer needs
+separate :opcode:`PUSH_NULL` and ``LOAD_CONST None`` instructions.
diff --git a/Modules/_testinternalcapi/test_cases.c.h 
b/Modules/_testinternalcapi/test_cases.c.h
index cfa8faa15f4faea..457592374d73d1c 100644
--- a/Modules/_testinternalcapi/test_cases.c.h
+++ b/Modules/_testinternalcapi/test_cases.c.h
@@ -6824,6 +6824,8 @@
             INSTRUCTION_STATS(GET_AWAITABLE);
             _PyStackRef iterable;
             _PyStackRef iter;
+            _PyStackRef null;
+            _PyStackRef none;
             iterable = stack_pointer[-1];
             _PyFrame_SetStackPointer(frame, stack_pointer);
             _PyFrame_StackPointerValidate(frame);
@@ -6839,8 +6841,12 @@
                 JUMP_TO_LABEL(error);
             }
             iter = PyStackRef_FromPyObjectSteal(iter_o);
+            null = PyStackRef_NULL;
+            none = PyStackRef_None;
             stack_pointer[0] = iter;
-            stack_pointer += 1;
+            stack_pointer[1] = null;
+            stack_pointer[2] = none;
+            stack_pointer += 3;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             DISPATCH();
         }
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index bd5debcd01e9bfd..c914da85cc65777 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -1649,11 +1649,13 @@ dummy_func(
             awaitable = PyStackRef_FromPyObjectSteal(awaitable_o);
         }
 
-        inst(GET_AWAITABLE, (iterable -- iter)) {
+        inst(GET_AWAITABLE, (iterable -- iter, null, none)) {
             PyObject *iter_o = 
_PyEval_GetAwaitable(PyStackRef_AsPyObjectBorrow(iterable), oparg);
             PyStackRef_CLOSE(iterable);
             ERROR_IF(iter_o == NULL);
             iter = PyStackRef_FromPyObjectSteal(iter_o);
+            null = PyStackRef_NULL;
+            none = PyStackRef_None;
         }
 
         family(SEND, INLINE_CACHE_ENTRIES_SEND) = {
diff --git a/Python/codegen.c b/Python/codegen.c
index a975705576a167c..ac5e7904c053a00 100644
--- a/Python/codegen.c
+++ b/Python/codegen.c
@@ -618,8 +618,6 @@ codegen_unwind_fblock(compiler *c, location *ploc,
             RETURN_IF_ERROR(codegen_call_exit_with_nones(c, *ploc));
             if (info->fb_type == COMPILE_FBLOCK_ASYNC_WITH) {
                 ADDOP_I(c, *ploc, GET_AWAITABLE, 2);
-                ADDOP(c, *ploc, PUSH_NULL);
-                ADDOP_LOAD_CONST(c, *ploc, Py_None);
                 ADD_YIELD_FROM(c, *ploc, 1);
             }
             ADDOP(c, *ploc, POP_TOP);
@@ -5167,8 +5165,6 @@ codegen_comprehension(compiler *c, expr_ty e, int type,
 
     if (is_async_comprehension && type != COMP_GENEXP) {
         ADDOP_I(c, loc, GET_AWAITABLE, 0);
-        ADDOP(c, loc, PUSH_NULL);
-        ADDOP_LOAD_CONST(c, loc, Py_None);
         ADD_YIELD_FROM(c, loc, 1);
     }
 
@@ -5312,8 +5308,6 @@ codegen_async_with_inner(compiler *c, stmt_ty s, int pos)
     ADDOP_I(c, loc, LOAD_SPECIAL, SPECIAL___AENTER__);
     ADDOP_I(c, loc, CALL, 0);
     ADDOP_I(c, loc, GET_AWAITABLE, 1);
-    ADDOP(c, loc, PUSH_NULL);
-    ADDOP_LOAD_CONST(c, loc, Py_None);
     ADD_YIELD_FROM(c, loc, 1);
 
     ADDOP_JUMP(c, loc, SETUP_WITH, final);
@@ -5349,8 +5343,6 @@ codegen_async_with_inner(compiler *c, stmt_ty s, int pos)
      */
     RETURN_IF_ERROR(codegen_call_exit_with_nones(c, loc));
     ADDOP_I(c, loc, GET_AWAITABLE, 2);
-    ADDOP(c, loc, PUSH_NULL);
-    ADDOP_LOAD_CONST(c, loc, Py_None);
     ADD_YIELD_FROM(c, loc, 1);
 
     ADDOP(c, loc, POP_TOP);
@@ -5364,8 +5356,6 @@ codegen_async_with_inner(compiler *c, stmt_ty s, int pos)
     ADDOP(c, loc, PUSH_EXC_INFO);
     ADDOP(c, loc, WITH_EXCEPT_START);
     ADDOP_I(c, loc, GET_AWAITABLE, 2);
-    ADDOP(c, loc, PUSH_NULL);
-    ADDOP_LOAD_CONST(c, loc, Py_None);
     ADD_YIELD_FROM(c, loc, 1);
     RETURN_IF_ERROR(codegen_with_except_finish(c, cleanup));
 
@@ -5552,8 +5542,6 @@ codegen_visit_expr_impl(compiler *c, expr_ty e, bool 
result_is_unused)
     case Await_kind:
         VISIT(c, expr, e->v.Await.value);
         ADDOP_I(c, loc, GET_AWAITABLE, 0);
-        ADDOP(c, loc, PUSH_NULL);
-        ADDOP_LOAD_CONST(c, loc, Py_None);
         ADD_YIELD_FROM(c, loc, 1);
         break;
     case Compare_kind:
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 58473deddcebe3c..02689598a649e8b 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -8906,11 +8906,13 @@
             break;
         }
 
-        case _GET_AWAITABLE_r11: {
+        case _GET_AWAITABLE_r13: {
             CHECK_CURRENT_CACHED_VALUES(1);
             ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
             _PyStackRef iterable;
             _PyStackRef iter;
+            _PyStackRef null;
+            _PyStackRef none;
             _PyStackRef _stack_item_0 = _tos_cache0;
             oparg = CURRENT_OPARG();
             iterable = _stack_item_0;
@@ -8932,10 +8934,12 @@
                 JUMP_TO_ERROR();
             }
             iter = PyStackRef_FromPyObjectSteal(iter_o);
+            null = PyStackRef_NULL;
+            none = PyStackRef_None;
+            _tos_cache2 = none;
+            _tos_cache1 = null;
             _tos_cache0 = iter;
-            _tos_cache1 = PyStackRef_ZERO_BITS;
-            _tos_cache2 = PyStackRef_ZERO_BITS;
-            SET_CURRENT_CACHED_VALUES(1);
+            SET_CURRENT_CACHED_VALUES(3);
             ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
             break;
         }
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index e5b3548b66412cd..05a68ead027b743 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -6824,6 +6824,8 @@
             INSTRUCTION_STATS(GET_AWAITABLE);
             _PyStackRef iterable;
             _PyStackRef iter;
+            _PyStackRef null;
+            _PyStackRef none;
             iterable = stack_pointer[-1];
             _PyFrame_SetStackPointer(frame, stack_pointer);
             _PyFrame_StackPointerValidate(frame);
@@ -6839,8 +6841,12 @@
                 JUMP_TO_LABEL(error);
             }
             iter = PyStackRef_FromPyObjectSteal(iter_o);
+            null = PyStackRef_NULL;
+            none = PyStackRef_None;
             stack_pointer[0] = iter;
-            stack_pointer += 1;
+            stack_pointer[1] = null;
+            stack_pointer[2] = none;
+            stack_pointer += 3;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             DISPATCH();
         }
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 6284885c428832b..b1be62bbe0613e5 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -2772,6 +2772,12 @@ dummy_func(void) {
         }
     }
 
+    op(_GET_AWAITABLE, (iterable -- iter, null, none)) {
+        iter = sym_new_not_null(ctx);
+        null = PyJitRef_Borrow(sym_new_null(ctx));
+        none = PyJitRef_Borrow(sym_new_const(ctx, Py_None));
+    }
+
 // END BYTECODES //
 
 }
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 9cd20c495db4418..6c5fb641c564e9f 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -1888,8 +1888,17 @@
 
         case _GET_AWAITABLE: {
             JitOptRef iter;
+            JitOptRef null;
+            JitOptRef none;
             iter = sym_new_not_null(ctx);
+            null = PyJitRef_Borrow(sym_new_null(ctx));
+            none = PyJitRef_Borrow(sym_new_const(ctx, Py_None));
+            CHECK_STACK_BOUNDS(2);
             stack_pointer[-1] = iter;
+            stack_pointer[0] = null;
+            stack_pointer[1] = none;
+            stack_pointer += 2;
+            ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }
 

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

Reply via email to