[compiler-rt] 50b9930 - [asan] Fix Windows i386 regression (#73650)

via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 28 10:08:43 PST 2023


Author: Farzon Lotfi
Date: 2023-11-28T20:08:39+02:00
New Revision: 50b9930cfaa145145c13a89ef59b67efc9a772de

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

LOG: [asan] Fix Windows i386 regression (#73650)

This change makes x64 enablement case explicit and
adds an else case for 32bit which fixes a regression
on Windows i386 asan builds introduced
by https://github.com/llvm/llvm-project/pull/66973.

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_platform.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index 49d8a67cc12db3f..5965281555059c5 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -263,9 +263,12 @@
 #if SANITIZER_WINDOWS64 && SANITIZER_ARM64
 #  define SANITIZER_WINDOWS_ARM64 1
 #  define SANITIZER_WINDOWS_x64 0
-#else
+#elif SANITIZER_WINDOWS64 && !SANITIZER_ARM64
 #  define SANITIZER_WINDOWS_ARM64 0
 #  define SANITIZER_WINDOWS_x64 1
+#else
+#  define SANITIZER_WINDOWS_ARM64 0
+#  define SANITIZER_WINDOWS_x64 0
 #endif
 
 #if SANITIZER_SOLARIS && SANITIZER_WORDSIZE == 32


        


More information about the llvm-commits mailing list