Merge branch 'main' into expat-2.9.0

Author: StanFromIreland

Include/pymacro.h

@@ -214,12 +214,12 @@
 //
 // gh-158810: Do not use __builtin_types_compatible_p() in strict C ANSI mode
 // and on C++.
-#if (defined(__GNUC__) && __GNUC__ >= 4 \
+#if (defined(__GNUC__) && __GNUC__ >= 4 && defined(_Py_TYPEOF) \
         && !defined(__STRICT_ANSI__) && !defined(__cplusplus))
 #define Py_ARRAY_LENGTH(array) \
     (sizeof(array) / sizeof((array)[0]) \
-     + Py_BUILD_ASSERT_EXPR(!__builtin_types_compatible_p(typeof(array), \
-                                                          typeof(&(array)[0]))))
+     + Py_BUILD_ASSERT_EXPR(!__builtin_types_compatible_p(_Py_TYPEOF(array), \
+                                                          _Py_TYPEOF(&(array)[0]))))
 #else
 #define Py_ARRAY_LENGTH(array) \
     (sizeof(array) / sizeof((array)[0]))

Lib/test/test_cext/extension.c

@@ -388,6 +388,11 @@ module_exec(PyObject *module)
         return -1;
     }
 #endif
+#ifdef __STRICT_ANSI__
+    if (PyModule_AddIntConstant(module, "__STRICT_ANSI__", 1) < 0) {
+        return -1;
+    }
+#endif
 #ifdef __cplusplus
     if (PyModule_AddIntMacro(module, __cplusplus) < 0) {
         return -1;

Lib/test/test_cext/runtests.py

@@ -28,7 +28,12 @@ def main():
     testmod = importlib.import_module(module_name)
 
     newline = False
-    for name in ('__STDC_VERSION__', '__cplusplus', '_MSVC_LANG'):
+    for name in (
+        '__STDC_VERSION__',
+        '__STRICT_ANSI__',
+        '__cplusplus',
+        '_MSVC_LANG',
+    ):
         try:
             value = getattr(testmod, name)
         except AttributeError:

Lib/test/test_cext/setup.py

@@ -135,7 +135,7 @@ def main():
     # option emits a C++ compiler warning. Remove "-std11" option from the
     # CC command.
     cmd = (sysconfig.get_config_var('CC') or '')
-    if cmd is not None:
+    if cmd is not None and 'CC' not in os.environ:
         if support.MS_WINDOWS:
             std_prefix = '/std'
         else:

Misc/NEWS.d/next/Build/2026-10-05-12-15-57.gh-issue-158878.KWLqLy.rst

@@ -0,0 +1,2 @@
+Stop creating an empty Modules/Setup.local file as it no longer seems to be
+required to statically link the extension modules.

Misc/NEWS.d/next/Windows/2026-09-19-13-18-48.gh-issue-157789.o6-rmo.rst

@@ -0,0 +1,2 @@
+Use compiler option ``-Og`` in case of clang-cl debug builds on Windows to
+reduce stack usage. Patch by Chris Eibl.

Modules/_elementtree.c

@@ -1497,11 +1497,13 @@ _elementtree_Element_get_impl(ElementObject *self, PyObject *key,
 {
     if (self->extra && self->extra->attrib) {
         PyObject *attrib = Py_NewRef(self->extra->attrib);
-        PyObject *value = Py_XNewRef(PyDict_GetItemWithError(attrib, key));
-        Py_DECREF(attrib);
-        if (value != NULL || PyErr_Occurred()) {
+        PyObject *value;
+        if (PyDict_GetItemRef(attrib, key, &value) != 0) {
+            Py_DECREF(attrib);
+            // The key exists or an error occurred
             return value;
         }
+        Py_DECREF(attrib);
     }
 
     return Py_NewRef(default_value);
@@ -3177,56 +3179,58 @@ makeuniversal(XMLParserObject* self, const char* string)
     if (!key)
         return NULL;
 
-    value = Py_XNewRef(PyDict_GetItemWithError(self->names, key));
-
-    if (value == NULL && !PyErr_Occurred()) {
-        /* new name.  convert to universal name, and decode as
-           necessary */
-
-        PyObject* tag;
-        Py_ssize_t i;
+    if (PyDict_GetItemRef(self->names, key, &value) != 0) {
+        // The key exists or an error occurred
+        Py_DECREF(key);
+        return value;
+    }
 
-        /* look for namespace separator */
-        for (i = 0; i < size; i++)
-            if (string[i] == '}')
-                break;
-        if (i != size) {
-            /* convert to universal name */
-            PyBytesWriter *writer = PyBytesWriter_Create(1 + size);
-            if (writer == NULL) {
-                Py_DECREF(key);
-                return NULL;
-            }
-            char *p = PyBytesWriter_GetData(writer);
-            p[0] = '{';
-            memcpy(p+1, string, size);
-            size++;
+    /* new name.  convert to universal name, and decode as
+       necessary */
 
-            tag = PyBytesWriter_Finish(writer);
-            if (tag == NULL) {
-                Py_DECREF(key);
-                return NULL;
-            }
-        } else {
-            /* plain name; use key as tag */
-            tag = Py_NewRef(key);
-        }
+    PyObject* tag;
+    Py_ssize_t i;
 
-        /* decode universal name */
-        const char *p = PyBytes_AS_STRING(tag);
-        value = PyUnicode_DecodeUTF8(p, size, "strict");
-        Py_DECREF(tag);
-        if (!value) {
+    /* look for namespace separator */
+    for (i = 0; i < size; i++)
+        if (string[i] == '}')
+            break;
+    if (i != size) {
+        /* convert to universal name */
+        PyBytesWriter *writer = PyBytesWriter_Create(1 + size);
+        if (writer == NULL) {
             Py_DECREF(key);
             return NULL;
         }
+        char *p = PyBytesWriter_GetData(writer);
+        p[0] = '{';
+        memcpy(p+1, string, size);
+        size++;
 
-        /* add to names dictionary */
-        if (PyDict_SetItem(self->names, key, value) < 0) {
+        tag = PyBytesWriter_Finish(writer);
+        if (tag == NULL) {
             Py_DECREF(key);
-            Py_DECREF(value);
             return NULL;
         }
+    } else {
+        /* plain name; use key as tag */
+        tag = Py_NewRef(key);
+    }
+
+    /* decode universal name */
+    const char *p = PyBytes_AS_STRING(tag);
+    value = PyUnicode_DecodeUTF8(p, size, "strict");
+    Py_DECREF(tag);
+    if (!value) {
+        Py_DECREF(key);
+        return NULL;
+    }
+
+    /* add to names dictionary */
+    if (PyDict_SetItem(self->names, key, value) < 0) {
+        Py_DECREF(key);
+        Py_DECREF(value);
+        return NULL;
     }
 
     Py_DECREF(key);
@@ -3304,7 +3308,11 @@ expat_default_handler(void *op, const XML_Char *data_in, int data_len)
     if (!key)
         return;
 
-    value = PyDict_GetItemWithError(self->entity, key);
+    if (PyDict_GetItemRef(self->entity, key, &value) < 0) {
+        Py_DECREF(key);
+        return;
+    }
+    Py_DECREF(key);
 
     elementtreestate *st = self->state;
     if (value) {
@@ -3316,8 +3324,10 @@ expat_default_handler(void *op, const XML_Char *data_in, int data_len)
             res = PyObject_CallOneArg(self->handle_data, value);
         else
             res = NULL;
+        Py_DECREF(value);
         Py_XDECREF(res);
-    } else if (!PyErr_Occurred()) {
+    }
+    else {
         /* Report the first error, not the last */
         char message[128] = "undefined entity ";
         strncat(message, data_in, data_len < 100?data_len:100);
@@ -3329,8 +3339,6 @@ expat_default_handler(void *op, const XML_Char *data_in, int data_len)
             message
             );
     }
-
-    Py_DECREF(key);
 }
 
 /* Append (action, node) to the list of events of the pull parser. */

Objects/dictobject.c

@@ -4269,12 +4269,12 @@ dict_dict_merge(PyDictObject *mp, PyDictObject *other, int override, PyObject **
 
     while (_PyDict_Next((PyObject*)other, &pos, &key, &value, &hash)) {
         int err = 0;
-        Py_INCREF(key);
-        Py_INCREF(value);
         if (override == 1) {
             err = insertdict(mp, Py_NewRef(key), hash, Py_NewRef(value));
         }
         else {
+            Py_INCREF(key);
+            Py_INCREF(value);
             err = _PyDict_Contains_KnownHash((PyObject *)mp, key, hash);
             if (err == 0) {
                 err = insertdict(mp, Py_NewRef(key), hash, Py_NewRef(value));
@@ -4287,9 +4287,9 @@ dict_dict_merge(PyDictObject *mp, PyDictObject *other, int override, PyObject **
                 }
                 err = 0;
             }
+            Py_DECREF(value);
+            Py_DECREF(key);
         }
-        Py_DECREF(value);
-        Py_DECREF(key);
         if (err != 0)
             return -1;
 

PCbuild/pyproject-clangcl.props

@@ -50,6 +50,7 @@
       <AdditionalOptions Condition="'$(Platform)' == 'Win32'">-m32 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(Platform)' == 'x64'">-m64 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="$(Configuration) != 'Debug'">-flto=thin %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="$(Configuration) == 'Debug'">%(AdditionalOptions) -Xclang -Og</AdditionalOptions>
       <AdditionalOptions Condition="$(SupportPGO) and $(Configuration) == 'PGInstrument'">-fprofile-instr-generate=$(_CLANG_PROFILE_PATH)$(TargetName)_%m.profraw %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="$(SupportPGO) and $(Configuration) == 'PGUpdate'">-fprofile-instr-use=$(OutDir)instrumented\profdata.profdata -Wno-profile-instr-unprofiled %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>

Platforms/WASI/_build.py

@@ -25,11 +25,6 @@
 
 import _shared
 
-LOCAL_SETUP_MARKER = (
-    b"# Generated by Platforms/WASI .\n"
-    b"# Required to statically build extension modules."
-)
-
 WASMTIME_VAR_NAME = "WASMTIME"
 WASMTIME_HOST_RUNNER_VAR = f"{{{WASMTIME_VAR_NAME}}}"
 
@@ -147,18 +142,6 @@ def call(command, *, context=None, quiet=False, **kwargs):
 @subdir("build_python_path", clean_ok=True)
 def configure_build_python(context, working_dir):
     """Configure the build/host Python."""
-    if context.setup_local_path.exists():
-        if context.setup_local_path.read_bytes() == LOCAL_SETUP_MARKER:
-            _shared.log("👍", f"{context.setup_local_path} exists ...")
-        else:
-            _shared.log(
-                "⚠️",
-                f"{context.setup_local_path} exists, but has unexpected contents",
-            )
-    else:
-        _shared.log("📝", f"Creating {context.setup_local_path} ...")
-        context.setup_local_path.write_bytes(LOCAL_SETUP_MARKER)
-
     configure = [os.path.relpath(context.checkout / "configure", working_dir)]
     if context.args:
         configure.extend(context.args)
@@ -300,13 +283,6 @@ def clean_contents(context):
         _shared.log("🧹", f"Deleting {context.cross_build_path} ...")
         shutil.rmtree(context.cross_build_path)
 
-    if context.setup_local_path.exists():
-        if context.setup_local_path.read_bytes() == LOCAL_SETUP_MARKER:
-            _shared.log(
-                "🧹", f"Deleting generated {context.setup_local_path} ..."
-            )
-            context.setup_local_path.unlink()
-
 
 @subdir("build_python_path")
 def pythoninfo_build_python(context, working_dir):