[compiler-rt] b4b17d9 - Revert "[compiler-rt] Silence function cast warning when building with Clang ToT targetting Windows"

[Alexandre Ganea via llvm-commits]

Author: Alexandre Ganea
Date: 2024-07-06T12:00:28-04:00
New Revision: b4b17d97637bb70976405b7cd4194ee89a60b763

URL: https://github.com/llvm/llvm-project/commit/b4b17d97637bb70976405b7cd4194ee89a60b763
DIFF: https://github.com/llvm/llvm-project/commit/b4b17d97637bb70976405b7cd4194ee89a60b763.diff

LOG: Revert "[compiler-rt] Silence function cast warning when building with Clang ToT targetting Windows"

This reverts commit 10e1b935e5d9017067207d62ababa733df088ecd.

Added: 
    

Modified: 
    compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
    compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp b/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
index 24ea82a8c5dfc..db80eb383885e 100644
--- a/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
@@ -238,11 +238,6 @@ size_t PageSize() {
   return PageSizeCached;
 }
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
-#endif
-
 void SetThreadName(std::thread &thread, const std::string &name) {
   typedef HRESULT(WINAPI * proc)(HANDLE, PCWSTR);
   HMODULE kbase = GetModuleHandleA("KernelBase.dll");
@@ -260,10 +255,6 @@ void SetThreadName(std::thread &thread, const std::string &name) {
   }
 }
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 } // namespace fuzzer
 
 #endif // LIBFUZZER_WINDOWS

diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cpp
index a7ffe0e48fabe..aae3e76ea229f 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cpp
@@ -55,11 +55,6 @@ bool TrySymInitialize() {
 
 }  // namespace
 
-#  if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
-#  endif
-
 // Initializes DbgHelp library, if it's not yet initialized. Calls to this
 // function should be synchronized with respect to other calls to DbgHelp API
 // (e.g. from WinSymbolizerTool).
@@ -138,10 +133,6 @@ void InitializeDbgHelpIfNeeded() {
   }
 }
 
-#  if defined(__clang__)
-#    pragma clang diagnostic pop
-#  endif
-
 bool WinSymbolizerTool::SymbolizePC(uptr addr, SymbolizedStack *frame) {
   InitializeDbgHelpIfNeeded();