4 files changed, 12 insertions, 2 deletions
diff --git a/clang/test/Index/annotate-deep-statements.cpp b/clang/test/Index/annotate-deep-statements.cpp
index c0a55f25e49..1803c2bacf5 100644
--- a/clang/test/Index/annotate-deep-statements.cpp
+++ b/clang/test/Index/annotate-deep-statements.cpp
@@ -3,8 +3,8 @@
 // rdar://11979525
 // Check that we don't get stack overflow trying to annotate an extremely deep AST.
 
-// AddressSanitizer increases stack usage.
-// REQUIRES: not_asan
+// AddressSanitizer and UndefinedBehaviorSanitizer increases stack usage.
+// REQUIRES: not_asan, not_ubsan
 
 struct S {
   S &operator()();
diff --git a/clang/test/Index/index-many-call-ops.cpp b/clang/test/Index/index-many-call-ops.cpp
index e732b5f188a..7644697d4e7 100644
--- a/clang/test/Index/index-many-call-ops.cpp
+++ b/clang/test/Index/index-many-call-ops.cpp
@@ -4,6 +4,9 @@
 // Check that we don't get stack overflow trying to index a huge number of
 // call operators.
 
+// UBSan increses stack usage.
+// REQUIRES: not_ubsan
+
 struct S {
   S &operator()();
 };
diff --git a/clang/test/Index/index-many-logical-ops.c b/clang/test/Index/index-many-logical-ops.c
index 67017decb77..0fd4e75236f 100644
--- a/clang/test/Index/index-many-logical-ops.c
+++ b/clang/test/Index/index-many-logical-ops.c
@@ -4,6 +4,9 @@
 // Check that we don't get stack overflow trying to index a huge number of
 // logical operators.
 
+// UBSan increses stack usage.
+// REQUIRES: not_ubsan
+
 // CHECK: [indexDeclaration]: kind: function | name: foo
 int foo(int x) {
   return
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index 2d946c5a65d..64570d763a3 100644
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg
@@ -450,6 +450,10 @@ else:
 if (config.llvm_use_sanitizer == "Memory" or
         config.llvm_use_sanitizer == "MemoryWithOrigins"):
     config.available_features.add("msan")
+if config.llvm_use_sanitizer == "Undefined":
+    config.available_features.add("ubsan")
+else:
+    config.available_features.add("not_ubsan")
 
 # Check if we should run long running tests.
 if lit_config.params.get("run_long_tests", None) == "true":