Skip to content

Commit 9b91a2d

Browse files
committed
move suppression of "unused label" warning
from global pyproject-clangcl.props to ceval.c
1 parent 044a1e1 commit 9b91a2d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

PCbuild/pyproject-clangcl.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
Please see GH-131691 for details.
4747
-->
4848
<ExceptionHandling>Async</ExceptionHandling>
49-
<AdditionalOptions>-Wno-deprecated-non-prototype -Wno-unused-label -Wno-pointer-sign -Wno-incompatible-pointer-types-discards-qualifiers -Wno-unused-function %(AdditionalOptions)</AdditionalOptions>
49+
<AdditionalOptions>-Wno-pointer-sign -Wno-incompatible-pointer-types-discards-qualifiers -Wno-unused-function %(AdditionalOptions)</AdditionalOptions>
5050
<AdditionalOptions Condition="'$(Platform)' == 'Win32'">-m32 %(AdditionalOptions)</AdditionalOptions>
5151
<AdditionalOptions Condition="'$(Platform)' == 'x64'">-m64 %(AdditionalOptions)</AdditionalOptions>
5252
<AdditionalOptions Condition="$(Configuration) != 'Debug'">-flto=thin %(AdditionalOptions)</AdditionalOptions>

Python/ceval.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ extern void _PyUOpPrint(const _PyUOpInstruction *uop);
898898
if computed gotos aren't used. */
899899

900900
/* TBD - what about other compilers? */
901-
#if defined(__GNUC__)
901+
#if defined(__GNUC__) || defined(__clang__)
902902
# pragma GCC diagnostic push
903903
# pragma GCC diagnostic ignored "-Wunused-label"
904904
#elif defined(_MSC_VER) /* MS_WINDOWS */
@@ -1174,7 +1174,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
11741174
# pragma optimize("", on)
11751175
#endif
11761176

1177-
#if defined(__GNUC__)
1177+
#if defined(__GNUC__) || defined(__clang__)
11781178
# pragma GCC diagnostic pop
11791179
#elif defined(_MSC_VER) /* MS_WINDOWS */
11801180
# pragma warning(pop)

0 commit comments

Comments
 (0)