Index: compiler-rt/trunk/test/asan/TestCases/alloca_big_alignment.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_big_alignment.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_big_alignment.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 
Index: compiler-rt/trunk/test/asan/TestCases/alloca_detect_custom_size_.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_detect_custom_size_.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_detect_custom_size_.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 
Index: compiler-rt/trunk/test/asan/TestCases/alloca_instruments_all_paddings.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_instruments_all_paddings.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_instruments_all_paddings.cc
@@ -1,5 +1,5 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
-// RUN: %clangxx_asan -O3 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
+// RUN: %clangxx_asan -O3 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: %run %t 2>&1
 //
 
Index: compiler-rt/trunk/test/asan/TestCases/alloca_loop_unpoisoning.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_loop_unpoisoning.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_loop_unpoisoning.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: %run %t 2>&1
 //
 // REQUIRES: stable-runtime
Index: compiler-rt/trunk/test/asan/TestCases/alloca_overflow_partial.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_overflow_partial.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_overflow_partial.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 
Index: compiler-rt/trunk/test/asan/TestCases/alloca_overflow_right.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_overflow_right.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_overflow_right.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 
Index: compiler-rt/trunk/test/asan/TestCases/alloca_safe_access.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_safe_access.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_safe_access.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: %run %t 2>&1
 //
 
Index: compiler-rt/trunk/test/asan/TestCases/alloca_underflow_left.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_underflow_left.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_underflow_left.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 
Index: compiler-rt/trunk/test/asan/TestCases/alloca_vla_interact.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/alloca_vla_interact.cc
+++ compiler-rt/trunk/test/asan/TestCases/alloca_vla_interact.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: %run %t 2>&1
 //
 // REQUIRES: stable-runtime
Index: compiler-rt/trunk/test/asan/TestCases/vla_chrome_testcase.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/vla_chrome_testcase.cc
+++ compiler-rt/trunk/test/asan/TestCases/vla_chrome_testcase.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 
Index: compiler-rt/trunk/test/asan/TestCases/vla_condition_overflow.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/vla_condition_overflow.cc
+++ compiler-rt/trunk/test/asan/TestCases/vla_condition_overflow.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 // REQUIRES: stable-runtime
Index: compiler-rt/trunk/test/asan/TestCases/vla_loop_overfow.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/vla_loop_overfow.cc
+++ compiler-rt/trunk/test/asan/TestCases/vla_loop_overfow.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-allocas %s -o %t
+// RUN: %clangxx_asan -O0 -mllvm -asan-instrument-dynamic-allocas %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 // REQUIRES: stable-runtime