[compiler-rt] fix window i386 regression (PR #73650)

[Farzon Lotfi via llvm-commits]

https://github.com/farzonl updated https://github.com/llvm/llvm-project/pull/73650

>From ee22050679917362cf888b457634fc214fe2992f Mon Sep 17 00:00:00 2001
From: Farzon Lotfi <1802579+farzonl at users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:13:22 -0500
Subject: [PATCH 1/2] fix window i386 regression

This change makes x64 enablement case explicit.
---
 compiler-rt/lib/sanitizer_common/sanitizer_platform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index 49d8a67cc12db3f..e816702ce582e7c 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -263,7 +263,7 @@
 #if SANITIZER_WINDOWS64 && SANITIZER_ARM64
 #  define SANITIZER_WINDOWS_ARM64 1
 #  define SANITIZER_WINDOWS_x64 0
-#else
+#if SANITIZER_WINDOWS64 && !SANITIZER_ARM64
 #  define SANITIZER_WINDOWS_ARM64 0
 #  define SANITIZER_WINDOWS_x64 1
 #endif

>From 840195ff2920d6f4506a1a1ef0e294b4abc35f05 Mon Sep 17 00:00:00 2001
From: Farzon Lotfi <farzon at farzon.com>
Date: Tue, 28 Nov 2023 09:29:24 -0500
Subject: [PATCH 2/2] fix clang-format

---
 .../lib/sanitizer_common/sanitizer_platform.h     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index e816702ce582e7c..95cba272bbd7143 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -260,13 +260,14 @@
 #  define SANITIZER_ARM64 0
 #endif
 
-#if SANITIZER_WINDOWS64 && SANITIZER_ARM64
-#  define SANITIZER_WINDOWS_ARM64 1
-#  define SANITIZER_WINDOWS_x64 0
-#if SANITIZER_WINDOWS64 && !SANITIZER_ARM64
-#  define SANITIZER_WINDOWS_ARM64 0
-#  define SANITIZER_WINDOWS_x64 1
-#endif
+#    if SANITIZER_WINDOWS64 && SANITIZER_ARM64
+#      define SANITIZER_WINDOWS_ARM64 1
+#      define SANITIZER_WINDOWS_x64 0
+#    endif
+#    if SANITIZER_WINDOWS64 && !SANITIZER_ARM64
+#      define SANITIZER_WINDOWS_ARM64 0
+#      define SANITIZER_WINDOWS_x64 1
+#    endif
 
 #if SANITIZER_SOLARIS && SANITIZER_WORDSIZE == 32
 #  define SANITIZER_SOLARIS32 1