[compiler-rt] 6f11750 - Fix -DCOMPILER_RT_HWASAN_WITH_INTERCEPTORS=OFF regression

[Thurston Dang via llvm-commits]

Author: Thurston Dang
Date: 2023-08-16T21:35:19Z
New Revision: 6f11750319719c46771ca32a0c7d8fbed9a24a93

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

LOG: Fix -DCOMPILER_RT_HWASAN_WITH_INTERCEPTORS=OFF regression

This applies the fix as suggested by Gelbpunkt in https://github.com/llvm/llvm-project/issues/64730,

Thanks to Florian Mayer for pointing out that my earlier patch D151262
had caused this regression.

Differential Revision: https://reviews.llvm.org/D158116

Added: 
    

Modified: 
    compiler-rt/lib/hwasan/hwasan_interceptors.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/hwasan/hwasan_interceptors.cpp b/compiler-rt/lib/hwasan/hwasan_interceptors.cpp
index 1a49320b0719e9..92c8ec7cf55f41 100644
--- a/compiler-rt/lib/hwasan/hwasan_interceptors.cpp
+++ b/compiler-rt/lib/hwasan/hwasan_interceptors.cpp
@@ -520,12 +520,12 @@ void InitializeInterceptors() {
   static int inited = 0;
   CHECK_EQ(inited, 0);
 
+#  if HWASAN_WITH_INTERCEPTORS
   InitializeCommonInterceptors();
 
   (void)(read_iovec);
   (void)(write_iovec);
 
-#  if HWASAN_WITH_INTERCEPTORS
 #    if defined(__linux__)
   INTERCEPT_FUNCTION(__libc_longjmp);
   INTERCEPT_FUNCTION(longjmp);