[compiler-rt] c06417b - Fix check-all with -DLLVM_USE_SANITIZER=Address

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2020-07-10T01:47:51-07:00
New Revision: c06417b24dfbfd62650ab05aff78e188b5d00681

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

LOG: Fix check-all with -DLLVM_USE_SANITIZER=Address

Added: 
    

Modified: 
    clang/test/SemaTemplate/stack-exhaustion.cpp
    compiler-rt/cmake/config-ix.cmake
    llvm/test/tools/gold/lit.local.cfg

Removed: 
    


################################################################################
diff  --git a/clang/test/SemaTemplate/stack-exhaustion.cpp b/clang/test/SemaTemplate/stack-exhaustion.cpp
index 1eb1b474ffa5..c7bfea4132d5 100644
--- a/clang/test/SemaTemplate/stack-exhaustion.cpp
+++ b/clang/test/SemaTemplate/stack-exhaustion.cpp
@@ -8,6 +8,9 @@
 // implementation limits, just disable the test.
 // UNSUPPORTED: system-netbsd
 
+// asan has own stack-overflow check.
+// UNSUPPORTED: asan
+
 // expected-warning@* 0-1{{stack nearly exhausted}}
 // expected-note@* 0+{{}}
 

diff  --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
index 1f3697ff6f65..2edc1dabd90d 100644
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -650,7 +650,7 @@ endif()
 
 # TODO: Add builtins support.
 
-if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux")
+if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux" AND NOT LLVM_USE_SANITIZER)
   set(COMPILER_RT_HAS_CRT TRUE)
 else()
   set(COMPILER_RT_HAS_CRT FALSE)

diff  --git a/llvm/test/tools/gold/lit.local.cfg b/llvm/test/tools/gold/lit.local.cfg
index a704bb548b9d..6d2835ac8be6 100644
--- a/llvm/test/tools/gold/lit.local.cfg
+++ b/llvm/test/tools/gold/lit.local.cfg
@@ -1,2 +1,7 @@
-if (not 'ld_plugin' in  config.available_features):
+if (not 'ld_plugin' in config.available_features):
    config.unsupported = True
+
+# gold can't load instrumented plugin.
+for san in ['asan', 'msan', 'ubsan']:
+   if (san in config.available_features):
+      config.unsupported = True