Update revert-3dae5eedd73370bad5183b5903cd0e186702fff8.patch (#45)

* Update revert-3dae5eedd73370bad5183b5903cd0e186702fff8.patch

* Update revert-3dae5eedd73370bad5183b5903cd0e186702fff8.patch

* Update revert-3dae5eedd73370bad5183b5903cd0e186702fff8.patch

Author: Zentrik

llvm-patches/revert-3dae5eedd73370bad5183b5903cd0e186702fff8.patch

@@ -1,75 +1,13 @@
-From 3dae5eedd73370bad5183b5903cd0e186702fff8 Mon Sep 17 00:00:00 2001
-From: Zentrik <[email protected]>
-Date: Fri, 18 Oct 2024 13:31:34 +0100
-Subject: [PATCH] Revert "[fuzzer] fix clang-cl build fuzzer lit test failure
- (#112339)"
-
-This reverts commit d54953ef472bfd8d4b503aae7682aa76c49f8cc0.
----
- .../lib/fuzzer/FuzzerExtFunctionsWindows.cpp  | 28 +++++++++----------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
 diff --git a/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWindows.cpp b/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWindows.cpp
-index dfc32ac9db2979..688bad1d51ca5b 100644
+index dfc32ac9db29..7d0c7573f2e0 100644
 --- a/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWindows.cpp
 +++ b/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWindows.cpp
-@@ -22,11 +22,6 @@ using namespace fuzzer;
- #define STRINGIFY(A) STRINGIFY_(A)
- 
+@@ -24,7 +24,7 @@ using namespace fuzzer;
  #if LIBFUZZER_MSVC
--#define GET_FUNCTION_ADDRESS(fn) &fn
--#else
+ #define GET_FUNCTION_ADDRESS(fn) &fn
+ #else
 -#define GET_FUNCTION_ADDRESS(fn) __builtin_function_start(fn)
--#endif // LIBFUZER_MSVC
--
- // Copied from compiler-rt/lib/sanitizer_common/sanitizer_win_defs.h
- #if defined(_M_IX86) || defined(__i386__)
- #define WIN_SYM_PREFIX "_"
-@@ -36,9 +31,17 @@ using namespace fuzzer;
- 
- // Declare external functions as having alternativenames, so that we can
- // determine if they are not defined.
--#define EXTERNAL_FUNC(Name, Default)                                           \
--  __pragma(comment(linker, "/alternatename:" WIN_SYM_PREFIX STRINGIFY(         \
-+#define EXTERNAL_FUNC(Name, Default)                                   \
-+  __pragma(comment(linker, "/alternatename:" WIN_SYM_PREFIX STRINGIFY( \
-                                Name) "=" WIN_SYM_PREFIX STRINGIFY(Default)))
-+#else
-+// Declare external functions as weak to allow them to default to a specified
-+// function if not defined explicitly. We must use weak symbols because clang's
-+// support for alternatename is not 100%, see
-+// https://bugs.llvm.org/show_bug.cgi?id=40218 for more details.
-+#define EXTERNAL_FUNC(Name, Default) \
-+  __attribute__((weak, alias(STRINGIFY(Default))))
-+#endif  // LIBFUZZER_MSVC
- 
- extern "C" {
- #define EXT_FUNC(NAME, RETURN_TYPE, FUNC_SIG, WARN)         \
-@@ -54,23 +57,20 @@ extern "C" {
- }
- 
- template <typename T>
--static T *GetFnPtr(void *Fun, void *FunDef, const char *FnName,
--                   bool WarnIfMissing) {
-+static T *GetFnPtr(T *Fun, T *FunDef, const char *FnName, bool WarnIfMissing) {
-   if (Fun == FunDef) {
-     if (WarnIfMissing)
-       Printf("WARNING: Failed to find function \"%s\".\n", FnName);
-     return nullptr;
-   }
--  return (T *)Fun;
-+  return Fun;
- }
- 
- namespace fuzzer {
- 
- ExternalFunctions::ExternalFunctions() {
--#define EXT_FUNC(NAME, RETURN_TYPE, FUNC_SIG, WARN)                            \
--  this->NAME = GetFnPtr<decltype(::NAME)>(GET_FUNCTION_ADDRESS(::NAME),        \
--                                          GET_FUNCTION_ADDRESS(::NAME##Def),   \
--                                          #NAME, WARN);
-+#define EXT_FUNC(NAME, RETURN_TYPE, FUNC_SIG, WARN) \
-+  this->NAME = GetFnPtr<decltype(::NAME)>(::NAME, ::NAME##Def, #NAME, WARN);
- 
- #include "FuzzerExtFunctions.def"
++#define GET_FUNCTION_ADDRESS(fn) (void *)fn
+ #endif // LIBFUZER_MSVC
 
+ // Copied from compiler-rt/lib/sanitizer_common/sanitizer_win_defs.h