[compiler-rt] r355718 - [msan] Properly guard tests added by r355348; NFC

[Hubert Tong via llvm-commits]

Author: hubert.reinterpretcast
Date: Fri Mar  8 11:57:27 2019
New Revision: 355718

URL: http://llvm.org/viewvc/llvm-project?rev=355718&view=rev
Log:
[msan] Properly guard tests added by r355348; NFC

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

Modified:
    compiler-rt/trunk/lib/msan/tests/msan_test.cc

Modified: compiler-rt/trunk/lib/msan/tests/msan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/tests/msan_test.cc?rev=355718&r1=355717&r2=355718&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/tests/msan_test.cc (original)
+++ compiler-rt/trunk/lib/msan/tests/msan_test.cc Fri Mar  8 11:57:27 2019
@@ -4645,15 +4645,12 @@ TEST(MemorySanitizer, MallocUsableSizeTe
 }
 #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__)