From 57b38a8593bd7d63b9db09676087365d8d3d0d8a Mon Sep 17 00:00:00 2001
From: Hubert Tong <hubert.reinterpretcast@gmail.com>
Date: Fri, 8 Mar 2019 19:57:27 +0000
Subject: [PATCH] [msan] Properly guard tests added by r355348; NFC

r355348 uses builtins without proper guards, breaking the test on
various platforms.

llvm-svn: 355718
---
 compiler-rt/lib/msan/tests/msan_test.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/compiler-rt/lib/msan/tests/msan_test.cc b/compiler-rt/lib/msan/tests/msan_test.cc
index 1d14604..8d5ee78 100644
--- a/compiler-rt/lib/msan/tests/msan_test.cc
+++ b/compiler-rt/lib/msan/tests/msan_test.cc
@@ -4645,15 +4645,12 @@ TEST(MemorySanitizer, MallocUsableSizeTest) {
 }
 #endif  // SANITIZER_TEST_HAS_MALLOC_USABLE_SIZE
 
-static bool HaveBmi() {
 #ifdef __x86_64__
+static bool HaveBmi() {
   U4 a = 0, b = 0, c = 0, d = 0;
   asm("cpuid\n\t" : "=a"(a), "=D"(b), "=c"(c), "=d"(d) : "a"(7));
   const U4 kBmi12Mask = (1U<<3) | (1U<<8);
   return b | kBmi12Mask;
-#else
-  return false;
-#endif
 }
 
 __attribute__((target("bmi,bmi2")))
@@ -4790,3 +4787,4 @@ TEST(MemorySanitizer, Bmi) {
     TestPEXT();
   }
 }
+#endif // defined(__x86_64__)
-- 
2.7.4