gh-126255: Ignore warning about JIT being deactivated when perf support is active...

Temporarily ignore warnings about JIT deactivation when perf support is active.
This will be reverted as soon as a way is found to determine at run time whether the interpreter was built with JIT. Currently, this is not possible on Windows.

Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>
Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 4ea43edccda63eb7ed1fa191c2ff4774b484ac73..5e886b6c8c38ecffdfa22900cad2278e04c5774d 100644 (file)
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -1,5 +1,6 @@
 # Run the tests in Programs/_testembed.c (tests for the CPython embedding APIs)
 from test import support
+from test.libregrtest.utils import get_build_info
 from test.support import import_helper, os_helper, threading_helper, MS_WINDOWS
 import unittest
 
@@ -1780,8 +1781,10 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
             'perf_profiling': 2,
         }
         config_dev_mode(preconfig, config)
+        # Temporarily enable ignore_stderr=True to ignore warnings on JIT builds
+        # See gh-126255 for more information
         self.check_all_configs("test_initconfig_api", config, preconfig,
-                               api=API_ISOLATED)
+                               api=API_ISOLATED, ignore_stderr=True)
 
     def test_initconfig_get_api(self):
         self.run_embedded_interpreter("test_initconfig_get_api")

diff --git a/Lib/test/test_perf_profiler.py b/Lib/test/test_perf_profiler.py
index b55d441759eb69f4a0257c5ba81f3b4bda94136f..1e74990878007aeed5cd25dc0bca3ef995892551 100644 (file)
--- a/Lib/test/test_perf_profiler.py
+++ b/Lib/test/test_perf_profiler.py
@@ -210,14 +210,14 @@ class TestPerfTrampoline(unittest.TestCase):
                 sys.activate_stack_trampoline("perf")
                 sys.activate_stack_trampoline("perf")
                 """
-        assert_python_ok("-c", code)
+        assert_python_ok("-c", code, PYTHON_JIT="0")
 
     def test_sys_api_with_invalid_trampoline(self):
         code = """if 1:
                 import sys
                 sys.activate_stack_trampoline("invalid")
                 """
-        rc, out, err = assert_python_failure("-c", code)
+        rc, out, err = assert_python_failure("-c", code, PYTHON_JIT="0")
         self.assertIn("invalid backend: invalid", err.decode())
 
     def test_sys_api_get_status(self):
@@ -228,7 +228,7 @@ class TestPerfTrampoline(unittest.TestCase):
                 sys.deactivate_stack_trampoline()
                 assert sys.is_stack_trampoline_active() is False
                 """
-        assert_python_ok("-c", code)
+        assert_python_ok("-c", code, PYTHON_JIT="0")
 
 
 def is_unwinding_reliable_with_frame_pointers():

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 2efaa9db7d7d58092754f71e06518d4cbe49bb20..23882d083844ac7543de798ebcaf9af827af86e2 100644 (file)
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1310,12 +1310,17 @@ init_interp_main(PyThreadState *tstate)
             enabled = *env != '0';
         }
         if (enabled) {
+#ifdef _Py_JIT
+            // perf profiler works fine with tier 2 interpreter, so
+            // only checking for a "real JIT".
             if (config->perf_profiling > 0) {
                 (void)PyErr_WarnEx(
                     PyExc_RuntimeWarning,
                     "JIT deactivated as perf profiling support is active",
                     0);
-            } else {
+            } else
+#endif
+            {
                 PyObject *opt = _PyOptimizer_NewUOpOptimizer();
                 if (opt == NULL) {
                     return _PyStatus_ERR("can't initialize optimizer");

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index cbb73977e1aae60063465ff3c4ef014a0b5c4e73..a4abd7c3c45709b574b3a66698bf172fe39e3cfe 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -2290,6 +2290,7 @@ sys_activate_stack_trampoline_impl(PyObject *module, const char *backend)
 #ifdef _Py_JIT
     _PyOptimizerObject* optimizer = _Py_GetOptimizer();
     if (optimizer != NULL) {
+        Py_DECREF(optimizer);
         PyErr_SetString(PyExc_ValueError, "Cannot activate the perf trampoline if the JIT is active");
         return NULL;
     }