Make Win Clang ASan builds work

build/config/sanitizers/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/clang/clang.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 
@@ skipping 116 matching lines @@
 
   if (is_lsan) {
     sources += [ "//build/sanitizers/lsan_suppressions.cc" ]
   }
 
   if (is_tsan) {
     sources += [ "//build/sanitizers/tsan_suppressions.cc" ]
   }
 }
 
+config("executable_config") {
+  if (is_win && is_asan) {
+    if (current_cpu == "x64") {
+      libs = [ "clang_rt.asan_dynamic-x86_64.lib" ]
+    } else {
+      libs = [ "clang_rt.asan_dynamic-i386.lib" ]
+    }
+  }
+}
+
 # Applies linker flags necessary when either :deps or :default_sanitizer_flags
 # are used.
 config("default_sanitizer_ldflags") {
   visibility = [
     ":default_sanitizer_flags",
     ":deps",
   ]
 
   if (is_posix) {
     ldflags = []
@@ skipping 84 matching lines @@
                   rebase_path("//tools/memory/asan/blacklist_win.txt",
                               root_build_dir) ]
     } else {
       # TODO(rnk): Remove this as discussed in http://crbug.com/427202.
       cflags +=
           [ "-fsanitize-blacklist=" +
             rebase_path("//tools/memory/asan/blacklist.txt", root_build_dir) ]
     }
 
     if (is_win) {
-      if (target_cpu == "x64") {
+      if (current_cpu == "x64") {
         # Windows 64-bit.
         if (is_component_build) {
           libs = [
             "clang_rt.asan_dynamic-x86_64.lib",
             "clang_rt.asan_dynamic_runtime_thunk-x86_64.lib",
           ]
         } else {
-          # TODO(etienneb): DLLs in the non-component build should link against
-          # clang_rt.asan_dll_thunk-x86_64.lib instead.
-          libs = [ "clang_rt.asan-x86_64.lib" ]
+          libs = [ "clang_rt.asan_dynamic_runtime_thunk-x86_64.lib" ]

[Nico, 2016/08/02 14:20:51]

Why is this needed here at all now that the other config exists? Shouldn't you
have

 137 config("executable_config") {
 138   if (is_win && is_asan) {
 139     if (current_cpu == "x64") {
           if (is_component_build) {
             libs = [ "clang_rt.asan_dynamic-x86_64.lib",
                       "clang_rt.asan_dynamic_runtime_thunk-x86_64.lib",
             ]
           else {
 140         libs = [ "clang_rt.asan-x86_64.lib" ]
           }
 141     } else {
 142       # same for 32 bit
 143     }
 144   }
 145 }

and

 137 config("shared_library_config") {
 138   if (is_win && is_asan) {
 139     if (current_cpu == "x64") {
           if (is_component_build) {
             libs = [ "clang_rt.asan_dynamic-x86_64.lib",
                       "clang_rt.asan_dynamic_runtime_thunk-x86_64.lib",
             ]
           else {
 140         libs = [ "clang_rt.asan_dynamic-x86_64.lib" ]
           }
 141     } else {
 142       # same for 32 bit
 143     }
 144   }
 145 }

[Dirk Pranke, 2016/08/02 17:19:03]

Yes, I think you're right.

         }
       } else {
-        assert(target_cpu == "x86", "WinASan unsupported architecture")
+        assert(current_cpu == "x86", "WinASan unsupported architecture")
         if (is_component_build) {
           libs = [
             "clang_rt.asan_dynamic-i386.lib",
             "clang_rt.asan_dynamic_runtime_thunk-i386.lib",
           ]
         } else {
-          # TODO(etienneb): DLLs in the non-component build should link against
-          # clang_rt.asan_dll_thunk-i386.lib instead.
-          libs = [ "clang_rt.asan-i386.lib" ]
+          libs = [ "clang_rt.asan_dynamic_runtime_thunk-i386.lib" ]
         }
       }
     }
   }
 }
 
 config("cfi_flags") {
   cflags = []
   if (is_cfi && !is_nacl) {
     cfi_blacklist_path =
@@ skipping 183 matching lines @@
 # This allows to selectively disable ubsan_vptr, when needed. In particular,
 # if some third_party code is required to be compiled without rtti, which
 # is a requirement for ubsan_vptr.
 config("default_sanitizer_flags_but_ubsan_vptr") {
   configs = all_sanitizer_configs - [ ":ubsan_vptr_flags" ]
 }
 
 config("default_sanitizer_flags_but_coverage") {
   configs = all_sanitizer_configs - [ ":coverage_flags" ]
 }