Skip to content

Commit e5f68fd

Browse files
authored
GH-131296: Suppress "unused label" warning for clang-cl closer to actual occurrence (GH-131900)
1 parent 66cdb2b commit e5f68fd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

PCbuild/pyproject-clangcl.props

+1-1
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ extern void _PyUOpPrint(const _PyUOpInstruction *uop);
891891
if computed gotos aren't used. */
892892

893893
/* TBD - what about other compilers? */
894-
#if defined(__GNUC__)
894+
#if defined(__GNUC__) || defined(__clang__)
895895
# pragma GCC diagnostic push
896896
# pragma GCC diagnostic ignored "-Wunused-label"
897897
#elif defined(_MSC_VER) /* MS_WINDOWS */
@@ -1179,7 +1179,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
11791179
# pragma optimize("", on)
11801180
#endif
11811181

1182-
#if defined(__GNUC__)
1182+
#if defined(__GNUC__) || defined(__clang__)
11831183
# pragma GCC diagnostic pop
11841184
#elif defined(_MSC_VER) /* MS_WINDOWS */
11851185
# pragma warning(pop)

0 commit comments

Comments
 (0)