Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 64204de

Browse files
serhiy-storchakaserhiy-storchaka
committed
Issue #27095: Simplified MAKE_FUNCTION and removed MAKE_CLOSURE opcodes.
Patch by Demur Rumed.
1 parent 5697c4b commit 64204de

13 files changed

Lines changed: 4090 additions & 4150 deletions

File tree

‎Doc/library/dis.rst‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -937,27 +937,16 @@ All of the following opcodes use their arguments.
937937
.. opcode:: MAKE_FUNCTION (argc)
938938

939939
Pushes a new function object on the stack. From bottom to top, the consumed
940-
stack must consist of
941-
942-
* ``argc & 0xFF`` default argument objects in positional order
943-
* ``(argc >> 8) & 0xFF`` pairs of name and default argument, with the name
944-
just below the object on the stack, for keyword-only parameters
945-
* ``(argc >> 16) & 0x7FFF`` parameter annotation objects
946-
* a tuple listing the parameter names for the annotations (only if there are
947-
ony annotation objects)
940+
stack must consist of values if the argument carries a specified flag value
941+
942+
* ``0x01`` a tuple of default argument objects in positional order
943+
* ``0x02`` a dictionary of keyword-only parameters' default values
944+
* ``0x04`` an annotation dictionary
945+
* ``0x08`` a tuple containing cells for free variables, making a closure
948946
* the code associated with the function (at TOS1)
949947
* the :term:`qualified name` of the function (at TOS)
950948

951949

952-
.. opcode:: MAKE_CLOSURE (argc)
953-
954-
Creates a new function object, sets its *__closure__* slot, and pushes it on
955-
the stack. TOS is the :term:`qualified name` of the function, TOS1 is the
956-
code associated with the function, and TOS2 is the tuple containing cells for
957-
the closure's free variables. *argc* is interpreted as in ``MAKE_FUNCTION``;
958-
the annotations and defaults are also in the same order below TOS2.
959-
960-
961950
.. opcode:: BUILD_SLICE (argc)
962951

963952
.. index:: builtin: slice

‎Include/opcode.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ extern "C" {
102102
#define CALL_FUNCTION 131
103103
#define MAKE_FUNCTION 132
104104
#define BUILD_SLICE 133
105-
#define MAKE_CLOSURE 134
106105
#define LOAD_CLOSURE 135
107106
#define LOAD_DEREF 136
108107
#define STORE_DEREF 137

‎Lib/importlib/_bootstrap_external.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,10 @@ def _write_atomic(path, data, mode=0o666):
222222
# Python 3.5.2 3351 (fix BUILD_MAP_UNPACK_WITH_CALL opcode #27286)
223223
# Python 3.6a0 3360 (add FORMAT_VALUE opcode #25483
224224
# Python 3.6a0 3361 (lineno delta of code.co_lnotab becomes signed)
225-
# Python 3.6a0 3370 (16 bit wordcode)
226-
# Python 3.6a0 3371 (add BUILD_CONST_KEY_MAP opcode #27140)
225+
# Python 3.6a1 3370 (16 bit wordcode)
226+
# Python 3.6a1 3371 (add BUILD_CONST_KEY_MAP opcode #27140)
227+
# Python 3.6a1 3372 (MAKE_FUNCTION simplification, remove MAKE_CLOSURE
228+
#27095)
227229
#
228230
# MAGIC must change whenever the bytecode emitted by the compiler may no
229231
# longer be understood by older implementations of the eval loop (usually
@@ -232,7 +234,7 @@ def _write_atomic(path, data, mode=0o666):
232234
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
233235
# in PC/launcher.c must also be updated.
234236

235-
MAGIC_NUMBER = (3371).to_bytes(2, 'little') + b'\r\n'
237+
MAGIC_NUMBER = (3372).to_bytes(2, 'little') + b'\r\n'
236238
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
237239

238240
_PYCACHE = '__pycache__'

‎Lib/lib2to3/tests/data/py3_test_grammar.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def null(x): return x
319319
def f(x) -> list: pass
320320
self.assertEquals(f.__annotations__, {'return': list})
321321

322-
# test MAKE_CLOSURE with a variety of oparg's
322+
# test closures with a variety of oparg's
323323
closure = 1
324324
def f(): return closure
325325
def f(x=1): return closure

‎Lib/opcode.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,8 @@ def jabs_op(name, op):
173173
def_op('RAISE_VARARGS', 130) # Number of raise arguments (1, 2, or 3)
174174
def_op('CALL_FUNCTION', 131) # #args + (#kwargs << 8)
175175
hasnargs.append(131)
176-
def_op('MAKE_FUNCTION', 132) # Number of args with default values
176+
def_op('MAKE_FUNCTION', 132) # Flags
177177
def_op('BUILD_SLICE', 133) # Number of items
178-
def_op('MAKE_CLOSURE', 134)
179178
def_op('LOAD_CLOSURE', 135)
180179
hasfree.append(135)
181180
def_op('LOAD_DEREF', 136)

‎Lib/test/test_dis.py‎

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -649,50 +649,48 @@ def jumpy():
649649

650650
Instruction = dis.Instruction
651651
expected_opinfo_outer = [
652-
Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=3, argrepr='3', offset=0, starts_line=2, is_jump_target=False),
653-
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=2, starts_line=None, is_jump_target=False),
654-
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='a', argrepr='a', offset=4, starts_line=None, is_jump_target=False),
655-
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='b', argrepr='b', offset=6, starts_line=None, is_jump_target=False),
656-
Instruction(opname='BUILD_TUPLE', opcode=102, arg=2, argval=2, argrepr='', offset=8, starts_line=None, is_jump_target=False),
657-
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_f, argrepr=repr(code_object_f), offset=10, starts_line=None, is_jump_target=False),
658-
Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer.<locals>.f', argrepr="'outer.<locals>.f'", offset=12, starts_line=None, is_jump_target=False),
659-
Instruction(opname='MAKE_CLOSURE', opcode=134, arg=2, argval=2, argrepr='', offset=14, starts_line=None, is_jump_target=False),
660-
Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='f', argrepr='f', offset=16, starts_line=None, is_jump_target=False),
661-
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=18, starts_line=7, is_jump_target=False),
662-
Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='a', argrepr='a', offset=20, starts_line=None, is_jump_target=False),
663-
Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='b', argrepr='b', offset=22, starts_line=None, is_jump_target=False),
664-
Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval='', argrepr="''", offset=24, starts_line=None, is_jump_target=False),
665-
Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval=1, argrepr='1', offset=26, starts_line=None, is_jump_target=False),
666-
Instruction(opname='BUILD_LIST', opcode=103, arg=0, argval=0, argrepr='', offset=28, starts_line=None, is_jump_target=False),
667-
Instruction(opname='BUILD_MAP', opcode=105, arg=0, argval=0, argrepr='', offset=30, starts_line=None, is_jump_target=False),
668-
Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval='Hello world!', argrepr="'Hello world!'", offset=32, starts_line=None, is_jump_target=False),
669-
Instruction(opname='CALL_FUNCTION', opcode=131, arg=7, argval=7, argrepr='7 positional, 0 keyword pair', offset=34, starts_line=None, is_jump_target=False),
670-
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=36, starts_line=None, is_jump_target=False),
671-
Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=38, starts_line=8, is_jump_target=False),
672-
Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=40, starts_line=None, is_jump_target=False),
652+
Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval=(3, 4), argrepr='(3, 4)', offset=0, starts_line=2, is_jump_target=False),
653+
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='a', argrepr='a', offset=2, starts_line=None, is_jump_target=False),
654+
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='b', argrepr='b', offset=4, starts_line=None, is_jump_target=False),
655+
Instruction(opname='BUILD_TUPLE', opcode=102, arg=2, argval=2, argrepr='', offset=6, starts_line=None, is_jump_target=False),
656+
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_f, argrepr=repr(code_object_f), offset=8, starts_line=None, is_jump_target=False),
657+
Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer.<locals>.f', argrepr="'outer.<locals>.f'", offset=10, starts_line=None, is_jump_target=False),
658+
Instruction(opname='MAKE_FUNCTION', opcode=132, arg=9, argval=9, argrepr='', offset=12, starts_line=None, is_jump_target=False),
659+
Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='f', argrepr='f', offset=14, starts_line=None, is_jump_target=False),
660+
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=16, starts_line=7, is_jump_target=False),
661+
Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='a', argrepr='a', offset=18, starts_line=None, is_jump_target=False),
662+
Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='b', argrepr='b', offset=20, starts_line=None, is_jump_target=False),
663+
Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval='', argrepr="''", offset=22, starts_line=None, is_jump_target=False),
664+
Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval=1, argrepr='1', offset=24, starts_line=None, is_jump_target=False),
665+
Instruction(opname='BUILD_LIST', opcode=103, arg=0, argval=0, argrepr='', offset=26, starts_line=None, is_jump_target=False),
666+
Instruction(opname='BUILD_MAP', opcode=105, arg=0, argval=0, argrepr='', offset=28, starts_line=None, is_jump_target=False),
667+
Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval='Hello world!', argrepr="'Hello world!'", offset=30, starts_line=None, is_jump_target=False),
668+
Instruction(opname='CALL_FUNCTION', opcode=131, arg=7, argval=7, argrepr='7 positional, 0 keyword pair', offset=32, starts_line=None, is_jump_target=False),
669+
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=34, starts_line=None, is_jump_target=False),
670+
Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=36, starts_line=8, is_jump_target=False),
671+
Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=38, starts_line=None, is_jump_target=False),
673672
]
674673

675674
expected_opinfo_f = [
676-
Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=5, argrepr='5', offset=0, starts_line=3, is_jump_target=False),
677-
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=6, argrepr='6', offset=2, starts_line=None, is_jump_target=False),
678-
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=2, argval='a', argrepr='a', offset=4, starts_line=None, is_jump_target=False),
679-
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=3, argval='b', argrepr='b', offset=6, starts_line=None, is_jump_target=False),
680-
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='c', argrepr='c', offset=8, starts_line=None, is_jump_target=False),
681-
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='d', argrepr='d', offset=10, starts_line=None, is_jump_target=False),
682-
Instruction(opname='BUILD_TUPLE', opcode=102, arg=4, argval=4, argrepr='', offset=12, starts_line=None, is_jump_target=False),
683-
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_inner, argrepr=repr(code_object_inner), offset=14, starts_line=None, is_jump_target=False),
684-
Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer.<locals>.f.<locals>.inner', argrepr="'outer.<locals>.f.<locals>.inner'", offset=16, starts_line=None, is_jump_target=False),
685-
Instruction(opname='MAKE_CLOSURE', opcode=134, arg=2, argval=2, argrepr='', offset=18, starts_line=None, is_jump_target=False),
686-
Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='inner', argrepr='inner', offset=20, starts_line=None, is_jump_target=False),
687-
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=22, starts_line=5, is_jump_target=False),
688-
Instruction(opname='LOAD_DEREF', opcode=136, arg=2, argval='a', argrepr='a', offset=24, starts_line=None, is_jump_target=False),
689-
Instruction(opname='LOAD_DEREF', opcode=136, arg=3, argval='b', argrepr='b', offset=26, starts_line=None, is_jump_target=False),
690-
Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='c', argrepr='c', offset=28, starts_line=None, is_jump_target=False),
691-
Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='d', argrepr='d', offset=30, starts_line=None, is_jump_target=False),
692-
Instruction(opname='CALL_FUNCTION', opcode=131, arg=4, argval=4, argrepr='4 positional, 0 keyword pair', offset=32, starts_line=None, is_jump_target=False),
693-
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=34, starts_line=None, is_jump_target=False),
694-
Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=36, starts_line=6, is_jump_target=False),
695-
Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=38, starts_line=None, is_jump_target=False),
675+
Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=(5, 6), argrepr='(5, 6)', offset=0, starts_line=3, is_jump_target=False),
676+
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=2, argval='a', argrepr='a', offset=2, starts_line=None, is_jump_target=False),
677+
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=3, argval='b', argrepr='b', offset=4, starts_line=None, is_jump_target=False),
678+
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='c', argrepr='c', offset=6, starts_line=None, is_jump_target=False),
679+
Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='d', argrepr='d', offset=8, starts_line=None, is_jump_target=False),
680+
Instruction(opname='BUILD_TUPLE', opcode=102, arg=4, argval=4, argrepr='', offset=10, starts_line=None, is_jump_target=False),
681+
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_inner, argrepr=repr(code_object_inner), offset=12, starts_line=None, is_jump_target=False),
682+
Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer.<locals>.f.<locals>.inner', argrepr="'outer.<locals>.f.<locals>.inner'", offset=14, starts_line=None, is_jump_target=False),
683+
Instruction(opname='MAKE_FUNCTION', opcode=132, arg=9, argval=9, argrepr='', offset=16, starts_line=None, is_jump_target=False),
684+
Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='inner', argrepr='inner', offset=18, starts_line=None, is_jump_target=False),
685+
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=20, starts_line=5, is_jump_target=False),
686+
Instruction(opname='LOAD_DEREF', opcode=136, arg=2, argval='a', argrepr='a', offset=22, starts_line=None, is_jump_target=False),
687+
Instruction(opname='LOAD_DEREF', opcode=136, arg=3, argval='b', argrepr='b', offset=24, starts_line=None, is_jump_target=False),
688+
Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='c', argrepr='c', offset=26, starts_line=None, is_jump_target=False),
689+
Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='d', argrepr='d', offset=28, starts_line=None, is_jump_target=False),
690+
Instruction(opname='CALL_FUNCTION', opcode=131, arg=4, argval=4, argrepr='4 positional, 0 keyword pair', offset=30, starts_line=None, is_jump_target=False),
691+
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=32, starts_line=None, is_jump_target=False),
692+
Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=34, starts_line=6, is_jump_target=False),
693+
Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=36, starts_line=None, is_jump_target=False),
696694
]
697695

698696
expected_opinfo_inner = [

‎Lib/test/test_grammar.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ def null(x): return x
345345
def f(x) -> list: pass
346346
self.assertEqual(f.__annotations__, {'return': list})
347347

348-
# test MAKE_CLOSURE with a variety of oparg's
348+
# test closures with a variety of opargs
349349
closure = 1
350350
def f(): return closure
351351
def f(x=1): return closure

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ What's New in Python 3.6.0 alpha 2
1010
Core and Builtins
1111
-----------------
1212

13+
- Issue #27095: Simplified MAKE_FUNCTION and removed MAKE_CLOSURE opcodes.
14+
Patch by Demur Rumed.
15+
1316
- Issue #27190: Raise NotSupportedError if sqlite3 is older than 3.3.1.
1417
Patch by Dave Sawyer.
1518

0 commit comments

Comments
 (0)