python · markshannon · Jan 5, 2023 · Jan 5, 2023 · Jan 5, 2023 · Jan 5, 2023
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
@@ -607,15 +607,6 @@ the original TOS1.
  .. versionadded:: 3.12
 
 
-.. opcode:: STOPITERATION_ERROR
-
- Handles a StopIteration raised in a generator or coroutine.
- If TOS is an instance of :exc:`StopIteration`, or :exc:`StopAsyncIteration`
- replace it with a :exc:`RuntimeError`.
-
- .. versionadded:: 3.12
-
-
 .. opcode:: BEFORE_ASYNC_WITH
 
  Resolves ``__aenter__`` and ``__aexit__`` from the object on top of the
@@ -627,13 +618,6 @@ the original TOS1.
 
 **Miscellaneous opcodes**
 
-.. opcode:: PRINT_EXPR
-
- Implements the expression statement for the interactive mode. TOS is removed
- from the stack and printed. In non-interactive mode, an expression statement
- is terminated with :opcode:`POP_TOP`.
-
-
 .. opcode:: SET_ADD (i)
 
  Calls ``set.add(TOS1[-i], TOS)``. Used to implement set comprehensions.
@@ -682,13 +666,6 @@ iterations of the loop.
  .. versionadded:: 3.6
 
 
-.. opcode:: IMPORT_STAR
-
- Loads all symbols not starting with ``'_'`` directly from the module TOS to
- the local namespace. The module is popped after loading all names. This
- opcode implements ``from module import *``.
-
-
 .. opcode:: POP_EXCEPT
 
  Pops a value from the stack, which is used to restore the exception state.
@@ -1422,6 +1399,22 @@ iterations of the loop.
  they use their arg.
 
 
+.. opcode:: CALL_INTRINSIC_1
+
+ Calls an intrinsic function with one argument. Passes the TOS as the argument
+ and sets TOS to the result. Used to implement functionality that is necessary
+ but not performance critical.
+
+ The operand determines which intrinsic function is called:
+
+ * ``0`` Not valid
+ * ``1`` Prints the argument to standard out. Used in the REPL.
+ * ``2`` Performs ``import *`` for the named module.
+ * ``3`` Extracts the return value from a ``StopIteration`` exception.
+
+ .. versionadded:: 3.12
+
+
 **Pseudo-instructions**
 
 These opcodes do not appear in python bytecode, they are used by the compiler

diff --git a/Include/internal/pycore_intrinsics.h b/Include/internal/pycore_intrinsics.h
@@ -0,0 +1,10 @@
+
+#define INTRINSIC_PRINT 1
+#define INTRINSIC_IMPORT_STAR 2
+#define INTRINSIC_STOPITERATION_ERROR 3
+
+#define MAX_INTRINSIC_1 3
+
+typedef PyObject *(*instrinsic_func1)(PyThreadState* tstate, PyObject *value);
+
+extern instrinsic_func1 _PyIntrinsics_UnaryFunctions[];
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
@@ -426,6 +426,7 @@ def _write_atomic(path, data, mode=0o666):
 # Python 3.12a1 3510 (FOR_ITER leaves iterator on the stack)
 # Python 3.12a1 3511 (Add STOPITERATION_ERROR instruction)
 # Python 3.12a1 3512 (Remove all unused consts from code objects)
+# Python 3.12a1 3513 (Add CALL_INTRINSIC_1 instruction, removed STOPITERATION_ERROR, PRINT_EXPR, IMPORT_STAR)
 
 # Python 3.13 will start with 3550
 
@@ -438,7 +439,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 = (3512).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3513).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
@@ -112,19 +112,17 @@ def pseudo_op(name, op, real_ops):
 def_op('STORE_SUBSCR', 60)
 def_op('DELETE_SUBSCR', 61)
 
-def_op('STOPITERATION_ERROR', 63)
-
 def_op('GET_ITER', 68)
 def_op('GET_YIELD_FROM_ITER', 69)
-def_op('PRINT_EXPR', 70)
+
 def_op('LOAD_BUILD_CLASS', 71)
 
 def_op('LOAD_ASSERTION_ERROR', 74)
 def_op('RETURN_GENERATOR', 75)
 
 def_op('LIST_TO_TUPLE', 82)
 def_op('RETURN_VALUE', 83)
-def_op('IMPORT_STAR', 84)
+
 def_op('SETUP_ANNOTATIONS', 85)
 
 def_op('ASYNC_GEN_WRAP', 87)
@@ -220,7 +218,7 @@ def pseudo_op(name, op, real_ops):
 def_op('CALL', 171)
 def_op('KW_NAMES', 172)
 hasconst.append(172)
-
+def_op('CALL_INTRINSIC_1', 173)
 
 hasarg.extend([op for op in opmap.values() if op >= HAVE_ARGUMENT])
 

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
@@ -543,7 +543,7 @@ async def _asyncwith(c):
  >> COPY 3
  POP_EXCEPT
  RERAISE 1
- >> STOPITERATION_ERROR
+ >> CALL_INTRINSIC_1 3
  RERAISE 1
 ExceptionTable:
 12 rows

@@ -395,6 +395,7 @@ PYTHON_OBJS= \
  Python/import.o \
  Python/importdl.o \
  Python/initconfig.o \
+ Python/intrinsics.o \
  Python/marshal.o \
  Python/modsupport.o \
  Python/mysnprintf.o \
@@ -1650,6 +1651,7 @@ PYTHON_HEADERS= \
  $(srcdir)/Include/internal/pycore_initconfig.h \
  $(srcdir)/Include/internal/pycore_interp.h \
  $(srcdir)/Include/internal/pycore_interpreteridobject.h \
+ $(srcdir)/Include/internal/pycore_intrinsics.h \
  $(srcdir)/Include/internal/pycore_list.h \
  $(srcdir)/Include/internal/pycore_long.h \
  $(srcdir)/Include/internal/pycore_moduleobject.h \

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-01-05-13-54-00.gh-issue-99005.D7H6j4.rst b/Misc/NEWS.d/next/Core and Builtins/2023-01-05-13-54-00.gh-issue-99005.D7H6j4.rst
@@ -0,0 +1,4 @@
+Add new :opcode:`CALL_INSTRINSIC_1` instruction. Remove
+:opcode:`IMPORT_STAR`, :opcode:`PRINT_EXPR` and
+:opcode:`STOPITERATION_ERROR`, replacing them with the
+:opcode:`CALL_INSTRINSIC_1` instruction.
@@ -206,6 +206,7 @@
  <ClCompile Include="..\Python\import.c" />
  <ClCompile Include="..\Python\importdl.c" />
  <ClCompile Include="..\Python\initconfig.c" />
+ <ClCompile Include="..\Python\intrinsics.c" />
  <ClCompile Include="..\Python\marshal.c" />
  <ClCompile Include="..\Python\modsupport.c" />
  <ClCompile Include="..\Python\mysnprintf.c" />