From 9b91a2d00659dcd67ac819228b37782cd90463f7 Mon Sep 17 00:00:00 2001
From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
Date: Sun, 30 Mar 2025 13:38:09 +0200
Subject: [PATCH] move suppression of "unused label" warning
from global pyproject-clangcl.props to ceval.c
---
PCbuild/pyproject-clangcl.props | 2 +-
Python/ceval.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
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.
-->
Async
- -Wno-deprecated-non-prototype -Wno-unused-label -Wno-pointer-sign -Wno-incompatible-pointer-types-discards-qualifiers -Wno-unused-function %(AdditionalOptions)
+ -Wno-pointer-sign -Wno-incompatible-pointer-types-discards-qualifiers -Wno-unused-function %(AdditionalOptions)
-m32 %(AdditionalOptions)
-m64 %(AdditionalOptions)
-flto=thin %(AdditionalOptions)
diff --git a/Python/ceval.c b/Python/ceval.c
index 363f263ad2a083..aa6d4c3cea9369 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -898,7 +898,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 */
@@ -1174,7 +1174,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)