Index: clang/include/clang/Driver/CLCompatOptions.td
===================================================================
--- clang/include/clang/Driver/CLCompatOptions.td
+++ clang/include/clang/Driver/CLCompatOptions.td
@@ -118,8 +118,6 @@
 def _SLASH_O : CLJoined<"O">,
   HelpText<"Set multiple /O flags at once; e.g. '/O2y-' for '/O2 /Oy-'">,
   MetaVarName<"<flags>">;
-// FIXME: Not sure why we have -O0 here; MSVC doesn't support that.
-def : CLFlag<"O0">, Alias<O0>, HelpText<"Disable optimization">;
 def : CLFlag<"O1">, Alias<_SLASH_O>, AliasArgs<["1"]>,
   HelpText<"Optimize for size  (same as /Og     /Os /Oy /Ob2 /GF /Gy)">;
 def : CLFlag<"O2">, Alias<_SLASH_O>, AliasArgs<["2"]>,
Index: compiler-rt/test/asan/TestCases/Windows/aligned_mallocs.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/aligned_mallocs.cc
+++ compiler-rt/test/asan/TestCases/Windows/aligned_mallocs.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/allocators_sanity.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/allocators_sanity.cc
+++ compiler-rt/test/asan/TestCases/Windows/allocators_sanity.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/beginthreadex.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/beginthreadex.cc
+++ compiler-rt/test/asan/TestCases/Windows/beginthreadex.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/bitfield.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/bitfield.cc
+++ compiler-rt/test/asan/TestCases/Windows/bitfield.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc
+++ compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc
+++ compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/coverage-dll-stdio.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/coverage-dll-stdio.cc
+++ compiler-rt/test/asan/TestCases/Windows/coverage-dll-stdio.cc
@@ -2,8 +2,8 @@
 // __local_stdio_printf_options function isn't instrumented for coverage.
 
 // RUN: rm -rf %t && mkdir %t && cd %t
-// RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -O0 %p/dll_host.cc -Fet.exe
-// RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -LD -O0 %s -Fet.dll
+// RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -Od %p/dll_host.cc -Fet.exe
+// RUN: %clang_cl_asan -fsanitize-coverage=func,trace-pc-guard -LD -Od %s -Fet.dll
 // RUN: %run ./t.exe t.dll 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/crt_initializers.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/crt_initializers.cc
+++ compiler-rt/test/asan/TestCases/Windows/crt_initializers.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t | FileCheck %s
 
 // This is a test for http://code.google.com/p/address-sanitizer/issues/detail?id=305
Index: compiler-rt/test/asan/TestCases/Windows/demangled_names.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/demangled_names.cc
+++ compiler-rt/test/asan/TestCases/Windows/demangled_names.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 //
 // This test makes sure ASan symbolizes stack traces the way they are typically
Index: compiler-rt/test/asan/TestCases/Windows/dll_aligned_mallocs.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_aligned_mallocs.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_aligned_mallocs.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: %run %t %t.dll | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_allocators_sanity.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_allocators_sanity.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_allocators_sanity.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: %run %t %t.dll | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_cerr.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_cerr.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_cerr.cc
@@ -1,9 +1,9 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: %run %t %t.dll 2>&1 | FileCheck %s
 
 // Test that it works correctly even with ICF enabled.
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll -link /OPT:REF /OPT:ICF
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll -link /OPT:REF /OPT:ICF
 // RUN: %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <iostream>
Index: compiler-rt/test/asan/TestCases/Windows/dll_control_c.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_control_c.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_control_c.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
 // RUN: %clang_cl_asan -LD -O2 %s -Fe%t.dll
 // RUNX: %run %t %t.dll 2>&1 | FileCheck %s
 
Index: compiler-rt/test/asan/TestCases/Windows/dll_global_dead_strip.c
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_global_dead_strip.c
+++ compiler-rt/test/asan/TestCases/Windows/dll_global_dead_strip.c
@@ -1,6 +1,6 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
 //
-// RUN: %clang_cl_asan /Gw -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan /Gw -LD -Od %s -Fe%t.dll
 // RUN: %env_asan_opts=report_globals=2 %run %t %t.dll 2>&1 | FileCheck %s --check-prefix=NOSTRIP
 // RUN: %clang_cl_asan /Gw -LD -O2 %s -Fe%t.dll -link -opt:ref
 // RUN: %env_asan_opts=report_globals=2 %run %t %t.dll 2>&1 | FileCheck %s --check-prefix=STRIP
Index: compiler-rt/test/asan/TestCases/Windows/dll_host.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_host.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_host.cc
@@ -2,7 +2,7 @@
 //
 // Just make sure we can compile this.
 // The actual compile&run sequence is to be done by the DLL tests.
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 //
 // Get the list of ASan wrappers exported by the main module RTL:
 // note: The mangling decoration (i.e. @4 )is removed because calling convention
Index: compiler-rt/test/asan/TestCases/Windows/dll_intercept_memchr.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_intercept_memchr.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_intercept_memchr.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 // On windows 64-bit, the memchr function is written in assembly and is not
Index: compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc
@@ -1,9 +1,9 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -Wno-fortify-source -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Wno-fortify-source -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 // Test that it works correctly even with ICF enabled.
-// RUN: %clang_cl_asan -Wno-fortify-source -LD -O0 %s -Fe%t.dll -link /OPT:REF /OPT:ICF
+// RUN: %clang_cl_asan -Wno-fortify-source -LD -Od %s -Fe%t.dll -link /OPT:REF /OPT:ICF
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy_indirect.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_intercept_memset.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_intercept_memset.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_intercept_memset.cc
@@ -1,9 +1,9 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -Wno-fortify-source -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Wno-fortify-source -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 // Test that it works correctly even with ICF enabled.
-// RUN: %clang_cl_asan -Wno-fortify-source -LD -O0 %s -Fe%t.dll -link /OPT:REF /OPT:ICF
+// RUN: %clang_cl_asan -Wno-fortify-source -LD -Od %s -Fe%t.dll -link /OPT:REF /OPT:ICF
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <process.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_null_deref.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_null_deref.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_null_deref.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 __attribute__((noinline))
Index: compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 extern "C" __declspec(dllexport)
Index: compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 struct C {
Index: compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <sanitizer/asan_interface.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_report_globals_symbolization_at_startup.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_report_globals_symbolization_at_startup.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_report_globals_symbolization_at_startup.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -LD -O0 -DDLL %s -Fe%t.dll
-// RUN: %clang_cl_asan -O0 -DEXE %s %t.lib -Fe%te.exe
+// RUN: %clang_cl_asan -LD -Od -DDLL %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od -DEXE %s %t.lib -Fe%te.exe
 // RUN: %env_asan_opts=report_globals=2 %run %te.exe 2>&1 | FileCheck %s
 
 // FIXME: Currently, the MT runtime build crashes on startup due to dbghelp.dll
Index: compiler-rt/test/asan/TestCases/Windows/dll_seh.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_seh.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_seh.cc
@@ -1,10 +1,10 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
 //
 // Check both -GS and -GS- builds:
-// RUN: %clang_cl_asan -GS  -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -GS  -LD -Od %s -Fe%t.dll
 // RUN: %run %t %t.dll
 //
-// RUN: %clang_cl_asan -GS- -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -GS- -LD -Od %s -Fe%t.dll
 // RUN: %run %t %t.dll
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: %env_asan_opts=detect_stack_use_after_return=1 not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
-// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od %p/dll_host.cc -Fe%t
+// RUN: %clang_cl_asan -LD -Od %s -Fe%t.dll
 // RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/double_free.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/double_free.cc
+++ compiler-rt/test/asan/TestCases/Windows/double_free.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc
+++ compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/global_const_string.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/global_const_string.cc
+++ compiler-rt/test/asan/TestCases/Windows/global_const_string.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/heapalloc.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/heapalloc.cc
+++ compiler-rt/test/asan/TestCases/Windows/heapalloc.cc
@@ -1,5 +1,5 @@
 // UNSUPPORTED: asan-64-bits
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %env_asan_opts=windows_hook_rtl_allocators=true not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/heapalloc_doublefree.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/heapalloc_doublefree.cc
+++ compiler-rt/test/asan/TestCases/Windows/heapalloc_doublefree.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %env_asan_opts=windows_hook_rtl_allocators=true not %run %t 2>&1 | FileCheck %s
 // UNSUPPORTED: asan-64-bits
 #include <cassert>
@@ -13,4 +13,4 @@
   return 0;
 }
 
-// CHECK: AddressSanitizer: attempting double-free on [[addr:0x[0-9a-fA-F]+]] in thread T0:
\ No newline at end of file
+// CHECK: AddressSanitizer: attempting double-free on [[addr:0x[0-9a-fA-F]+]] in thread T0:
Index: compiler-rt/test/asan/TestCases/Windows/heapalloc_flags_fallback.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/heapalloc_flags_fallback.cc
+++ compiler-rt/test/asan/TestCases/Windows/heapalloc_flags_fallback.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t 2>&1 | FileCheck %s
 // RUN: %env_asan_opts=windows_hook_rtl_allocators=true %run %t 2>&1 | FileCheck %s
 // UNSUPPORTED: asan-64-bits
Index: compiler-rt/test/asan/TestCases/Windows/heapalloc_huge.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/heapalloc_huge.cc
+++ compiler-rt/test/asan/TestCases/Windows/heapalloc_huge.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %env_asan_opts=allocator_may_return_null=true %run %t
 // RUN: %env_asan_opts=allocator_may_return_null=true:windows_hook_rtl_allocators=true %run %t
 // UNSUPPORTED: asan-64-bits
@@ -6,4 +6,4 @@
 int main() {
   void *nope = HeapAlloc(GetProcessHeap(), 0, ((size_t)0) - 1);
   return (nope == nullptr) ? 0 : 1;
-}
\ No newline at end of file
+}
Index: compiler-rt/test/asan/TestCases/Windows/heapalloc_sanity.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/heapalloc_sanity.cc
+++ compiler-rt/test/asan/TestCases/Windows/heapalloc_sanity.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t 2>&1 | FileCheck %s
 #include <stdio.h>
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/heapalloc_uaf.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/heapalloc_uaf.cc
+++ compiler-rt/test/asan/TestCases/Windows/heapalloc_uaf.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %env_asan_opts=windows_hook_rtl_allocators=true not %run %t 2>&1 | FileCheck %s
 // UNSUPPORTED: asan-64-bits
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/heaprealloc.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/heaprealloc.cc
+++ compiler-rt/test/asan/TestCases/Windows/heaprealloc.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %env_asan_opts=windows_hook_rtl_allocators=true not %run %t 2>&1 | FileCheck %s
 // UNSUPPORTED: asan-64-bits
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/hello_world.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/hello_world.cc
+++ compiler-rt/test/asan/TestCases/Windows/hello_world.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc
+++ compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc
+++ compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc
+++ compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cc
+++ compiler-rt/test/asan/TestCases/Windows/interface_symbols_windows.cc
@@ -2,7 +2,7 @@
 // functions mentioned in sanitizer_interface.inc.
 //
 // Just make sure we can compile this.
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 //
 // note: The mangling decoration (i.e. @4 )is removed because calling convention
 //       differ from 32-bit and 64-bit.
Index: compiler-rt/test/asan/TestCases/Windows/iostream_sbo.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/iostream_sbo.cc
+++ compiler-rt/test/asan/TestCases/Windows/iostream_sbo.cc
@@ -1,9 +1,9 @@
 // First, check this works with the default blacklist:
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: echo "42" | %run %t 2>&1 | FileCheck %s
 //
 // Then, make sure it still works when a user uses his own blacklist file:
-// RUN: %clang_cl_asan -O0 %s -fsanitize-blacklist=%p/../Helpers/initialization-blacklist.txt -Fe%t2
+// RUN: %clang_cl_asan -Od %s -fsanitize-blacklist=%p/../Helpers/initialization-blacklist.txt -Fe%t2
 // RUN: echo "42" | %run %t2 2>&1 | FileCheck %s
 
 #include <iostream>
Index: compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc
+++ compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/null_deref_multiple_dlls.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/null_deref_multiple_dlls.cc
+++ compiler-rt/test/asan/TestCases/Windows/null_deref_multiple_dlls.cc
@@ -2,9 +2,9 @@
 // variables, thus doesn't explicitly reference any symbol exported by the
 // runtime thunk.
 //
-// RUN: %clang_cl_asan -LD -O0 -DDLL1 %s -Fe%t1.dll
-// RUN: %clang_cl_asan -LD -O0 -DDLL2 %s -Fe%t2.dll
-// RUN: %clang_cl_asan -O0 -DEXE %s %t1.lib %t2.lib -Fe%t
+// RUN: %clang_cl_asan -LD -Od -DDLL1 %s -Fe%t1.dll
+// RUN: %clang_cl_asan -LD -Od -DDLL2 %s -Fe%t2.dll
+// RUN: %clang_cl_asan -Od -DEXE %s %t1.lib %t2.lib -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/oom.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/oom.cc
+++ compiler-rt/test/asan/TestCases/Windows/oom.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 // REQUIRES: asan-32-bits
 
Index: compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 int main() {
Index: compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc
+++ compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 struct C {
Index: compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc
+++ compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc
+++ compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/queue_user_work_item_report.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/queue_user_work_item_report.cc
+++ compiler-rt/test/asan/TestCases/Windows/queue_user_work_item_report.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc
+++ compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/report_globals_reload_dll.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/report_globals_reload_dll.cc
+++ compiler-rt/test/asan/TestCases/Windows/report_globals_reload_dll.cc
@@ -1,6 +1,6 @@
 // Make sure we can handle reloading the same DLL multiple times.
-// RUN: %clang_cl_asan -LD -O0 -DDLL %s -Fe%t.dll
-// RUN: %clang_cl_asan -O0 -DEXE %s -Fe%te.exe
+// RUN: %clang_cl_asan -LD -Od -DDLL %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od -DEXE %s -Fe%te.exe
 // RUN: %env_asan_opts=report_globals=1 %run %te.exe %t.dll 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc
+++ compiler-rt/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cc
@@ -1,5 +1,5 @@
-// RUN: %clang_cl_asan -LD -O0 -DDLL %s -Fe%t.dll
-// RUN: %clang_cl_asan -O0 -DEXE %s -Fe%te.exe
+// RUN: %clang_cl_asan -LD -Od -DDLL %s -Fe%t.dll
+// RUN: %clang_cl_asan -Od -DEXE %s -Fe%te.exe
 // RUN: %env_asan_opts=report_globals=2 %run %te.exe %t.dll 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/rtlallocateheap.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/rtlallocateheap.cc
+++ compiler-rt/test/asan/TestCases/Windows/rtlallocateheap.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t /MD
+// RUN: %clang_cl_asan -Od %s -Fe%t /MD
 // RUN: %env_asan_opts=windows_hook_rtl_allocators=true not %run %t 2>&1 | FileCheck %s
 // UNSUPPORTED: asan-64-bits
 // REQUIRES: asan-rtl-heap-interception
Index: compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_flags_fallback.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_flags_fallback.cc
+++ compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_flags_fallback.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t /MD
+// RUN: %clang_cl_asan -Od %s -Fe%t /MD
 // RUN: %env_asan_opts=windows_hook_rtl_allocators=true %run %t 2>&1 | FileCheck %s
 // UNSUPPORTED: asan-64-bits
 // REQUIRES: asan-rtl-heap-interception
Index: compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_zero.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_zero.cc
+++ compiler-rt/test/asan/TestCases/Windows/rtlallocateheap_zero.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t /MD
+// RUN: %clang_cl_asan -Od %s -Fe%t /MD
 // RUN: %env_asan_opts=windows_hook_rtl_allocators=true not %run %t 2>&1 | FileCheck %s
 // UNSUPPORTED: asan-64-bits
 // REQUIRES: asan-rtl-heap-interception
Index: compiler-rt/test/asan/TestCases/Windows/shadow_mapping_failure.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/shadow_mapping_failure.cc
+++ compiler-rt/test/asan/TestCases/Windows/shadow_mapping_failure.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 // REQUIRES: asan-32-bits
 
Index: compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/stack_array_sanity.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/stack_array_sanity.cc
+++ compiler-rt/test/asan/TestCases/Windows/stack_array_sanity.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t | FileCheck %s
 
 #include <stdio.h>
Index: compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc
+++ compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %env_asan_opts=detect_stack_use_after_return=1 not %run %t 2>&1 | FileCheck %s
 
 char *x;
Index: compiler-rt/test/asan/TestCases/Windows/symbols_path.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/symbols_path.cc
+++ compiler-rt/test/asan/TestCases/Windows/symbols_path.cc
@@ -1,6 +1,6 @@
 // Make sure symbolization works even if the path to the .exe file changes.
 // RUN: mkdir %t || true
-// RUN: %clang_cl_asan -O0 %s -Fe%t/symbols_path.exe
+// RUN: %clang_cl_asan -Od %s -Fe%t/symbols_path.exe
 // RUN: not %run %t/symbols_path.exe 2>&1 | FileCheck %s
 // RUN: mkdir %t2 || true
 // RUN: mv %t/* %t2
Index: compiler-rt/test/asan/TestCases/Windows/thread_simple.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/thread_simple.cc
+++ compiler-rt/test/asan/TestCases/Windows/thread_simple.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc
+++ compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/thread_stack_reuse.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/thread_stack_reuse.cc
+++ compiler-rt/test/asan/TestCases/Windows/thread_stack_reuse.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/thread_stress.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/thread_stress.cc
+++ compiler-rt/test/asan/TestCases/Windows/thread_stress.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/thread_suspended.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/thread_suspended.cc
+++ compiler-rt/test/asan/TestCases/Windows/thread_suspended.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t
 
 #include <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc
+++ compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
Index: compiler-rt/test/asan/TestCases/Windows/user-exception.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/user-exception.cc
+++ compiler-rt/test/asan/TestCases/Windows/user-exception.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: env ASAN_OPTIONS=handle_segv=0 %run %t 2>&1 | FileCheck %s --check-prefix=USER
 // RUN: env ASAN_OPTIONS=handle_segv=1 not %run %t 2>&1 | FileCheck %s --check-prefix=ASAN
 // Test the default.
Index: compiler-rt/test/asan/TestCases/Windows/windows_h.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/windows_h.cc
+++ compiler-rt/test/asan/TestCases/Windows/windows_h.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: %run %t
 
 // Just make sure we can parse <windows.h>
Index: compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc
+++ compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 class Parent {
Index: compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc
+++ compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_cl_asan -O0 %s -Fe%t
+// RUN: %clang_cl_asan -Od %s -Fe%t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 class Parent {