[compiler-rt] b3024ac - [sanitizer] Use one #if instead of 3 nested #if after D111185

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2021-10-08T10:31:57-07:00
New Revision: b3024ac084dc73a57b0097c442ba300a0acc1534

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

LOG: [sanitizer] Use one #if instead of 3 nested #if after D111185

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_asm.h b/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
index 203ca8e3f5bc..9ebba91da73f 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_asm.h
@@ -67,13 +67,9 @@
 #define NO_EXEC_STACK_DIRECTIVE
 #endif
 
-#if defined(__x86_64__) || defined(__i386__)
-#if defined(__has_include)
-#if __has_include(<cet.h>)
+#if (defined(__x86_64__) || defined(__i386__)) && defined(__has_include) && __has_include(<cet.h>)
 #include <cet.h>
 #endif
-#endif
 #ifndef _CET_ENDBR
 #define _CET_ENDBR
 #endif
-#endif