Skip to content

Commit 81994a9

Browse files
committed
Set Py_JIT_ENABLED to 2 insetad of 'interpreter'
1 parent 40c001c commit 81994a9

File tree

7 files changed

+11
-15
lines changed

7 files changed

+11
-15
lines changed

Modules/_sysconfig.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,7 @@ _sysconfig_config_vars_impl(PyObject *module)
7171
if (Py_JIT_ENABLED == 1) {
7272
py_jit_enabled = _PyLong_GetOne();
7373
} else {
74-
py_jit_enabled = PyUnicode_FromString("interpreter");
75-
if (py_jit_enabled == NULL) {
76-
Py_DECREF(config);
77-
return NULL;
78-
}
74+
py_jit_enabled = PyLong_FromInt(2);
7975
}
8076
#else
8177
PyObject *py_jit_enabled = _PyLong_GetZero();

PC/pyconfig.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ WIN32 is still required for the locale module.
102102
/* #define Py_GIL_DISABLED 1 */
103103
#endif
104104

105-
/* Define to 1 if you want to enable the JIT */
106-
/* Define to "interpreter" if you want to enable tier 2 interpreter */
105+
/* Define to 1 if you want to build an interpreter with JIT, or define to 2
106+
if you want to enable tier 2 interpreter /*
107107
#ifndef Py_JIT_ENABLED
108108
/* #define Py_JIT_ENABLED 1 */
109109
#endif

PCbuild/_freeze_module.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
<PyConfigHText>$(PyConfigHText.Replace('/* #define Py_JIT_ENABLED 1 */', '#define Py_JIT_ENABLED 1'))</PyConfigHText>
454454
</PropertyGroup>
455455
<PropertyGroup Condition="$(UseTIER2) == '4' Or $(UseTIER2) == '6'">
456-
<PyConfigHText>$(PyConfigHText.Replace('/* #define Py_JIT_ENABLED 1 */', '#define Py_JIT_ENABLED "interpreter"'))</PyConfigHText>
456+
<PyConfigHText>$(PyConfigHText.Replace('/* #define Py_JIT_ENABLED 1 */', '#define Py_JIT_ENABLED 2'))</PyConfigHText>
457457
</PropertyGroup>
458458
<Message Text="Updating pyconfig.h" Condition="$(PyConfigHText.TrimEnd()) != $(OldPyConfigH.TrimEnd())" />
459459
<WriteLinesToFile File="$(IntDir)pyconfig.h"

PCbuild/pythoncore.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
<PyConfigHText>$(PyConfigHText.Replace('/* #define Py_JIT_ENABLED 1 */', '#define Py_JIT_ENABLED 1'))</PyConfigHText>
710710
</PropertyGroup>
711711
<PropertyGroup Condition="$(UseTIER2) == '4' Or $(UseTIER2) == '6'">
712-
<PyConfigHText>$(PyConfigHText.Replace('/* #define Py_JIT_ENABLED 1 */', '#define Py_JIT_ENABLED "interpreter"'))</PyConfigHText>
712+
<PyConfigHText>$(PyConfigHText.Replace('/* #define Py_JIT_ENABLED 1 */', '#define Py_JIT_ENABLED 2'))</PyConfigHText>
713713
</PropertyGroup>
714714
<Message Text="Updating pyconfig.h" Condition="$(PyConfigHText.TrimEnd()) != $(OldPyConfigH.TrimEnd())" />
715715
<WriteLinesToFile File="$(IntDir)pyconfig.h"

configure

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,12 +1837,12 @@ case $enable_experimental_jit in
18371837
interpreter)
18381838
jit_flags="";
18391839
tier2_flags="-D_Py_TIER2=4";
1840-
AC_DEFINE([Py_JIT_ENABLED], ["interpreter"], [Define to interpreter if you want to build an interpreter with enabled tier 2 interpreter])
1840+
AC_DEFINE([Py_JIT_ENABLED], [2], [Define to 2 if you want to build an interpreter with enabled tier 2 interpreter])
18411841
;;
18421842
interpreter-off)
18431843
jit_flags="";
18441844
tier2_flags="-D_Py_TIER2=6";
1845-
AC_DEFINE([Py_JIT_ENABLED], ["interpreter"], [Define to interpreter if you want to build an interpreter with enabled tier 2 interpreter]) # Secret option
1845+
AC_DEFINE([Py_JIT_ENABLED], [2], [Define to 2 if you want to build an interpreter with enabled tier 2 interpreter]) # Secret option
18461846
;;
18471847
*) AC_MSG_ERROR(
18481848
[invalid argument: --enable-experimental-jit=$enable_experimental_jit; expected no|yes|yes-off|interpreter]) ;;

pyconfig.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,8 +1695,8 @@
16951695
/* Defined if _Complex C type is available. */
16961696
#undef Py_HAVE_C_COMPLEX
16971697

1698-
/* Define to interpreter if you want to build an interpreter with enabled tier
1699-
2 interpreter */
1698+
/* Define to 2 if you want to build an interpreter with enabled tier 2
1699+
interpreter */
17001700
#undef Py_JIT_ENABLED
17011701

17021702
/* Define if year with century should be normalized for strftime. */

0 commit comments

Comments
 (0)