Merge branch 'main' into inlinecomp2

* main: (82 commits) gh-101670: typo fix in PyImport_ExtendInittab() (#101723) GH-99293: Document that `Py_TPFLAGS_VALID_VERSION_TAG` shouldn't be used. (#GH-101736) no-issue: Add Dong-hee Na as the cjkcodecs codeowner (gh-101731) gh-101678: Merge math_1_to_whatever() and math_1() (#101730) gh-101678: refactor the math module to use special functions from c11 (GH-101679) gh-85984: Remove legacy Lib/pty.py code. (#92365) gh-98831: Use opcode metadata for stack_effect() (#101704) gh-101283: Version was just released, so should be changed in 3.11.3 (GH-101719) gh-101283: Fix use of unbound variable (GH-101712) gh-101283: Improved fallback logic for subprocess with shell=True on Windows (GH-101286) gh-101277: Port more itertools static types to heap types (#101304) gh-98831: Modernize CALL and family (#101508) GH-101696: invalidate type version tag in `_PyStaticType_Dealloc` (#101697) gh-100221: Fix creating dirs in `make sharedinstall` (GH-100329) gh-101670: typo fix in PyImport_AppendInittab() (GH-101672) gh-101196: Make isdir/isfile/exists faster on Windows (GH-101324) gh-101614: Don't treat python3_d.dll as a Python DLL when checking extension modules for incompatibility (GH-101615) gh-100933: Improve `check_element` helper in `test_xml_etree` (#100934) GH-101578: Normalize the current exception (GH-101607) gh-47937: Note that Popen attributes are read-only (#93070) ...
carljm · May 9, 2023 · Jan 30, 2023 · Jan 31, 2023 · Jan 31, 2023 · Jan 31, 2023
commit be3becca2abd5fa42a3070c75e75f2fa6729aa75
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
@@ -431,7 +431,8 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.12a5 3515 (Embed jump mask in COMPARE_OP oparg)
 #     Python 3.12a5 3516 (Add COMPARE_AND_BRANCH instruction)
 #     Python 3.12a5 3517 (Change YIELD_VALUE oparg to exception block depth)
-#     Python 3.12a5 3518 (Inline sync list/dict/set comprehensions in the calling function)
+#     Python 3.12a5 3518 (Add RETURN_CONST instruction)
+#     Python 3.12a5 3519 (Inline sync list/dict/set comprehensions in the calling function)
 
 #     Python 3.13 will start with 3550
 
@@ -444,7 +445,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 = (3518).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3519).to_bytes(2, 'little') + b'\r\n'
 
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 

@@ -1135,78 +1135,8 @@ stack_effect(int opcode, int oparg, int jump)
              * if an exception be raised. */
             return jump ? 1 : 0;
 
-        case WITH_EXCEPT_START:
-            return 1;
-
-        case LOAD_FAST:
-        case LOAD_FAST_CHECK:
-        case LOAD_FAST_AND_CLEAR:
-            return 1;
-        case STORE_FAST:
         case STORE_FAST_MAYBE_NULL:
             return -1;
-        case DELETE_FAST:
-            return 0;
-
-        case RETURN_GENERATOR:
-            return 0;
-
-        case RAISE_VARARGS:
-            return -oparg;
-
-        /* Functions and calls */
-        case KW_NAMES:
-            return 0;
-        case CALL:
-            return -1-oparg;
-        case CALL_INTRINSIC_1:
-            return 0;
-        case CALL_FUNCTION_EX:
-            return -2 - ((oparg & 0x01) != 0);
-        case MAKE_FUNCTION:
-            return 0 - ((oparg & 0x01) != 0) - ((oparg & 0x02) != 0) -
-                ((oparg & 0x04) != 0) - ((oparg & 0x08) != 0);
-        case BUILD_SLICE:
-            if (oparg == 3)
-                return -2;
-            else
-                return -1;
-
-        /* Closures */
-        case MAKE_CELL:
-        case COPY_FREE_VARS:
-            return 0;
-        case LOAD_CLOSURE:
-            return 1;
-        case LOAD_DEREF:
-        case LOAD_CLASSDEREF:
-            return 1;
-        case STORE_DEREF:
-            return -1;
-        case DELETE_DEREF:
-            return 0;
-
-        /* Iterators and generators */
-        case GET_AWAITABLE:
-            return 0;
-
-        case BEFORE_ASYNC_WITH:
-        case BEFORE_WITH:
-            return 1;
-        case GET_AITER:
-            return 0;
-        case GET_ANEXT:
-            return 1;
-        case GET_YIELD_FROM_ITER:
-            return 0;
-        case END_ASYNC_FOR:
-            return -2;
-        case CLEANUP_THROW:
-            return -2;
-        case FORMAT_VALUE:
-            /* If there's a fmt_spec on the stack, we go from 2->1,
-               else 1->1. */
-            return (oparg & FVS_MASK) == FVS_HAVE_SPEC ? -1 : 0;
         case LOAD_METHOD:
             return 1;
         default:

diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h