[compiler-rt] 676eaa2 - [compiler-rt][scudo] Add missing preprocessor token

[Leonard Chan via llvm-commits]

Author: Leonard Chan
Date: 2022-05-24T11:12:30-07:00
New Revision: 676eaa2ca967ca6ad4a84d31d6f0ebabdcf3e44b

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

LOG: [compiler-rt][scudo] Add missing preprocessor token

This should fix build errors seen on bots like
https://lab.llvm.org/buildbot/#/builders/57/builds/18263.

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/memtag.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/memtag.h b/compiler-rt/lib/scudo/standalone/memtag.h
index 13eb4bb8d227..d65e76ad4ffc 100644
--- a/compiler-rt/lib/scudo/standalone/memtag.h
+++ b/compiler-rt/lib/scudo/standalone/memtag.h
@@ -23,8 +23,8 @@ namespace scudo {
 // support for memory tagging if the operating system enables TBI.
 // HWASan uses the top byte for its own purpose and Scudo should not touch it.
 #if (__clang_major__ >= 12 && defined(__aarch64__) && !defined(__ILP32__) &&   \
-     SCUDO_LINUX &&                                                            \
-     !defined(SCUDO_DISABLE_TBI) !__has_feature(hwaddress_sanitizer)) ||       \
+     SCUDO_LINUX && !defined(SCUDO_DISABLE_TBI) &&                             \
+     !__has_feature(hwaddress_sanitizer)) ||                                   \
     defined(SCUDO_FUZZ)
 
 inline constexpr bool archSupportsMemoryTagging() { return true; }