Enable memtag sanitizer in all AArch64 toolchains

momchil-velikov · momchil-velikov · commit 941660299ac6 · 2019-08-13T14:20:23.000Z
That sanitizer does not have runtime library or other dependencies. Differential Revision: https://reviews.llvm.org/D65642 llvm-svn: 368697
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
@@ -923,6 +923,9 @@ SanitizerMask ToolChain::getSupportedSanitizers() const {
   if (getTriple().getArch() == llvm::Triple::x86_64 ||
       getTriple().getArch() == llvm::Triple::aarch64)
     Res |= SanitizerKind::ShadowCallStack;
+  if (getTriple().getArch() == llvm::Triple::aarch64 ||
+      getTriple().getArch() == llvm::Triple::aarch64_be)
+    Res |= SanitizerKind::MemTag;
   return Res;
 }
 
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -1029,8 +1029,6 @@ SanitizerMask Linux::getSupportedSanitizers() const {
     Res |= SanitizerKind::HWAddress;
     Res |= SanitizerKind::KernelHWAddress;
   }
-  if (IsAArch64)
-    Res |= SanitizerKind::MemTag;
   return Res;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -923,6 +923,9 @@ SanitizerMask ToolChain::getSupportedSanitizers() const {`
`923`	`923`	`if (getTriple().getArch() == llvm::Triple::x86_64 \|\|`
`924`	`924`	`getTriple().getArch() == llvm::Triple::aarch64)`
`925`	`925`	`Res \|= SanitizerKind::ShadowCallStack;`
	`926`	`+ if (getTriple().getArch() == llvm::Triple::aarch64 \|\|`
	`927`	`+ getTriple().getArch() == llvm::Triple::aarch64_be)`
	`928`	`+ Res \|= SanitizerKind::MemTag;`
`926`	`929`	`return Res;`
`927`	`930`	`}`
`928`	`931`
Original file line number	Diff line number	Diff line change
`@@ -1029,8 +1029,6 @@ SanitizerMask Linux::getSupportedSanitizers() const {`
`1029`	`1029`	`Res \|= SanitizerKind::HWAddress;`
`1030`	`1030`	`Res \|= SanitizerKind::KernelHWAddress;`
`1031`	`1031`	`}`
`1032`		`- if (IsAArch64)`
`1033`		`- Res \|= SanitizerKind::MemTag;`
`1034`	`1032`	`return Res;`
`1035`	`1033`	`}`
`1036`	`1034`