python · vstinner · Dec 7, 2022 · Dec 7, 2022 · Dec 7, 2022
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -323,6 +323,10 @@ sys
   with contributions from Gregory P. Smith [Google] and Mark Shannon
   in :gh:`96123`.)
 
+* Add more build details about how Python was configured in
+  :data:`sys.version`, like "debug" or "release" build.
+  (Contributed by Victor Stinner in :gh:`100086`.)
+
 
 Optimizations
 =============

diff --git a/Lib/platform.py b/Lib/platform.py
@@ -1035,7 +1035,9 @@ def processor():
     r'([\w.+]+)\s*'  # "version<space>"
     r'\(#?([^,]+)'  # "(#buildno"
     r'(?:,\s*([\w ]*)'  # ", builddate"
-    r'(?:,\s*([\w :]*))?)?\)\s*'  # ", buildtime)<space>"
+        r'(?:,\s*([\w :]*))?)?'  # ", buildtime"
+    r'(?:,\s*([\w :]*))?'  # ", build details"
+    r'\)\s*'  # ")<space>"
     r'\[([^\]]+)\]?', re.ASCII)  # "[compiler]"
 
 _ironpython_sys_version_parser = re.compile(
@@ -1114,7 +1116,7 @@ def _sys_version(sys_version=None):
             raise ValueError(
                 'failed to parse Jython sys.version: %s' %
                 repr(sys_version))
-        version, buildno, builddate, buildtime, _ = match.groups()
+        version, buildno, builddate, buildtime, _, _ = match.groups()
         if builddate is None:
             builddate = ''
         compiler = sys.platform
@@ -1136,7 +1138,7 @@ def _sys_version(sys_version=None):
             raise ValueError(
                 'failed to parse CPython sys.version: %s' %
                 repr(sys_version))
-        version, buildno, builddate, buildtime, compiler = \
+        version, buildno, builddate, buildtime, _, compiler = \
               match.groups()
         name = 'CPython'
         if builddate is None:

diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
@@ -119,7 +119,7 @@ def tearDown(self):
         sys.platform = self.save_platform
 
     def test_sys_version(self):
-        # Old test.
+        # Test platform._sys_version()
         for input, output in (
             ('2.4.3 (#1, Jun 21 2006, 13:54:21) \n[GCC 3.3.4 (pre 3.3.5 20040809)]',
              ('CPython', '2.4.3', '', '', '1', 'Jun 21 2006 13:54:21', 'GCC 3.3.4 (pre 3.3.5 20040809)')),
@@ -143,6 +143,11 @@ def test_sys_version(self):
              ('CPython', '2.4.3', '', '', 'truncation', '', 'GCC')),
             ('2.4.3 (truncation) \n[GCC]',
              ('CPython', '2.4.3', '', '', 'truncation', '', 'GCC')),
+            ('3.12.0a3+ (heads/py_build_str:f9be94491f, '
+             'Dec  7 2022, 21:57:04, debug build) '
+             '[GCC 12.2.1 20221121 (Red Hat 12.2.1-4)]',
+             ('CPython', '3.12.0a3+', '', '', 'heads/py_build_str:f9be94491f',
+              'Dec  7 2022 21:57:04', 'GCC 12.2.1 20221121 (Red Hat 12.2.1-4)')),
             ):
             # branch and revision are not "parsed", but fetched
             # from sys._git.  Ignore them

@@ -123,7 +123,8 @@ PY_CORE_CFLAGS=	$(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE
 PY_CORE_LDFLAGS=$(PY_LDFLAGS) $(PY_LDFLAGS_NODIST)
 # Strict or non-strict aliasing flags used to compile dtoa.c, see above
 CFLAGS_ALIASING=@CFLAGS_ALIASING@
-
+# String describing the Python build used by sys.version (ex: "debug build")
+PY_BUILD_STR=@PY_BUILD_STR@
 
 # Machine-dependent subdirectories
 MACHDEP=	@MACHDEP@
@@ -1245,6 +1246,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
 	      -DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
 	      -DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \
 	      -DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \
+	      -DPY_BUILD_STR="\"$(PY_BUILD_STR)\"" \
 	      -o $@ $(srcdir)/Modules/getbuildinfo.c
 
 Modules/getpath.o: $(srcdir)/Modules/getpath.c Python/frozen_modules/getpath.h Makefile $(PYTHON_HEADERS)

diff --git a/Misc/NEWS.d/next/Library/2022-12-07-18-31-40.gh-issue-100086.oiz2PI.rst b/Misc/NEWS.d/next/Library/2022-12-07-18-31-40.gh-issue-100086.oiz2PI.rst
@@ -0,0 +1,2 @@
+Add more build details about how Python was configured in :data:`sys.version`,
+like "debug" or "release" build. Patch by Victor Stinner.
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
@@ -30,11 +30,23 @@
 #ifndef GITBRANCH
 #define GITBRANCH ""
 #endif
+#ifndef PY_BUILD_STR
+   // On Windows, only provide basic info
+#  ifdef Py_DEBUG
+#    define PY_BUILD_STR "debug build"
+#  else
+#    define PY_BUILD_STR "release build"
+#  endif
+#endif
+
+// len(", release+assert+tracerefs+pystats asan msan ubsan lto=thin+pgo framework shared build")
+#define PY_BUILD_STR_MAXLEN 86
 
 static int initialized = 0;
 static char buildinfo[50 + sizeof(GITVERSION) +
                       ((sizeof(GITTAG) > sizeof(GITBRANCH)) ?
-                       sizeof(GITTAG) : sizeof(GITBRANCH))];
+                       sizeof(GITTAG) : sizeof(GITBRANCH))
+                       + PY_BUILD_STR_MAXLEN];
 
 const char *
 Py_GetBuildInfo(void)
@@ -50,8 +62,9 @@ Py_GetBuildInfo(void)
         gitid = "main";
     }
     PyOS_snprintf(buildinfo, sizeof(buildinfo),
-                  "%s%s%s, %.20s, %.9s", gitid, sep, revision,
-                  DATE, TIME);
+                  "%s%s%s, %.20s, %.9s, %s",
+                gitid, sep, revision, DATE, TIME,
+                PY_BUILD_STR);
     return buildinfo;
 }
 

@@ -3093,12 +3093,15 @@ case $ac_sys_system/$ac_sys_release in
 	;;
 esac
 
+SANITIZERS=""
+
 AC_MSG_CHECKING(for --with-address-sanitizer)
 AC_ARG_WITH(address_sanitizer,
             AS_HELP_STRING([--with-address-sanitizer],
                            [enable AddressSanitizer memory error detector, 'asan' (default is no)]),
 [
 AC_MSG_RESULT($withval)
+SANITIZERS="$SANITIZERS asan"
 BASECFLAGS="-fsanitize=address -fno-omit-frame-pointer $BASECFLAGS"
 LDFLAGS="-fsanitize=address $LDFLAGS"
 # ASan works by controlling memory allocation, our own malloc interferes.
@@ -3113,6 +3116,7 @@ AC_ARG_WITH(memory_sanitizer,
 [
 AC_MSG_RESULT($withval)
 AX_CHECK_COMPILE_FLAG([-fsanitize=memory],[
+SANITIZERS="$SANITIZERS msan"
 BASECFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer $BASECFLAGS"
 LDFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 $LDFLAGS"
 ],[AC_MSG_ERROR([The selected compiler doesn't support memory sanitizer])])
@@ -3127,6 +3131,7 @@ AC_ARG_WITH(undefined_behavior_sanitizer,
                            [enable UndefinedBehaviorSanitizer undefined behaviour detector, 'ubsan' (default is no)]),
 [
 AC_MSG_RESULT($withval)
+SANITIZERS="$SANITIZERS ubsan"
 BASECFLAGS="-fsanitize=undefined $BASECFLAGS"
 LDFLAGS="-fsanitize=undefined $LDFLAGS"
 with_ubsan="yes"
@@ -3136,6 +3141,10 @@ AC_MSG_RESULT(no)
 with_ubsan="no"
 ])
 
+# strip leading space
+SANITIZERS=$(echo $SANITIZERS | sed 's/^ //')
+
+
 # Set info about shared libraries.
 AC_SUBST(SHLIB_SUFFIX)
 AC_SUBST(LDSHARED)
@@ -7374,6 +7383,67 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu
 # substitute multiline block, must come after last PY_STDLIB_MOD()
 AC_SUBST([MODULE_BLOCK])
 
+
+# String describing the Python build used by sys.version (ex: "debug build")
+# Short string containing most important configure options.
+# Examples:
+# - "debug+tracerefs build"
+# - "release+assert shared build"
+# - "release lto+pgo build"
+#
+#  If the PY_BUILD_STR format changes, PY_BUILD_STR_MAXLEN in
+#  Modules/getbuildinfo.c should be updated.
+AC_SUBST(PY_BUILD_STR)
+if test "$Py_DEBUG" = 'true' ; then
+    PY_BUILD_STR="debug"
+else
+    PY_BUILD_STR="release"
+    if test "$assertions" = 'true'; then
+        PY_BUILD_STR="$PY_BUILD_STR+assert"
+    fi
+fi
+if test "$with_trace_refs" = "yes"; then
+    PY_BUILD_STR="$PY_BUILD_STR+tracerefs"
+fi
+if test "$enable_pystats" = "yes"; then
+    PY_BUILD_STR="$PY_BUILD_STR+pystats"
+fi
+if test -n "${SANITIZERS}"; then
+    PY_BUILD_STR="$PY_BUILD_STR $SANITIZERS"
+fi
+if test "$Py_LTO" = 'true' ; then
+    LTO_BUILD_STR="lto"
+    if test "$Py_LTO_POLICY" = 'thin' ; then
+        LTO_BUILD_STR="lto=thin"
+    fi
+else
+    LTO_BUILD_STR=""
+fi
+if test "$Py_OPT" = 'true' ; then
+    PGO_BUILD_STR="pgo"
+else
+    PGO_BUILD_STR=""
+fi
+if test -n "${LTO_BUILD_STR}"; then
+    if test -n "${PGO_BUILD_STR}"; then
+        PY_BUILD_STR="$PY_BUILD_STR $LTO_BUILD_STR+$PGO_BUILD_STR"
+    else
+        PY_BUILD_STR="$PY_BUILD_STR $LTO_BUILD_STR"
+    fi
+else
+    if test -n "${PGO_BUILD_STR}"; then
+        PY_BUILD_STR="$PY_BUILD_STR $PGO_BUILD_STR"
+    fi
+fi
+if test "$enable_framework"; then
+    PY_BUILD_STR="$PY_BUILD_STR framework"
+fi
+if test "$PY_ENABLE_SHARED" = 1; then
+    PY_BUILD_STR="$PY_BUILD_STR shared"
+fi
+PY_BUILD_STR="$PY_BUILD_STR build"
+
+
 # generate output files
 AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh)
 AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib])
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Add more build details about how Python was configured in :data:`sys.version`,
		like "debug" or "release" build. Patch by Victor Stinner.