Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-capture.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-capture.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-capture.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -std=c++11 -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -std=c++11 -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 #include <functional>
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-chars.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-chars.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-chars.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 // XFAIL: *
 
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-dtor-order.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-dtor-order.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-dtor-order.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-if.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-if.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-if.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 int *p;
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-inlined.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-inlined.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-inlined.cc
@@ -2,7 +2,7 @@
 // happens. "always_inline" is not enough, as Clang doesn't emit
 // llvm.lifetime intrinsics at -O0.
 //
-// RUN: %clangxx_asan -O2 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O2 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 int *arr;
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop-bug.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop-bug.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop-bug.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 //
 // FIXME: @llvm.lifetime.* are not emitted for x.
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop-removed.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop-removed.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop-removed.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 //
 // FIXME: Compiler removes for-loop but keeps x variable. For unknown reason
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-loop.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 int *p[3];
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-nobug.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-nobug.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-nobug.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && %run %t
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && %run %t
 
 #include <stdio.h>
 #include <stdlib.h>
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope-temp.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope-temp.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope-temp.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 //
 // Lifetime for temporaries is not emitted yet.
Index: compiler-rt/trunk/test/asan/TestCases/use-after-scope.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/use-after-scope.cc
+++ compiler-rt/trunk/test/asan/TestCases/use-after-scope.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O1 -mllvm -asan-use-after-scope=1 %s -o %t && \
+// RUN: %clangxx_asan -O1 -fsanitize-address-use-after-scope %s -o %t && \
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 int *p = 0;