Inline instead of specializing

python · Fidget-Spinner · Apr 30, 2023 · Oct 6, 2022 · Oct 6, 2022 · Oct 6, 2022
commit 84d0f8b737cca775a08bfcff2455ab8debae59fa
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
@@ -413,7 +413,6 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.12a1 3507 (Set lineno of module's RESUME to 0)
 #     Python 3.12a1 3508 (Add CLEANUP_THROW)
 #     Python 3.12a1 3509 (Conditional jumps only jump forward)
-#     Python 3.12a1 3510 (Specialization/Cache for CALL_FUNCTION_EX)
 
 
 #     Python 3.13 will start with 3550
@@ -427,7 +426,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (3510).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3509).to_bytes(2, 'little') + b'\r\n'
 
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 

diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -311,12 +311,6 @@ def pseudo_op(name, op, real_ops):
         "CALL_NO_KW_TUPLE_1",
         "CALL_NO_KW_TYPE_1",
     ],
-    "CALL_FUNCTION_EX": [
-        "CALL_FUNCTION_EX_ADAPTIVE",
-        "CALL_FUNCTION_EX_PY_KWARGS",
-        "CALL_FUNCTION_EX_PY_NO_KWARGS",
-        "CALL_FUNCTION_EX_BUILTIN_PYCFUNCTIONWITHKEYWORDS",
-    ],
     "COMPARE_OP": [
         "COMPARE_OP_ADAPTIVE",
         "COMPARE_OP_FLOAT_JUMP",
@@ -440,11 +434,6 @@ def pseudo_op(name, op, real_ops):
         "func_version": 2,
         "min_args": 1,
     },
-    "CALL_FUNCTION_EX": {
-        "counter": 1,
-        "func_version": 2,
-        "min_args": 1,
-    },
     "STORE_SUBSCR": {
         "counter": 1,
     },

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-10-06-23-32-11.gh-issue-98003.xWE0Yu.rst b/Misc/NEWS.d/next/Core and Builtins/2022-10-06-23-32-11.gh-issue-98003.xWE0Yu.rst
@@ -1 +1,2 @@
-Specialize complex calls.
+Complex function calls are now significantly faster and consume no C stack
+space.