https://github.com/python/cpython/commit/e5f68fd29b3bd867207f23608a8dbc5759a056ed
commit: e5f68fd29b3bd867207f23608a8dbc5759a056ed
branch: main
author: Chris Eibl <[email protected]>
committer: zooba <[email protected]>
date: 2025-04-10T23:17:33+01:00
summary:
GH-131296: Suppress "unused label" warning for clang-cl closer to actual
occurrence (GH-131900)
files:
M PCbuild/pyproject-clangcl.props
M Python/ceval.c
diff --git a/PCbuild/pyproject-clangcl.props b/PCbuild/pyproject-clangcl.props
index a574cf84ee5d6c..70a81ca7da306c 100644
--- a/PCbuild/pyproject-clangcl.props
+++ b/PCbuild/pyproject-clangcl.props
@@ -46,7 +46,7 @@
Please see GH-131691 for details.
-->
<ExceptionHandling>Async</ExceptionHandling>
- <AdditionalOptions>-Wno-deprecated-non-prototype -Wno-unused-label
-Wno-pointer-sign -Wno-incompatible-pointer-types-discards-qualifiers
-Wno-unused-function %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>-Wno-pointer-sign
-Wno-incompatible-pointer-types-discards-qualifiers -Wno-unused-function
%(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(Platform)' == 'Win32'">-m32
%(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(Platform)' == 'x64'">-m64
%(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="$(Configuration) != 'Debug'">-flto=thin
%(AdditionalOptions)</AdditionalOptions>
diff --git a/Python/ceval.c b/Python/ceval.c
index 75c25ac87c07da..8ab0c6318c1c91 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -891,7 +891,7 @@ extern void _PyUOpPrint(const _PyUOpInstruction *uop);
if computed gotos aren't used. */
/* TBD - what about other compilers? */
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-label"
#elif defined(_MSC_VER) /* MS_WINDOWS */
@@ -1179,7 +1179,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate,
_PyInterpreterFrame *frame, int
# pragma optimize("", on)
#endif
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic pop
#elif defined(_MSC_VER) /* MS_WINDOWS */
# pragma warning(pop)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
