From 77930919add52a89db5ccd1b30dd8be17bf7baef Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Tue, 6 Nov 2012 02:31:42 +0000
Subject: [PATCH] Update compiler-rt tests to match flag renaming/deprecation
 in Clang.

llvm-svn: 167434
---
 compiler-rt/lib/asan/lit_tests/interface_symbols.c   |  2 +-
 compiler-rt/lib/asan/lit_tests/lit.cfg               |  4 ++--
 compiler-rt/lib/asan/lit_tests/sanity_check_pure_c.c |  4 ++--
 compiler-rt/lib/asan/lit_tests/sleep_before_dying.c  |  2 +-
 compiler-rt/lib/asan/lit_tests/strip_path_prefix.c   |  2 +-
 compiler-rt/lib/asan/tests/CMakeLists.txt            |  2 +-
 compiler-rt/lib/tsan/lit_tests/lit.cfg               |  4 ++--
 compiler-rt/lib/tsan/lit_tests/test_output.sh        |  2 +-
 .../lib/ubsan/lit_tests/Float/cast-overflow.cpp      |  2 +-
 .../lib/ubsan/lit_tests/Integer/add-overflow.cpp     |  6 +++---
 .../lib/ubsan/lit_tests/Integer/div-overflow.cpp     |  2 +-
 compiler-rt/lib/ubsan/lit_tests/Integer/div-zero.cpp |  8 ++++----
 .../lib/ubsan/lit_tests/Integer/incdec-overflow.cpp  |  8 ++++----
 .../lib/ubsan/lit_tests/Integer/mul-overflow.cpp     |  2 +-
 .../lib/ubsan/lit_tests/Integer/negate-overflow.cpp  |  2 +-
 compiler-rt/lib/ubsan/lit_tests/Integer/shift.cpp    | 20 ++++++++++----------
 .../lib/ubsan/lit_tests/Integer/sub-overflow.cpp     |  6 +++---
 .../lib/ubsan/lit_tests/Misc/missing_return.cpp      |  2 +-
 compiler-rt/lib/ubsan/lit_tests/Misc/unreachable.cpp |  2 +-
 compiler-rt/lib/ubsan/lit_tests/Misc/vla.c           |  2 +-
 .../lib/ubsan/lit_tests/TypeCheck/misaligned.cpp     |  2 +-
 compiler-rt/lib/ubsan/lit_tests/TypeCheck/null.cpp   |  2 +-
 compiler-rt/lib/ubsan/lit_tests/TypeCheck/vptr.cpp   |  2 +-
 23 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/compiler-rt/lib/asan/lit_tests/interface_symbols.c b/compiler-rt/lib/asan/lit_tests/interface_symbols.c
index 03998d5..5cbceeb 100644
--- a/compiler-rt/lib/asan/lit_tests/interface_symbols.c
+++ b/compiler-rt/lib/asan/lit_tests/interface_symbols.c
@@ -1,6 +1,6 @@
 // Check the presense of interface symbols in compiled file.
 
-// RUN: %clang -faddress-sanitizer -dead_strip -O2 %s -o %t.exe
+// RUN: %clang -fsanitize=address -dead_strip -O2 %s -o %t.exe
 // RUN: nm %t.exe | egrep " [TW] " | sed "s/.* T //" | sed "s/.* W //" \
 // RUN:    | grep "__asan_" | sed "s/___asan_/__asan_/" > %t.symbols
 // RUN: cat %p/../../../include/sanitizer/asan_interface.h \
diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg
index 14ae142a..c98ec26 100644
--- a/compiler-rt/lib/asan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/asan/lit_tests/lit.cfg
@@ -56,10 +56,10 @@ if (not compiler_rt_lit_cfg) or (not os.path.exists(compiler_rt_lit_cfg)):
             % compiler_rt_lit_cfg)
 lit.load_config(config, compiler_rt_lit_cfg)
 
-# Setup default compiler flags used with -faddress-sanitizer option.
+# Setup default compiler flags used with -fsanitize=address option.
 # FIXME: Review the set of required flags and check if it can be reduced.
 clang_asan_cxxflags = ("-ccc-cxx "
-                      + "-faddress-sanitizer "
+                      + "-fsanitize=address "
                       + "-mno-omit-leaf-frame-pointer "
                       + "-fno-omit-frame-pointer "
                       + "-fno-optimize-sibling-calls "
diff --git a/compiler-rt/lib/asan/lit_tests/sanity_check_pure_c.c b/compiler-rt/lib/asan/lit_tests/sanity_check_pure_c.c
index b0bd1f0..2b5090b 100644
--- a/compiler-rt/lib/asan/lit_tests/sanity_check_pure_c.c
+++ b/compiler-rt/lib/asan/lit_tests/sanity_check_pure_c.c
@@ -1,9 +1,9 @@
 // Sanity checking a test in pure C.
-// RUN: %clang -g -faddress-sanitizer -O2 %s -o %t
+// RUN: %clang -g -fsanitize=address -O2 %s -o %t
 // RUN: %t 2>&1 | %symbolize | FileCheck %s
 
 // Sanity checking a test in pure C with -pie.
-// RUN: %clang -g -faddress-sanitizer -O2 %s -pie -o %t
+// RUN: %clang -g -fsanitize=address -O2 %s -pie -o %t
 // RUN: %t 2>&1 | %symbolize | FileCheck %s
 
 #include <stdlib.h>
diff --git a/compiler-rt/lib/asan/lit_tests/sleep_before_dying.c b/compiler-rt/lib/asan/lit_tests/sleep_before_dying.c
index 5fcb863..df9eba2 100644
--- a/compiler-rt/lib/asan/lit_tests/sleep_before_dying.c
+++ b/compiler-rt/lib/asan/lit_tests/sleep_before_dying.c
@@ -1,4 +1,4 @@
-// RUN: %clang -g -faddress-sanitizer -O2 %s -o %t
+// RUN: %clang -g -fsanitize=address -O2 %s -o %t
 // RUN: ASAN_OPTIONS="sleep_before_dying=1" %t 2>&1 | FileCheck %s
 
 #include <stdlib.h>
diff --git a/compiler-rt/lib/asan/lit_tests/strip_path_prefix.c b/compiler-rt/lib/asan/lit_tests/strip_path_prefix.c
index 01c3b70..ef7bf98 100644
--- a/compiler-rt/lib/asan/lit_tests/strip_path_prefix.c
+++ b/compiler-rt/lib/asan/lit_tests/strip_path_prefix.c
@@ -1,4 +1,4 @@
-// RUN: %clang -g -faddress-sanitizer -O2 %s -o %t
+// RUN: %clang -g -fsanitize=address -O2 %s -o %t
 // RUN: ASAN_OPTIONS="strip_path_prefix='/'" %t 2>&1 | FileCheck %s
 
 #include <stdlib.h>
diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt
index af69579..8195962 100644
--- a/compiler-rt/lib/asan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/asan/tests/CMakeLists.txt
@@ -66,7 +66,7 @@ set(ASAN_BLACKLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore")
 set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS
   ${ASAN_UNITTEST_COMMON_CFLAGS}
   ${ASAN_GTEST_INCLUDE_CFLAGS}
-  -faddress-sanitizer
+  -fsanitize=address
   -mllvm "-asan-blacklist=${ASAN_BLACKLIST_FILE}"
   -mllvm -asan-stack=1
   -mllvm -asan-globals=1
diff --git a/compiler-rt/lib/tsan/lit_tests/lit.cfg b/compiler-rt/lib/tsan/lit_tests/lit.cfg
index acfc744..3a29edc 100644
--- a/compiler-rt/lib/tsan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/tsan/lit_tests/lit.cfg
@@ -59,9 +59,9 @@ lit.load_config(config, compiler_rt_lit_cfg)
 # Setup environment variables for running ThreadSanitizer.
 config.environment['TSAN_OPTIONS'] = "atexit_sleep_ms=0"
 
-# Setup default compiler flags used with -faddress-sanitizer option.
+# Setup default compiler flags used with -fsanitize=thread option.
 # FIXME: Review the set of required flags and check if it can be reduced.
-clang_tsan_cflags = ("-fthread-sanitizer "
+clang_tsan_cflags = ("-fsanitize=thread "
                       + "-fPIE "
                       + "-fno-builtin "
                       + "-g "
diff --git a/compiler-rt/lib/tsan/lit_tests/test_output.sh b/compiler-rt/lib/tsan/lit_tests/test_output.sh
index bd8573e..3798ff0 100755
--- a/compiler-rt/lib/tsan/lit_tests/test_output.sh
+++ b/compiler-rt/lib/tsan/lit_tests/test_output.sh
@@ -10,7 +10,7 @@ CC=clang
 CXX=clang++
 
 # TODO: add testing for all of -O0...-O3
-CFLAGS="-fthread-sanitizer -fPIE -O1 -g -fno-builtin -Wall"
+CFLAGS="-fsanitize=thread -fPIE -O1 -g -fno-builtin -Wall"
 LDFLAGS="-pie -lpthread -ldl $ROOTDIR/rtl/libtsan.a"
 
 test_file() {
diff --git a/compiler-rt/lib/ubsan/lit_tests/Float/cast-overflow.cpp b/compiler-rt/lib/ubsan/lit_tests/Float/cast-overflow.cpp
index d04f38c..b9c5d38 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Float/cast-overflow.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Float/cast-overflow.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -o %t
+// RUN: %clang -fsanitize=float-cast-overflow %s -o %t
 // RUN: %t _
 // RUN: %t 0 2>&1 | FileCheck %s --check-prefix=CHECK-0
 // RUN: %t 1 2>&1 | FileCheck %s --check-prefix=CHECK-1
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/add-overflow.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/add-overflow.cpp
index 781ccf3..1b0a6d9 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Integer/add-overflow.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Integer/add-overflow.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang -DADD_I32 -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=ADD_I32
-// RUN: %clang -DADD_I64 -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=ADD_I64
-// RUN: %clang -DADD_I128 -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=ADD_I128
+// RUN: %clang -DADD_I32 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=ADD_I32
+// RUN: %clang -DADD_I64 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=ADD_I64
+// RUN: %clang -DADD_I128 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=ADD_I128
 
 #include <stdint.h>
 
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/div-overflow.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/div-overflow.cpp
index fb0e7d1..43205fd 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Integer/div-overflow.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Integer/div-overflow.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s
 
 #include <stdint.h>
 
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/div-zero.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/div-zero.cpp
index 0c1c3f8..7d71711 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Integer/div-zero.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Integer/div-zero.cpp
@@ -1,7 +1,7 @@
-// RUN: %clang -fcatch-undefined-behavior -DDIVIDEND=0 %s -o %t && %t 2>&1 | FileCheck %s
-// RUN: %clang -fcatch-undefined-behavior -DDIVIDEND=1U %s -o %t && %t 2>&1 | FileCheck %s
-// RUN: %clang -fcatch-undefined-behavior -DDIVIDEND=1.5 %s -o %t && %t 2>&1 | FileCheck %s
-// RUN: %clang -fcatch-undefined-behavior -DDIVIDEND='__int128(123)' %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=divide-by-zero -DDIVIDEND=0 %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=divide-by-zero -DDIVIDEND=1U %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=divide-by-zero -DDIVIDEND=1.5 %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=divide-by-zero -DDIVIDEND='__int128(123)' %s -o %t && %t 2>&1 | FileCheck %s
 
 int main() {
   // CHECK: div-zero.cpp:8:12: fatal error: division by zero
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/incdec-overflow.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/incdec-overflow.cpp
index 8c8800b..28ee9fb 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Integer/incdec-overflow.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Integer/incdec-overflow.cpp
@@ -1,7 +1,7 @@
-// RUN: %clang -DOP=n++ -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s
-// RUN: %clang -DOP=++n -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s
-// RUN: %clang -DOP=m-- -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s
-// RUN: %clang -DOP=--m -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -DOP=n++ -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -DOP=++n -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -DOP=m-- -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -DOP=--m -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s
 
 #include <stdint.h>
 
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/mul-overflow.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/mul-overflow.cpp
index 1ba968d..ef5c004 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Integer/mul-overflow.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Integer/mul-overflow.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s
 
 #include <stdint.h>
 
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp
index 58f1b48..9a97fad 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s
 
 int main() {
   -unsigned(-0x7fffffff - 1); // ok
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/shift.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/shift.cpp
index 33a1531..8c06a82 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Integer/shift.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Integer/shift.cpp
@@ -1,13 +1,13 @@
-// RUN: %clang -DLSH_OVERFLOW -DOP='<<' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=LSH_OVERFLOW
-// RUN: %clang -DLSH_OVERFLOW -DOP='<<=' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=LSH_OVERFLOW
-// RUN: %clang -DTOO_LOW -DOP='<<' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_LOW
-// RUN: %clang -DTOO_LOW -DOP='>>' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_LOW
-// RUN: %clang -DTOO_LOW -DOP='<<=' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_LOW
-// RUN: %clang -DTOO_LOW -DOP='>>=' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_LOW
-// RUN: %clang -DTOO_HIGH -DOP='<<' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_HIGH
-// RUN: %clang -DTOO_HIGH -DOP='>>' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_HIGH
-// RUN: %clang -DTOO_HIGH -DOP='<<=' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_HIGH
-// RUN: %clang -DTOO_HIGH -DOP='>>=' -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_HIGH
+// RUN: %clang -DLSH_OVERFLOW -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=LSH_OVERFLOW
+// RUN: %clang -DLSH_OVERFLOW -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=LSH_OVERFLOW
+// RUN: %clang -DTOO_LOW -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_LOW
+// RUN: %clang -DTOO_LOW -DOP='>>' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_LOW
+// RUN: %clang -DTOO_LOW -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_LOW
+// RUN: %clang -DTOO_LOW -DOP='>>=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_LOW
+// RUN: %clang -DTOO_HIGH -DOP='<<' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_HIGH
+// RUN: %clang -DTOO_HIGH -DOP='>>' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_HIGH
+// RUN: %clang -DTOO_HIGH -DOP='<<=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_HIGH
+// RUN: %clang -DTOO_HIGH -DOP='>>=' -fsanitize=shift %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=TOO_HIGH
 
 #include <stdint.h>
 
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/sub-overflow.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/sub-overflow.cpp
index 71925c9..38fc7b0 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Integer/sub-overflow.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Integer/sub-overflow.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang -DSUB_I32 -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=SUB_I32
-// RUN: %clang -DSUB_I64 -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=SUB_I64
-// RUN: %clang -DSUB_I128 -fcatch-undefined-behavior %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=SUB_I128
+// RUN: %clang -DSUB_I32 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=SUB_I32
+// RUN: %clang -DSUB_I64 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=SUB_I64
+// RUN: %clang -DSUB_I128 -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=SUB_I128
 
 #include <stdint.h>
 
diff --git a/compiler-rt/lib/ubsan/lit_tests/Misc/missing_return.cpp b/compiler-rt/lib/ubsan/lit_tests/Misc/missing_return.cpp
index 73febea..820448c 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Misc/missing_return.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Misc/missing_return.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -O3 -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=return %s -O3 -o %t && %t 2>&1 | FileCheck %s
 
 // CHECK: missing_return.cpp:4:5: fatal error: execution reached the end of a value-returning function without returning a value
 int f() {
diff --git a/compiler-rt/lib/ubsan/lit_tests/Misc/unreachable.cpp b/compiler-rt/lib/ubsan/lit_tests/Misc/unreachable.cpp
index ded1de6..6e0a03d 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Misc/unreachable.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/Misc/unreachable.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -O3 -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clang -fsanitize=unreachable %s -O3 -o %t && %t 2>&1 | FileCheck %s
 
 int main(int, char **argv) {
   // CHECK: unreachable.cpp:5:3: fatal error: execution reached a __builtin_unreachable() call
diff --git a/compiler-rt/lib/ubsan/lit_tests/Misc/vla.c b/compiler-rt/lib/ubsan/lit_tests/Misc/vla.c
index 4137e80..c7600e3 100644
--- a/compiler-rt/lib/ubsan/lit_tests/Misc/vla.c
+++ b/compiler-rt/lib/ubsan/lit_tests/Misc/vla.c
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -O3 -o %t
+// RUN: %clang -fsanitize=vla-bound %s -O3 -o %t
 // RUN: %t 2>&1 | FileCheck %s --check-prefix=CHECK-MINUS-ONE
 // RUN: %t a 2>&1 | FileCheck %s --check-prefix=CHECK-ZERO
 // RUN: %t a b
diff --git a/compiler-rt/lib/ubsan/lit_tests/TypeCheck/misaligned.cpp b/compiler-rt/lib/ubsan/lit_tests/TypeCheck/misaligned.cpp
index acc73e0..817781b 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TypeCheck/misaligned.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/TypeCheck/misaligned.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -O3 -o %t
+// RUN: %clang -fsanitize=alignment %s -O3 -o %t
 // RUN: %t l0 && %t s0 && %t r0 && %t m0 && %t f0
 // RUN: %t l1 2>&1 | FileCheck %s --check-prefix=CHECK-LOAD
 // RUN: %t s1 2>&1 | FileCheck %s --check-prefix=CHECK-STORE
diff --git a/compiler-rt/lib/ubsan/lit_tests/TypeCheck/null.cpp b/compiler-rt/lib/ubsan/lit_tests/TypeCheck/null.cpp
index 8e17388..ae92493 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TypeCheck/null.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/TypeCheck/null.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -fcatch-undefined-behavior %s -O3 -o %t
+// RUN: %clang -fsanitize=null %s -O3 -o %t
 // RUN: %t l 2>&1 | FileCheck %s --check-prefix=CHECK-LOAD
 // RUN: %t s 2>&1 | FileCheck %s --check-prefix=CHECK-STORE
 // RUN: %t r 2>&1 | FileCheck %s --check-prefix=CHECK-REFERENCE
diff --git a/compiler-rt/lib/ubsan/lit_tests/TypeCheck/vptr.cpp b/compiler-rt/lib/ubsan/lit_tests/TypeCheck/vptr.cpp
index c8e2820..e9fffd5 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TypeCheck/vptr.cpp
+++ b/compiler-rt/lib/ubsan/lit_tests/TypeCheck/vptr.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -ccc-cxx -fcatch-undefined-behavior %s -O3 -o %t
+// RUN: %clang -ccc-cxx -fsanitize=vptr %s -O3 -o %t
 // RUN: %t rT && %t mT && %t fT
 // RUN: %t rU && %t mU && %t fU
 // RUN: %t rS 2>&1 | FileCheck %s --check-prefix=CHECK-REFERENCE
-- 
2.7.4