From 49bca805d42679fafeebc4a53d917ced9cd8814a Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Mon, 31 Mar 2025 23:29:36 +0800 Subject: [PATCH 1/9] Use the Python-specific `Py_DEBUG` macro rather than `_DEBUG` in Windows-related C code --- Include/internal/pycore_importdl.h | 2 +- Modules/_ctypes/callproc.c | 2 +- Modules/_ssl.c | 2 +- Modules/_ssl/debughelpers.c | 2 +- PC/clinic/msvcrtmodule.c.h | 12 ++++++------ PC/launcher.c | 2 +- PC/msvcrtmodule.c | 6 +++--- PC/pyconfig.h.in | 18 +++++++++--------- PC/pylauncher.rc | 14 +++++++------- PC/pyshellext.rc | 4 ++-- PC/python_exe.rc | 4 ++-- PC/python_nt.rc | 2 +- PC/python_uwp.cpp | 4 ++-- PC/python_ver_rc.h | 2 +- PC/pythonw_exe.rc | 4 ++-- PC/sqlite3.rc | 2 +- Python/dynload_win.c | 6 +++--- Python/marshal.c | 2 +- Python/pylifecycle.c | 2 +- 19 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Include/internal/pycore_importdl.h b/Include/internal/pycore_importdl.h index 525a16f6b97274..3ba9229cc21378 100644 --- a/Include/internal/pycore_importdl.h +++ b/Include/internal/pycore_importdl.h @@ -107,7 +107,7 @@ extern int _PyImport_RunModInitFunc( #include typedef FARPROC dl_funcptr; -#ifdef _DEBUG +#ifdef Py_DEBUG # define PYD_DEBUG_SUFFIX "_d" #else # define PYD_DEBUG_SUFFIX "" diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 158422fb9b0471..b316706be84481 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -92,7 +92,7 @@ module _ctypes #include #endif -#if defined(_DEBUG) || defined(__MINGW32__) +#if defined(Py_DEBUG) || defined(__MINGW32__) /* Don't use structured exception handling on Windows if this is defined. MingW, AFAIK, doesn't support it. */ diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 6615d6d0b99802..278836725bdd1e 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -4427,7 +4427,7 @@ _ssl__SSLContext_load_dh_params_impl(PySSLContext *self, PyObject *filepath) FILE *f; DH *dh; -#if defined(MS_WINDOWS) && defined(_DEBUG) +#if defined(MS_WINDOWS) && defined(Py_DEBUG) PyErr_SetString(PyExc_NotImplementedError, "load_dh_params: unavailable on Windows debug build"); return NULL; diff --git a/Modules/_ssl/debughelpers.c b/Modules/_ssl/debughelpers.c index 7c0b4876f4353a..f0a0a1674f32bd 100644 --- a/Modules/_ssl/debughelpers.c +++ b/Modules/_ssl/debughelpers.c @@ -175,7 +175,7 @@ _PySSLContext_set_keylog_filename(PyObject *op, PyObject *arg, PySSLContext *self = PySSLContext_CAST(op); FILE *fp; -#if defined(MS_WINDOWS) && defined(_DEBUG) +#if defined(MS_WINDOWS) && defined(Py_DEBUG) PyErr_SetString(PyExc_NotImplementedError, "set_keylog_filename: unavailable on Windows debug build"); return -1; diff --git a/PC/clinic/msvcrtmodule.c.h b/PC/clinic/msvcrtmodule.c.h index a77d0855af293f..4bf47bd53918ef 100644 --- a/PC/clinic/msvcrtmodule.c.h +++ b/PC/clinic/msvcrtmodule.c.h @@ -517,7 +517,7 @@ msvcrt_ungetwch(PyObject *module, PyObject *arg) #endif /* defined(MS_WINDOWS_DESKTOP) */ -#if defined(_DEBUG) +#if defined(Py_DEBUG) PyDoc_STRVAR(msvcrt_CrtSetReportFile__doc__, "CrtSetReportFile($module, type, file, /)\n" @@ -562,9 +562,9 @@ msvcrt_CrtSetReportFile(PyObject *module, PyObject *const *args, Py_ssize_t narg return return_value; } -#endif /* defined(_DEBUG) */ +#endif /* defined(Py_DEBUG) */ -#if defined(_DEBUG) +#if defined(Py_DEBUG) PyDoc_STRVAR(msvcrt_CrtSetReportMode__doc__, "CrtSetReportMode($module, type, mode, /)\n" @@ -609,9 +609,9 @@ msvcrt_CrtSetReportMode(PyObject *module, PyObject *const *args, Py_ssize_t narg return return_value; } -#endif /* defined(_DEBUG) */ +#endif /* defined(Py_DEBUG) */ -#if defined(_DEBUG) +#if defined(Py_DEBUG) PyDoc_STRVAR(msvcrt_set_error_mode__doc__, "set_error_mode($module, mode, /)\n" @@ -648,7 +648,7 @@ msvcrt_set_error_mode(PyObject *module, PyObject *arg) return return_value; } -#endif /* defined(_DEBUG) */ +#endif /* defined(Py_DEBUG) */ #if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM)) diff --git a/PC/launcher.c b/PC/launcher.c index 47fafbc3bf6bad..40e6630b82e17a 100644 --- a/PC/launcher.c +++ b/PC/launcher.c @@ -140,7 +140,7 @@ static wchar_t * get_env(wchar_t * key) return buf; } -#if defined(_DEBUG) +#if defined(Py_DEBUG) /* Do not define EXECUTABLEPATH_VALUE in debug builds as it'll never point to the debug build. */ #if defined(_WINDOWS) diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index b170e06b47dd59..60b53cb39aaf4d 100644 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -415,7 +415,7 @@ msvcrt_ungetwch_impl(PyObject *module, int unicode_char) #endif /* MS_WINDOWS_DESKTOP */ -#ifdef _DEBUG +#ifdef Py_DEBUG /*[clinic input] msvcrt.CrtSetReportFile -> HANDLE @@ -490,7 +490,7 @@ msvcrt_set_error_mode_impl(PyObject *module, int mode) return res; } -#endif /* _DEBUG */ +#endif /* Py_DEBUG */ #if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM) @@ -604,7 +604,7 @@ exec_module(PyObject* m) INSERTINT(m, "SEM_NOGPFAULTERRORBOX", SEM_NOGPFAULTERRORBOX); INSERTINT(m, "SEM_NOOPENFILEERRORBOX", SEM_NOOPENFILEERRORBOX); #endif -#ifdef _DEBUG +#ifdef Py_DEBUG INSERTINT(m, "CRT_WARN", _CRT_WARN); INSERTINT(m, "CRT_ERROR", _CRT_ERROR); INSERTINT(m, "CRT_ASSERT", _CRT_ASSERT); diff --git a/PC/pyconfig.h.in b/PC/pyconfig.h.in index 9e70303868e5de..e76d75c9135b42 100644 --- a/PC/pyconfig.h.in +++ b/PC/pyconfig.h.in @@ -94,6 +94,11 @@ WIN32 is still required for the locale module. #endif #endif /* Py_BUILD_CORE || Py_BUILD_CORE_BUILTIN || Py_BUILD_CORE_MODULE */ +/* _DEBUG implies Py_DEBUG */ +#ifdef _DEBUG +#define Py_DEBUG +#endif + /* Define to 1 if you want to disable the GIL */ /* Uncomment the definition for free-threaded builds, or define it manually * when compiling extension modules. Note that we test with #ifdef, so @@ -319,21 +324,21 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ This is relevant when using build-system generator (e.g CMake) where the linking is explicitly handled */ # if defined(Py_GIL_DISABLED) -# if defined(_DEBUG) +# if defined(Py_DEBUG) # pragma comment(lib,"python314t_d.lib") # elif defined(Py_LIMITED_API) # pragma comment(lib,"python3t.lib") # else # pragma comment(lib,"python314t.lib") -# endif /* _DEBUG */ +# endif /* Py_DEBUG */ # else /* Py_GIL_DISABLED */ -# if defined(_DEBUG) +# if defined(Py_DEBUG) # pragma comment(lib,"python314_d.lib") # elif defined(Py_LIMITED_API) # pragma comment(lib,"python3.lib") # else # pragma comment(lib,"python314.lib") -# endif /* _DEBUG */ +# endif /* Py_DEBUG */ # endif /* Py_GIL_DISABLED */ # endif /* _MSC_VER && !Py_NO_LINK_LIB */ # endif /* Py_BUILD_CORE */ @@ -376,11 +381,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ # define ALIGNOF_MAX_ALIGN_T 8 #endif -#ifdef _DEBUG -# define Py_DEBUG -#endif - - #ifdef MS_WIN32 #define SIZEOF_SHORT 2 diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc index 11862643aa6989..ff53cb0d7962bc 100644 --- a/PC/pylauncher.rc +++ b/PC/pylauncher.rc @@ -16,13 +16,13 @@ #elif defined(PYW_ICON) 1 ICON DISCARDABLE "icons\pythonw.ico" #else -1 ICON DISCARDABLE "icons\launcher.ico" -2 ICON DISCARDABLE "icons\py.ico" -3 ICON DISCARDABLE "icons\pyc.ico" -4 ICON DISCARDABLE "icons\pyd.ico" +1 ICON DISCARDABLE "icons\launcher.ico" +2 ICON DISCARDABLE "icons\py.ico" +3 ICON DISCARDABLE "icons\pyc.ico" +4 ICON DISCARDABLE "icons\pyd.ico" 5 ICON DISCARDABLE "icons\python.ico" 6 ICON DISCARDABLE "icons\pythonw.ico" -7 ICON DISCARDABLE "icons\setup.ico" +7 ICON DISCARDABLE "icons\setup.ico" #endif 1 USAGE "launcher-usage.txt" @@ -37,7 +37,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef _DEBUG +#ifdef Py_DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L @@ -64,4 +64,4 @@ BEGIN BEGIN VALUE "Translation", 0x0, 1200 END -END \ No newline at end of file +END diff --git a/PC/pyshellext.rc b/PC/pyshellext.rc index af797ce95d5077..57d440b002b4ac 100644 --- a/PC/pyshellext.rc +++ b/PC/pyshellext.rc @@ -21,7 +21,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef _DEBUG +#ifdef Py_DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L @@ -48,4 +48,4 @@ BEGIN BEGIN VALUE "Translation", 0x0, 1200 END -END \ No newline at end of file +END diff --git a/PC/python_exe.rc b/PC/python_exe.rc index c3d3bff019895e..329de4b91a24e6 100644 --- a/PC/python_exe.rc +++ b/PC/python_exe.rc @@ -12,7 +12,7 @@ // current versions of Windows. 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "icons\python.ico" +1 ICON DISCARDABLE "icons\python.ico" ///////////////////////////////////////////////////////////////////////////// @@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef _DEBUG +#ifdef Py_DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L diff --git a/PC/python_nt.rc b/PC/python_nt.rc index ae64fbd217af74..cbcfe7af06e8aa 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -21,7 +21,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef _DEBUG +#ifdef Py_DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L diff --git a/PC/python_uwp.cpp b/PC/python_uwp.cpp index b9c408a580c999..8cdb8d722cdb9a 100644 --- a/PC/python_uwp.cpp +++ b/PC/python_uwp.cpp @@ -19,13 +19,13 @@ #include #ifdef PYTHONW -#ifdef _DEBUG +#ifdef Py_DEBUG const wchar_t *PROGNAME = L"pythonw_d.exe"; #else const wchar_t *PROGNAME = L"pythonw.exe"; #endif #else -#ifdef _DEBUG +#ifdef Py_DEBUG const wchar_t *PROGNAME = L"python_d.exe"; #else const wchar_t *PROGNAME = L"python.exe"; diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h index ee867fe41224c3..bb98144cd03f15 100644 --- a/PC/python_ver_rc.h +++ b/PC/python_ver_rc.h @@ -10,7 +10,7 @@ #define MS_WINDOWS #include "modsupport.h" #include "patchlevel.h" -#ifdef _DEBUG +#ifdef Py_DEBUG # define PYTHON_DEBUG_EXT "_d" #else # define PYTHON_DEBUG_EXT diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc index 38570b74fa3e02..3f80bd71fba52b 100644 --- a/PC/pythonw_exe.rc +++ b/PC/pythonw_exe.rc @@ -12,7 +12,7 @@ // current versions of Windows. 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "icons\pythonw.ico" +1 ICON DISCARDABLE "icons\pythonw.ico" ///////////////////////////////////////////////////////////////////////////// @@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef _DEBUG +#ifdef Py_DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L diff --git a/PC/sqlite3.rc b/PC/sqlite3.rc index 9ae2aa0f6f2f2c..301e99a32d4706 100644 --- a/PC/sqlite3.rc +++ b/PC/sqlite3.rc @@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION SQLITE_MAJOR_VERSION, SQLITE_MINOR_VERSION, SQLITE_MICRO_VERSION, SQLITE_PATCH_VERSION PRODUCTVERSION SQLITE_MAJOR_VERSION, SQLITE_MINOR_VERSION, SQLITE_MICRO_VERSION, SQLITE_PATCH_VERSION FILEFLAGSMASK 0x3fL -#ifdef _DEBUG +#ifdef Py_DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L diff --git a/Python/dynload_win.c b/Python/dynload_win.c index 6324063401e51f..de9b0a77817a63 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -108,7 +108,7 @@ static char *GetPythonImport (HINSTANCE hModule) char *pch; /* Don't claim that python3.dll is a Python DLL. */ -#ifdef _DEBUG +#ifdef Py_DEBUG if (strcmp(import_name, "python3_d.dll") == 0) { #else if (strcmp(import_name, "python3.dll") == 0) { @@ -120,7 +120,7 @@ static char *GetPythonImport (HINSTANCE hModule) /* Ensure python prefix is followed only by numbers to the end of the basename */ pch = import_name + 6; -#ifdef _DEBUG +#ifdef Py_DEBUG while (*pch && pch[0] != '_' && pch[1] != 'd' && pch[2] != '.') { #else while (*pch && *pch != '.') { @@ -300,7 +300,7 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, char buffer[256]; PyOS_snprintf(buffer, sizeof(buffer), -#ifdef _DEBUG +#ifdef Py_DEBUG "python%d%d_d.dll", #else "python%d%d.dll", diff --git a/Python/marshal.c b/Python/marshal.c index b39c1a5b1ade50..afbef6ee6796d9 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -38,7 +38,7 @@ module marshal * On Windows PGO builds, the r_object function overallocates its stack and * can cause a stack overflow. We reduce the maximum depth for all Windows * releases to protect against this. - * #if defined(MS_WINDOWS) && defined(_DEBUG) + * #if defined(MS_WINDOWS) && defined(Py_DEBUG) */ #if defined(MS_WINDOWS) # define MAX_MARSHAL_STACK_DEPTH 1000 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 934614e73b56f9..59c261333103e6 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -3134,7 +3134,7 @@ static inline void _Py_NO_RETURN fatal_error_exit(int status) { if (status < 0) { -#if defined(MS_WINDOWS) && defined(_DEBUG) +#if defined(MS_WINDOWS) && defined(Py_DEBUG) DebugBreak(); #endif abort(); From 32e4f13b92fa23977c260ae13b22aff058d80131 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 15:38:01 +0000 Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/Windows/2025-03-31-15-37-57.gh-issue-131942.jip_aL.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Windows/2025-03-31-15-37-57.gh-issue-131942.jip_aL.rst diff --git a/Misc/NEWS.d/next/Windows/2025-03-31-15-37-57.gh-issue-131942.jip_aL.rst b/Misc/NEWS.d/next/Windows/2025-03-31-15-37-57.gh-issue-131942.jip_aL.rst new file mode 100644 index 00000000000000..837f7265bba246 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2025-03-31-15-37-57.gh-issue-131942.jip_aL.rst @@ -0,0 +1 @@ +Use the Python-specific :c:macro:`Py_DEBUG` macro rather than :c:macro:`!_DEBUG` in Windows-related C code. Patch by Xuehai Pan. From 28db04513820862d25c45a27a2069401c0a15365 Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Mon, 31 Mar 2025 23:49:50 +0800 Subject: [PATCH 3/9] Update generated files --- PC/clinic/msvcrtmodule.c.h | 2 +- Programs/test_frozenmain.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PC/clinic/msvcrtmodule.c.h b/PC/clinic/msvcrtmodule.c.h index 4bf47bd53918ef..8cb1a5b5c6efa9 100644 --- a/PC/clinic/msvcrtmodule.c.h +++ b/PC/clinic/msvcrtmodule.c.h @@ -731,4 +731,4 @@ msvcrt_SetErrorMode(PyObject *module, PyObject *arg) #ifndef MSVCRT_GETERRORMODE_METHODDEF #define MSVCRT_GETERRORMODE_METHODDEF #endif /* !defined(MSVCRT_GETERRORMODE_METHODDEF) */ -/*[clinic end generated code: output=692c6f52bb9193ce input=a9049054013a1b77]*/ +/*[clinic end generated code: output=5cbbc70157dcfaed input=a9049054013a1b77]*/ diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index 76a335086c9b11..3ecbac1828c44f 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -13,10 +13,10 @@ unsigned char M_test_frozenmain[] = { 80,5,89,6,11,0,80,6,89,5,89,6,43,26,0,0, 0,0,0,0,0,0,0,0,11,0,48,4,50,1,0,0, 0,0,0,0,30,0,73,26,0,0,8,0,29,0,80,1, - 34,0,41,8,233,0,0,0,0,78,122,18,70,114,111,122, - 101,110,32,72,101,108,108,111,32,87,111,114,108,100,122,8, + 34,0,41,8,233,0,0,0,0,78,218,18,70,114,111,122, + 101,110,32,72,101,108,108,111,32,87,111,114,108,100,218,8, 115,121,115,46,97,114,103,118,218,6,99,111,110,102,105,103, - 122,7,99,111,110,102,105,103,32,122,2,58,32,41,5,218, + 218,7,99,111,110,102,105,103,32,218,2,58,32,41,5,218, 12,112,114,111,103,114,97,109,95,110,97,109,101,218,10,101, 120,101,99,117,116,97,98,108,101,218,15,117,115,101,95,101, 110,118,105,114,111,110,109,101,110,116,218,17,99,111,110,102, @@ -25,15 +25,15 @@ unsigned char M_test_frozenmain[] = { 3,115,121,115,218,17,95,116,101,115,116,105,110,116,101,114, 110,97,108,99,97,112,105,218,5,112,114,105,110,116,218,4, 97,114,103,118,218,11,103,101,116,95,99,111,110,102,105,103, - 115,114,3,0,0,0,218,3,107,101,121,169,0,243,0,0, + 115,114,5,0,0,0,218,3,107,101,121,169,0,243,0,0, 0,0,218,18,116,101,115,116,95,102,114,111,122,101,110,109, 97,105,110,46,112,121,218,8,60,109,111,100,117,108,101,62, - 114,18,0,0,0,1,0,0,0,115,94,0,0,0,240,3, + 114,22,0,0,0,1,0,0,0,115,94,0,0,0,240,3, 1,1,1,243,8,0,1,11,219,0,24,225,0,5,208,6, 26,212,0,27,217,0,5,128,106,144,35,151,40,145,40,212, 0,27,216,9,26,215,9,38,210,9,38,211,9,40,168,24, 213,9,50,128,6,243,2,6,12,2,128,67,241,14,0,5, 10,136,71,144,67,144,53,152,2,152,54,160,35,157,59,152, - 45,208,10,40,214,4,41,243,15,6,12,2,114,16,0,0, + 45,208,10,40,214,4,41,243,15,6,12,2,114,20,0,0, 0, }; From 004e6eca641b713b85859efec08a485b008429aa Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Mon, 31 Mar 2025 23:58:12 +0800 Subject: [PATCH 4/9] Add a note to `Py_DEBUG` in docs --- Doc/c-api/intro.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst index 76d7d5793428f8..9634e053527054 100644 --- a/Doc/c-api/intro.rst +++ b/Doc/c-api/intro.rst @@ -832,6 +832,13 @@ It is also implied by the presence of the not-Python-specific :c:macro:`!_DEBUG` macro. When :c:macro:`!Py_DEBUG` is enabled in the Unix build, compiler optimization is disabled. +.. note:: + On Windows, the :c:macro:`!Py_DEBUG` macro is not defined by default. + + The :option:`--with-pydebug` option is not available on Windows. Instead, the + not-Python-specific :c:macro:`!_DEBUG` macro can be defined by the compiler + options and that will enable the :c:macro:`!Py_DEBUG` macro. + In addition to the reference count debugging described below, extra checks are performed, see :ref:`Python Debug Build `. From fd82b5bf32cb2702a2e3ca4ddf11fa83fb2d00ec Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Tue, 1 Apr 2025 00:49:40 +0800 Subject: [PATCH 5/9] Revert changes in `.rc` resource files --- PC/pylauncher.rc | 14 +++++++------- PC/pyshellext.rc | 4 ++-- PC/python_exe.rc | 4 ++-- PC/python_nt.rc | 2 +- PC/pythonw_exe.rc | 4 ++-- PC/sqlite3.rc | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc index ff53cb0d7962bc..11862643aa6989 100644 --- a/PC/pylauncher.rc +++ b/PC/pylauncher.rc @@ -16,13 +16,13 @@ #elif defined(PYW_ICON) 1 ICON DISCARDABLE "icons\pythonw.ico" #else -1 ICON DISCARDABLE "icons\launcher.ico" -2 ICON DISCARDABLE "icons\py.ico" -3 ICON DISCARDABLE "icons\pyc.ico" -4 ICON DISCARDABLE "icons\pyd.ico" +1 ICON DISCARDABLE "icons\launcher.ico" +2 ICON DISCARDABLE "icons\py.ico" +3 ICON DISCARDABLE "icons\pyc.ico" +4 ICON DISCARDABLE "icons\pyd.ico" 5 ICON DISCARDABLE "icons\python.ico" 6 ICON DISCARDABLE "icons\pythonw.ico" -7 ICON DISCARDABLE "icons\setup.ico" +7 ICON DISCARDABLE "icons\setup.ico" #endif 1 USAGE "launcher-usage.txt" @@ -37,7 +37,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef Py_DEBUG +#ifdef _DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L @@ -64,4 +64,4 @@ BEGIN BEGIN VALUE "Translation", 0x0, 1200 END -END +END \ No newline at end of file diff --git a/PC/pyshellext.rc b/PC/pyshellext.rc index 57d440b002b4ac..af797ce95d5077 100644 --- a/PC/pyshellext.rc +++ b/PC/pyshellext.rc @@ -21,7 +21,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef Py_DEBUG +#ifdef _DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L @@ -48,4 +48,4 @@ BEGIN BEGIN VALUE "Translation", 0x0, 1200 END -END +END \ No newline at end of file diff --git a/PC/python_exe.rc b/PC/python_exe.rc index 329de4b91a24e6..c3d3bff019895e 100644 --- a/PC/python_exe.rc +++ b/PC/python_exe.rc @@ -12,7 +12,7 @@ // current versions of Windows. 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "icons\python.ico" +1 ICON DISCARDABLE "icons\python.ico" ///////////////////////////////////////////////////////////////////////////// @@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef Py_DEBUG +#ifdef _DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L diff --git a/PC/python_nt.rc b/PC/python_nt.rc index cbcfe7af06e8aa..ae64fbd217af74 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -21,7 +21,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef Py_DEBUG +#ifdef _DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc index 3f80bd71fba52b..38570b74fa3e02 100644 --- a/PC/pythonw_exe.rc +++ b/PC/pythonw_exe.rc @@ -12,7 +12,7 @@ // current versions of Windows. 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "icons\pythonw.ico" +1 ICON DISCARDABLE "icons\pythonw.ico" ///////////////////////////////////////////////////////////////////////////// @@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION PYVERSION64 PRODUCTVERSION PYVERSION64 FILEFLAGSMASK 0x3fL -#ifdef Py_DEBUG +#ifdef _DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L diff --git a/PC/sqlite3.rc b/PC/sqlite3.rc index 301e99a32d4706..9ae2aa0f6f2f2c 100644 --- a/PC/sqlite3.rc +++ b/PC/sqlite3.rc @@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION SQLITE_MAJOR_VERSION, SQLITE_MINOR_VERSION, SQLITE_MICRO_VERSION, SQLITE_PATCH_VERSION PRODUCTVERSION SQLITE_MAJOR_VERSION, SQLITE_MINOR_VERSION, SQLITE_MICRO_VERSION, SQLITE_PATCH_VERSION FILEFLAGSMASK 0x3fL -#ifdef Py_DEBUG +#ifdef _DEBUG FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L From 0fc148feded8270e6f15c1365c431ba7f74bf325 Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Tue, 1 Apr 2025 01:01:57 +0800 Subject: [PATCH 6/9] Update generated files --- Programs/test_frozenmain.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index 3ecbac1828c44f..89d14dd9135267 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -13,8 +13,8 @@ unsigned char M_test_frozenmain[] = { 80,5,89,6,11,0,80,6,89,5,89,6,43,26,0,0, 0,0,0,0,0,0,0,0,11,0,48,4,50,1,0,0, 0,0,0,0,30,0,73,26,0,0,8,0,29,0,80,1, - 34,0,41,8,233,0,0,0,0,78,218,18,70,114,111,122, - 101,110,32,72,101,108,108,111,32,87,111,114,108,100,218,8, + 34,0,41,8,233,0,0,0,0,78,122,18,70,114,111,122, + 101,110,32,72,101,108,108,111,32,87,111,114,108,100,122,8, 115,121,115,46,97,114,103,118,218,6,99,111,110,102,105,103, 218,7,99,111,110,102,105,103,32,218,2,58,32,41,5,218, 12,112,114,111,103,114,97,109,95,110,97,109,101,218,10,101, @@ -25,15 +25,15 @@ unsigned char M_test_frozenmain[] = { 3,115,121,115,218,17,95,116,101,115,116,105,110,116,101,114, 110,97,108,99,97,112,105,218,5,112,114,105,110,116,218,4, 97,114,103,118,218,11,103,101,116,95,99,111,110,102,105,103, - 115,114,5,0,0,0,218,3,107,101,121,169,0,243,0,0, + 115,114,3,0,0,0,218,3,107,101,121,169,0,243,0,0, 0,0,218,18,116,101,115,116,95,102,114,111,122,101,110,109, 97,105,110,46,112,121,218,8,60,109,111,100,117,108,101,62, - 114,22,0,0,0,1,0,0,0,115,94,0,0,0,240,3, + 114,18,0,0,0,1,0,0,0,115,94,0,0,0,240,3, 1,1,1,243,8,0,1,11,219,0,24,225,0,5,208,6, 26,212,0,27,217,0,5,128,106,144,35,151,40,145,40,212, 0,27,216,9,26,215,9,38,210,9,38,211,9,40,168,24, 213,9,50,128,6,243,2,6,12,2,128,67,241,14,0,5, 10,136,71,144,67,144,53,152,2,152,54,160,35,157,59,152, - 45,208,10,40,214,4,41,243,15,6,12,2,114,20,0,0, + 45,208,10,40,214,4,41,243,15,6,12,2,114,16,0,0, 0, }; From 5d0a67fd915ee558b7242522d2dfc3434bcb2eac Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Tue, 1 Apr 2025 02:26:34 +0800 Subject: [PATCH 7/9] Revert "Update generated files" This reverts commit 0fc148feded8270e6f15c1365c431ba7f74bf325. --- Programs/test_frozenmain.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index 89d14dd9135267..3ecbac1828c44f 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -13,8 +13,8 @@ unsigned char M_test_frozenmain[] = { 80,5,89,6,11,0,80,6,89,5,89,6,43,26,0,0, 0,0,0,0,0,0,0,0,11,0,48,4,50,1,0,0, 0,0,0,0,30,0,73,26,0,0,8,0,29,0,80,1, - 34,0,41,8,233,0,0,0,0,78,122,18,70,114,111,122, - 101,110,32,72,101,108,108,111,32,87,111,114,108,100,122,8, + 34,0,41,8,233,0,0,0,0,78,218,18,70,114,111,122, + 101,110,32,72,101,108,108,111,32,87,111,114,108,100,218,8, 115,121,115,46,97,114,103,118,218,6,99,111,110,102,105,103, 218,7,99,111,110,102,105,103,32,218,2,58,32,41,5,218, 12,112,114,111,103,114,97,109,95,110,97,109,101,218,10,101, @@ -25,15 +25,15 @@ unsigned char M_test_frozenmain[] = { 3,115,121,115,218,17,95,116,101,115,116,105,110,116,101,114, 110,97,108,99,97,112,105,218,5,112,114,105,110,116,218,4, 97,114,103,118,218,11,103,101,116,95,99,111,110,102,105,103, - 115,114,3,0,0,0,218,3,107,101,121,169,0,243,0,0, + 115,114,5,0,0,0,218,3,107,101,121,169,0,243,0,0, 0,0,218,18,116,101,115,116,95,102,114,111,122,101,110,109, 97,105,110,46,112,121,218,8,60,109,111,100,117,108,101,62, - 114,18,0,0,0,1,0,0,0,115,94,0,0,0,240,3, + 114,22,0,0,0,1,0,0,0,115,94,0,0,0,240,3, 1,1,1,243,8,0,1,11,219,0,24,225,0,5,208,6, 26,212,0,27,217,0,5,128,106,144,35,151,40,145,40,212, 0,27,216,9,26,215,9,38,210,9,38,211,9,40,168,24, 213,9,50,128,6,243,2,6,12,2,128,67,241,14,0,5, 10,136,71,144,67,144,53,152,2,152,54,160,35,157,59,152, - 45,208,10,40,214,4,41,243,15,6,12,2,114,16,0,0, + 45,208,10,40,214,4,41,243,15,6,12,2,114,20,0,0, 0, }; From 8284b0e1e0669bd3bfd098450c597868e2678712 Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Tue, 1 Apr 2025 02:26:57 +0800 Subject: [PATCH 8/9] Reapply "Update generated files" This reverts commit 5d0a67fd915ee558b7242522d2dfc3434bcb2eac. --- Programs/test_frozenmain.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index 3ecbac1828c44f..76a335086c9b11 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -13,10 +13,10 @@ unsigned char M_test_frozenmain[] = { 80,5,89,6,11,0,80,6,89,5,89,6,43,26,0,0, 0,0,0,0,0,0,0,0,11,0,48,4,50,1,0,0, 0,0,0,0,30,0,73,26,0,0,8,0,29,0,80,1, - 34,0,41,8,233,0,0,0,0,78,218,18,70,114,111,122, - 101,110,32,72,101,108,108,111,32,87,111,114,108,100,218,8, + 34,0,41,8,233,0,0,0,0,78,122,18,70,114,111,122, + 101,110,32,72,101,108,108,111,32,87,111,114,108,100,122,8, 115,121,115,46,97,114,103,118,218,6,99,111,110,102,105,103, - 218,7,99,111,110,102,105,103,32,218,2,58,32,41,5,218, + 122,7,99,111,110,102,105,103,32,122,2,58,32,41,5,218, 12,112,114,111,103,114,97,109,95,110,97,109,101,218,10,101, 120,101,99,117,116,97,98,108,101,218,15,117,115,101,95,101, 110,118,105,114,111,110,109,101,110,116,218,17,99,111,110,102, @@ -25,15 +25,15 @@ unsigned char M_test_frozenmain[] = { 3,115,121,115,218,17,95,116,101,115,116,105,110,116,101,114, 110,97,108,99,97,112,105,218,5,112,114,105,110,116,218,4, 97,114,103,118,218,11,103,101,116,95,99,111,110,102,105,103, - 115,114,5,0,0,0,218,3,107,101,121,169,0,243,0,0, + 115,114,3,0,0,0,218,3,107,101,121,169,0,243,0,0, 0,0,218,18,116,101,115,116,95,102,114,111,122,101,110,109, 97,105,110,46,112,121,218,8,60,109,111,100,117,108,101,62, - 114,22,0,0,0,1,0,0,0,115,94,0,0,0,240,3, + 114,18,0,0,0,1,0,0,0,115,94,0,0,0,240,3, 1,1,1,243,8,0,1,11,219,0,24,225,0,5,208,6, 26,212,0,27,217,0,5,128,106,144,35,151,40,145,40,212, 0,27,216,9,26,215,9,38,210,9,38,211,9,40,168,24, 213,9,50,128,6,243,2,6,12,2,128,67,241,14,0,5, 10,136,71,144,67,144,53,152,2,152,54,160,35,157,59,152, - 45,208,10,40,214,4,41,243,15,6,12,2,114,20,0,0, + 45,208,10,40,214,4,41,243,15,6,12,2,114,16,0,0, 0, }; From 165dc3688d563aa7423c22ca4c3858ced24dfb31 Mon Sep 17 00:00:00 2001 From: Xuehai Pan Date: Thu, 3 Apr 2025 00:41:18 +0800 Subject: [PATCH 9/9] Update PC/pyconfig.h.in from code review Co-authored-by: Victor Stinner --- PC/pyconfig.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PC/pyconfig.h.in b/PC/pyconfig.h.in index e76d75c9135b42..dae2a22c3ec49c 100644 --- a/PC/pyconfig.h.in +++ b/PC/pyconfig.h.in @@ -96,7 +96,7 @@ WIN32 is still required for the locale module. /* _DEBUG implies Py_DEBUG */ #ifdef _DEBUG -#define Py_DEBUG +# define Py_DEBUG 1 #endif /* Define to 1 if you want to disable the GIL */