Skip to content

Commit 57b76b4

Browse files
committed
Revert "[Support] Silence function cast warning when building with Clang ToT targetting Windows"
This reverts commit 593f708.
1 parent b4b17d9 commit 57b76b4

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

llvm/lib/Support/Windows/Process.inc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -482,18 +482,9 @@ static RTL_OSVERSIONINFOEXW GetWindowsVer() {
482482
HMODULE hMod = ::GetModuleHandleW(L"ntdll.dll");
483483
assert(hMod);
484484

485-
#if defined(__clang__)
486-
#pragma clang diagnostic push
487-
#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
488-
#endif
489-
490485
auto getVer = (RtlGetVersionPtr)::GetProcAddress(hMod, "RtlGetVersion");
491486
assert(getVer);
492487

493-
#if defined(__clang__)
494-
#pragma clang diagnostic pop
495-
#endif
496-
497488
RTL_OSVERSIONINFOEXW info{};
498489
info.dwOSVersionInfoSize = sizeof(info);
499490
NTSTATUS r = getVer((PRTL_OSVERSIONINFOW)&info);

llvm/lib/Support/Windows/Signals.inc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,6 @@ static bool isDebugHelpInitialized() {
167167
return fStackWalk64 && fSymInitialize && fSymSetOptions && fMiniDumpWriteDump;
168168
}
169169

170-
#if defined(__clang__)
171-
#pragma clang diagnostic push
172-
#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
173-
#endif
174-
175170
static bool load64BitDebugHelp(void) {
176171
HMODULE hLib =
177172
::LoadLibraryExA("Dbghelp.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
@@ -197,10 +192,6 @@ static bool load64BitDebugHelp(void) {
197192
return isDebugHelpInitialized();
198193
}
199194

200-
#if defined(__clang__)
201-
#pragma clang diagnostic pop
202-
#endif
203-
204195
using namespace llvm;
205196

206197
// Forward declare.

0 commit comments

Comments
 (0)