Merge branch 'main' into fix-documentation-typos

Author: yangsong97

Lib/test/test_capi/test_opt.py

@@ -2832,6 +2832,18 @@ def testfunc(n):
         self.assertIn("_GUARD_TYPE_VERSION", uops)
         self.assertNotIn("_CHECK_ATTR_CLASS", uops)
 
+    def test_load_common_constant(self):
+        def testfunc(n):
+            for _ in range(n):
+                x = list(i for i in ())
+            return x
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertEqual(res, list(()))
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+        self.assertIn("_BUILD_LIST", uops)
+        self.assertNotIn("_LOAD_COMMON_CONSTANT", uops)
+
     def test_load_small_int(self):
         def testfunc(n):
             x = 0

Platforms/emscripten/__main__.py

@@ -413,6 +413,11 @@ def make_mpdec(context, working_dir):
     write_library_config(prefix, "mpdec", mpdec_config, context.quiet)
 
 
+def make_dependencies(context):
+    make_emscripten_libffi(context)
+    make_mpdec(context)
+
+
 def calculate_node_path():
     node_version = os.environ.get("PYTHON_NODE_VERSION", None)
     if node_version is None:
@@ -573,7 +578,10 @@ def run_emscripten_python(context):
     if args and args[0] == "--":
         args = args[1:]
 
-    os.execv(str(exec_script), [str(exec_script)] + args)
+    if context.test:
+        args = load_config_toml()["test-args"] + args
+
+    os.execv(str(exec_script), [str(exec_script), *args])
 
 
 def build_target(context):
@@ -665,6 +673,11 @@ def main():
         help="Clone libffi repo, configure and build it for emscripten",
     )
 
+    make_dependencies_cmd = subcommands.add_parser(
+        "make-dependencies",
+        help="Build all static library dependencies",
+    )
+
     make_build = subcommands.add_parser(
         "make-build-python", help="Run `make` for the build Python"
     )
@@ -685,6 +698,15 @@ def main():
         "run",
         help="Run the built emscripten Python",
     )
+    run.add_argument(
+        "--test",
+        action="store_true",
+        default=False,
+        help=(
+            "If passed, will add the default test arguments to the beginning of the command. "
+            "Default arguments loaded from Platforms/emscripten/config.toml"
+        )
+    )
     run.add_argument(
         "args",
         nargs=argparse.REMAINDER,
@@ -694,6 +716,7 @@ def main():
         )
     )
     add_cross_build_dir_option(run)
+
     clean = subcommands.add_parser(
         "clean", help="Delete files and directories created by this script"
     )
@@ -714,6 +737,7 @@ def main():
         configure_build,
         make_libffi_cmd,
         make_mpdec_cmd,
+        make_dependencies_cmd,
         make_build,
         configure_host,
         make_host,
@@ -781,6 +805,7 @@ def main():
         "install-emscripten": install_emscripten,
         "make-libffi": make_emscripten_libffi,
         "make-mpdec": make_mpdec,
+        "make-dependencies": make_dependencies,
         "configure-build-python": configure_build_python,
         "make-build-python": make_build_python,
         "configure-host": configure_emscripten_python,

Platforms/emscripten/config.toml

@@ -3,6 +3,14 @@
 # Python versions.
 emscripten-version = "4.0.12"
 node-version = "24"
+test-args = [
+    "-m", "test",
+    "-v",
+    "-uall",
+    "--rerun",
+    "--single-process",
+    "-W",
+]
 
 [libffi]
 url = "https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz"

Python/optimizer_bytecodes.c

@@ -631,6 +631,13 @@ dummy_func(void) {
         value = PyJitRef_Borrow(sym_new_const(ctx, val));
     }
 
+    op(_LOAD_COMMON_CONSTANT, (-- value)) {
+        assert(oparg < NUM_COMMON_CONSTANTS);
+        PyObject *val = _PyInterpreterState_GET()->common_consts[oparg];
+        ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)val);
+        value = PyJitRef_Borrow(sym_new_const(ctx, val));
+    }
+
     op(_LOAD_SMALL_INT, (-- value)) {
         PyObject *val = PyLong_FromLong(oparg);
         assert(val);