[3.13] gh-123275: Support -Xgil=1 and PYTHON_GIL=1 on non-free-threaded builds (gh-123276) (gh-123753)

miss-islington · ZeroIntensity · web-flow · commit 92b9c4482fb5 · 2024-09-06T10:09:35.000+09:00
gh-123275: Support `-Xgil=1` and `PYTHON_GIL=1` on non-free-threaded builds (gh-123276) (cherry picked from commit 84ad264) Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
@@ -616,7 +616,7 @@ Miscellaneous options
      .. versionadded:: 3.13
 
    * :samp:`-X gil={0,1}` forces the GIL to be disabled or enabled,
-     respectively. Only available in builds configured with
+     respectively. Setting to ``0`` is only available in builds configured with
      :option:`--disable-gil`. See also :envvar:`PYTHON_GIL` and
      :ref:`whatsnew313-free-threaded-cpython`.
 
@@ -1215,13 +1215,12 @@ conflict.
 .. envvar:: PYTHON_GIL
 
    If this variable is set to ``1``, the global interpreter lock (GIL) will be
-   forced on. Setting it to ``0`` forces the GIL off.
+   forced on. Setting it to ``0`` forces the GIL off (needs Python configured with
+   the :option:`--disable-gil` build option).
 
    See also the :option:`-X gil <-X>` command-line option, which takes
    precedence over this variable, and :ref:`whatsnew313-free-threaded-cpython`.
 
-   Needs Python configured with the :option:`--disable-gil` build option.
-
    .. versionadded:: 3.13
 
 Debug-mode variables
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-08-23-18-31-10.gh-issue-123275.DprIrj.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-08-23-18-31-10.gh-issue-123275.DprIrj.rst
@@ -0,0 +1 @@
+Support :option:`-X gil=1 <-X>` and :envvar:`PYTHON_GIL=1 <PYTHON_GIL>` on non-free-threaded builds.
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -1542,20 +1542,24 @@ config_wstr_to_int(const wchar_t *wstr, int *result)
 static PyStatus
 config_read_gil(PyConfig *config, size_t len, wchar_t first_char)
 {
-#ifdef Py_GIL_DISABLED
     if (len == 1 && first_char == L'0') {
+#ifdef Py_GIL_DISABLED
         config->enable_gil = _PyConfig_GIL_DISABLE;
+#else
+        return _PyStatus_ERR("Disabling the GIL is not supported by this build");
+#endif
     }
     else if (len == 1 && first_char == L'1') {
+#ifdef Py_GIL_DISABLED
         config->enable_gil = _PyConfig_GIL_ENABLE;
+#else
+        return _PyStatus_OK();
+#endif
     }
     else {
         return _PyStatus_ERR("PYTHON_GIL / -X gil must be \"0\" or \"1\"");
     }
     return _PyStatus_OK();
-#else
-    return _PyStatus_ERR("PYTHON_GIL / -X gil are not supported by this build");
-#endif
 }
 
 static PyStatus

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Support :option:`-X gil=1 <-X>` and :envvar:`PYTHON_GIL=1 <PYTHON_GIL>` on non-free-threaded builds.
Original file line number	Diff line number	Diff line change
`@@ -1542,20 +1542,24 @@ config_wstr_to_int(const wchar_t wstr, int result)`
`1542`	`1542`	`static PyStatus`
`1543`	`1543`	`config_read_gil(PyConfig *config, size_t len, wchar_t first_char)`
`1544`	`1544`	`{`
`1545`		`-#ifdef Py_GIL_DISABLED`
`1546`	`1545`	`if (len == 1 && first_char == L'0') {`
	`1546`	`+#ifdef Py_GIL_DISABLED`
`1547`	`1547`	`config->enable_gil = _PyConfig_GIL_DISABLE;`
	`1548`	`+#else`
	`1549`	`+ return _PyStatus_ERR("Disabling the GIL is not supported by this build");`
	`1550`	`+#endif`
`1548`	`1551`	`}`
`1549`	`1552`	`else if (len == 1 && first_char == L'1') {`
	`1553`	`+#ifdef Py_GIL_DISABLED`
`1550`	`1554`	`config->enable_gil = _PyConfig_GIL_ENABLE;`
	`1555`	`+#else`
	`1556`	`+ return _PyStatus_OK();`
	`1557`	`+#endif`
`1551`	`1558`	`}`
`1552`	`1559`	`else {`
`1553`	`1560`	`return _PyStatus_ERR("PYTHON_GIL / -X gil must be \"0\" or \"1\"");`
`1554`	`1561`	`}`
`1555`	`1562`	`return _PyStatus_OK();`
`1556`		`-#else`
`1557`		`- return _PyStatus_ERR("PYTHON_GIL / -X gil are not supported by this build");`
`1558`		`-#endif`
`1559`	`1563`	`}`
`1560`	`1564`
`1561`	`1565`	`static PyStatus`