gh-105775: Update documentation, whitespace tweaks

- Describe the LOAD_CLOSURE change using more neutral language - Add back in deleted whitespace - Add an assertion to IsolatedAssembleTests.test_expression_with_pseudo_instruction_load_closure - Regenerate generated files
gvanrossum · Jun 29, 2023 · Jun 24, 2023 · Jun 24, 2023 · Jun 25, 2023 · Jun 25, 2023
commit 988189df3788c161834079e9bad9da5e0071a74f
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
@@ -1721,7 +1721,7 @@ but are replaced by real opcodes or removed before bytecode is generated.
    Note that ``LOAD_CLOSURE`` is replaced with ``LOAD_FAST`` in the assembler.
 
    .. versionchanged:: 3.13
-      This opcode was demoted from full opcode to pseudo-instruction
+      This opcode is now a pseudo-instruction.
 
 
 .. opcode:: LOAD_METHOD

@@ -451,7 +451,7 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.13a1 3553 (Add SET_FUNCTION_ATTRIBUTE)
 #     Python 3.13a1 3554 (more efficient bytecodes for f-strings)
 #     Python 3.13a1 3555 (generate specialized opcodes metadata from bytecodes.c)
-#     Python 3.13a1 3556 (Remove LOAD_CLOSURE)
+#     Python 3.13a1 3556 (Convert LOAD_CLOSURE to a pseudo-op)
 
 #     Python 3.14 will start with 3600
 

diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -289,9 +289,9 @@ def pseudo_op(name, op, real_ops):
 pseudo_op('LOAD_SUPER_METHOD', 263, ['LOAD_SUPER_ATTR'])
 pseudo_op('LOAD_ZERO_SUPER_METHOD', 264, ['LOAD_SUPER_ATTR'])
 pseudo_op('LOAD_ZERO_SUPER_ATTR', 265, ['LOAD_SUPER_ATTR'])
-pseudo_op('LOAD_CLOSURE', 267, ['LOAD_FAST'])
 
 pseudo_op('STORE_FAST_MAYBE_NULL', 266, ['STORE_FAST'])
+pseudo_op('LOAD_CLOSURE', 267, ['LOAD_FAST'])
 
 MAX_PSEUDO_OPCODE = MIN_PSEUDO_OPCODE + len(_pseudo_ops) - 1
 

diff --git a/Lib/test/test_compiler_assemble.py b/Lib/test/test_compiler_assemble.py
@@ -80,6 +80,7 @@ def inner():
             return inner() % 2
 
         inner_code = mod_two.__code__.co_consts[1]
+        assert isinstance(inner_code, types.CodeType)
 
         metadata = {
             'filename' : 'mod_two.py',

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-06-24-10-34-27.gh-issue-105775.OqjoGV.rst b/Misc/NEWS.d/next/Core and Builtins/2023-06-24-10-34-27.gh-issue-105775.OqjoGV.rst
@@ -1 +1 @@
-Remove the LOAD_CLOSURE opcode and make it a pseudo-op instead.
+Convert :opcode:`LOAD_CLOSURE` to a pseudo-op.
@@ -132,6 +132,7 @@ dummy_func(
 // BEGIN BYTECODES //
         inst(NOP, (--)) {
         }
+
         inst(RESUME, (--)) {
             assert(tstate->cframe == &cframe);
             assert(frame == cframe.current_frame);
@@ -195,6 +196,7 @@ dummy_func(
             // do not use SETLOCAL here, it decrefs the old value
             GETLOCAL(oparg) = NULL;
         }
+
         inst(LOAD_FAST_LOAD_FAST, ( -- value1, value2)) {
             uint32_t oparg1 = oparg >> 4;
             uint32_t oparg2 = oparg & 15;

@@ -843,6 +843,7 @@ stack_effect(int opcode, int oparg, int jump)
              * of __(a)enter__ and push 2 values before jumping to the handler
              * if an exception be raised. */
             return jump ? 1 : 0;
+
         case STORE_FAST_MAYBE_NULL:
             return -1;
         case LOAD_CLOSURE:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Remove the LOAD_CLOSURE opcode and make it a pseudo-op instead.
		Convert :opcode:`LOAD_CLOSURE` to a pseudo-op.
Comment thread polynomialherder marked this conversation as resolved. Outdated