Skip to content

Commit a10ab44

Browse files
committed
Fix building error for error: fallthrough annotation in unreachable code
when building on debug mode on loongarch64/arm64/amd64-linux by clang<14. Also delete `#ifndef FALLTHROUGH` block as dotnet#98336 added after dotnet#98712.
1 parent f6f9199 commit a10ab44

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/coreclr/interop/comwrappers.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,9 @@ HRESULT ManagedObjectWrapper::QueryInterface(
736736
return E_NOINTERFACE;
737737

738738
default:
739+
#if !defined(__clang__) || (__clang_major__ > 13) // Workaround bug in old clang
739740
_ASSERTE(false && "Unknown result value");
741+
#endif
740742
FALLTHROUGH;
741743
case TryInvokeICustomQueryInterfaceResult::FailedToInvoke:
742744
// Set the 'lacks' flag since our attempt to use ICustomQueryInterface

src/coreclr/pal/inc/pal.h

-8
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,6 @@ extern bool g_arm64_atomics_present;
184184
#define __has_cpp_attribute(x) (0)
185185
#endif
186186

187-
#ifndef FALLTHROUGH
188-
#if __has_cpp_attribute(fallthrough)
189-
#define FALLTHROUGH [[fallthrough]]
190-
#else // __has_cpp_attribute(fallthrough)
191-
#define FALLTHROUGH
192-
#endif // __has_cpp_attribute(fallthrough)
193-
#endif // FALLTHROUGH
194-
195187
/******************* PAL-Specific Entrypoints *****************************/
196188

197189
#define IsDebuggerPresent PAL_IsDebuggerPresent

0 commit comments

Comments
 (0)