From: Michael Droettboom <mdboom@gmail.com>
Date: Thu, 17 Oct 2024 12:20:30 +0000 (-0400)
Subject: gh-123153: Fix PGO builds with free-threading on Windows (#125607)
X-Git-Tag: v3.14.0a2~390
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37986e830ba25d2c382988b06bbe27410596346c;p=thirdparty%2FPython%2Fcpython.git

gh-123153: Fix PGO builds with free-threading on Windows (#125607)

* gh-123153: Fix PGO builds with free-threading

* Redo how the #define works
---

diff --git a/Python/ceval.c b/Python/ceval.c
index 43776e773e0d..98d95b28488f 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -761,12 +761,20 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch)
  * so consume 3 units of C stack */
 #define PY_EVAL_C_STACK_UNITS 2
 
-#if defined(_MSC_VER) && defined(_Py_USING_PGO) && defined(_Py_JIT)
-/* _PyEval_EvalFrameDefault is too large to optimize for speed with
-   PGO on MSVC when the JIT is enabled. Disable that optimization
-   around this function only. If this is fixed upstream, we should
-   gate this on the version of MSVC.
+
+/* _PyEval_EvalFrameDefault is too large to optimize for speed with PGO on MSVC
+   when the JIT is enabled or GIL is disabled. Disable that optimization around
+   this function only. If this is fixed upstream, we should gate this on the
+   version of MSVC.
  */
+#if (defined(_MSC_VER) && \
+     defined(_Py_USING_PGO) && \
+     (defined(_Py_JIT) || \
+      defined(Py_GIL_DISABLED)))
+#define DO_NOT_OPTIMIZE_INTERP_LOOP
+#endif
+
+#ifdef DO_NOT_OPTIMIZE_INTERP_LOOP
 #  pragma optimize("t", off)
 /* This setting is reversed below following _PyEval_EvalFrameDefault */
 #endif
@@ -1146,7 +1154,7 @@ goto_to_tier1:
 
 }
 
-#if defined(_MSC_VER) && defined(_Py_USING_PGO) && defined(_Py_JIT)
+#ifdef DO_NOT_OPTIMIZE_INTERP_LOOP
 #  pragma optimize("", on)
 #endif