Fix GN generation for WinASAN build

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 209 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) {
-      assert(current_cpu == "x86", "WinASan is 32-bit only currently")
-      if (is_component_build) {
-        libs = [
-          "clang_rt.asan_dynamic-i386.lib",
-          "clang_rt.asan_dynamic_runtime_thunk-i386.lib",
-        ]
+      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(rnk): DLLs in the non-component build should link against

[chrisha, 2016/07/28 15:29:57]

TODO(etienneb), given that you're now driving this?

[etienneb, 2016/07/28 16:27:59]

Done.

+          # clang_rt.asan_dll_thunk-x86_64.lib instead.
+          libs = [ "clang_rt.asan-x86_64.lib" ]
+        }
       } else {
-        # TODO(rnk): DLLs in the non-component build should link against
-        # clang_rt.asan_dll_thunk-i386.lib instead.
-        libs = [ "clang_rt.asan-i386.lib" ]
+        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(rnk): DLLs in the non-component build should link against
+          # clang_rt.asan_dll_thunk-i386.lib instead.
+          libs = [ "clang_rt.asan-i386.lib" ]
+        }
       }
     }
   }
 }
 
 config("cfi_flags") {
   cflags = []
   if (is_cfi && !is_nacl) {
     cfi_blacklist_path =
         rebase_path("//tools/cfi/blacklist.txt", root_build_dir)
@@ skipping 182 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" ]
 }