summaryrefslogtreecommitdiffstats
path: root/Lib/opcode.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-09-09 17:17:08 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-09-09 17:17:08 (GMT)
commitf9b760f48ae2bd32ac347fe805b078a16037afee (patch)
tree5472de2d2cd70aab93c4ab4b00aabf7944caa11c /Lib/opcode.py
parente53592091afa172f97bf3d7af43041a28c6ff688 (diff)
downloadcpython-f9b760f48ae2bd32ac347fe805b078a16037afee.zip
cpython-f9b760f48ae2bd32ac347fe805b078a16037afee.tar.gz
cpython-f9b760f48ae2bd32ac347fe805b078a16037afee.tar.bz2
Rework CALL_FUNCTION* opcodes
Issue #27213: Rework CALL_FUNCTION* opcodes to produce shorter and more efficient bytecode: * CALL_FUNCTION now only accepts position arguments * CALL_FUNCTION_KW accepts position arguments and keyword arguments, but keys of keyword arguments are packed into a constant tuple. * CALL_FUNCTION_EX is the most generic, it expects a tuple and a dict for positional and keyword arguments. CALL_FUNCTION_VAR and CALL_FUNCTION_VAR_KW opcodes have been removed. 2 tests of test_traceback are currently broken: skip test, the issue #28050 was created to track the issue. Patch by Demur Rumed, design by Serhiy Storchaka, reviewed by Serhiy Storchaka and Victor Stinner.
Diffstat (limited to 'Lib/opcode.py')
-rw-r--r--Lib/opcode.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 31d1534..be26475 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -31,7 +31,7 @@ hasjabs = []
haslocal = []
hascompare = []
hasfree = []
-hasnargs = []
+hasnargs = [] # unused
opmap = {}
opname = ['<%r>' % (op,) for op in range(256)]
@@ -172,8 +172,7 @@ haslocal.append(126)
name_op('STORE_ANNOTATION', 127) # Index in name list
def_op('RAISE_VARARGS', 130) # Number of raise arguments (1, 2, or 3)
-def_op('CALL_FUNCTION', 131) # #args + (#kwargs << 8)
-hasnargs.append(131)
+def_op('CALL_FUNCTION', 131) # #args
def_op('MAKE_FUNCTION', 132) # Flags
def_op('BUILD_SLICE', 133) # Number of items
def_op('LOAD_CLOSURE', 135)
@@ -185,12 +184,8 @@ hasfree.append(137)
def_op('DELETE_DEREF', 138)
hasfree.append(138)
-def_op('CALL_FUNCTION_VAR', 140) # #args + (#kwargs << 8)
-hasnargs.append(140)
-def_op('CALL_FUNCTION_KW', 141) # #args + (#kwargs << 8)
-hasnargs.append(141)
-def_op('CALL_FUNCTION_VAR_KW', 142) # #args + (#kwargs << 8)
-hasnargs.append(142)
+def_op('CALL_FUNCTION_KW', 141) # #args + #kwargs
+def_op('CALL_FUNCTION_EX', 142) # Flags
jrel_op('SETUP_WITH', 143)