From 0fa9d4fad367939eb0ac68b86914c6d86339da3c Mon Sep 17 00:00:00 2001
From: thakis <thakis@chromium.org>
Date: Mon, 27 Jul 2015 12:43:46 -0700
Subject: [PATCH] clang/win/asan: Remove /fallback and enable
 warnings-as-errors.

This removes the last case where we still needed /fallback.

BUG=82385

Review URL: https://codereview.chromium.org/1259813002

Cr-Commit-Position: refs/heads/master@{#340533}
---
 build/common.gypi              |  9 ---------
 build/config/compiler/BUILD.gn | 12 +++---------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/build/common.gypi b/build/common.gypi
index 038c11d89e79..24368fb3e9f2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5743,15 +5743,6 @@
                 ],
               },
             }],
-            ['clang==1 and target_arch=="ia32" and asan==1', {
-              # TODO(thakis): Remove this block once llvm.org/PR24167 is fixed.
-              'VCCLCompilerTool': {
-                'WarnAsError': 'false',
-                'AdditionalOptions': [
-                  '/fallback',
-                ],
-              },
-            }],
             ['clang==1 and clang_use_chrome_plugins==1', {
               'VCCLCompilerTool': {
                 'AdditionalOptions': [
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index af14840f414e..4cc958c8ac43 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -130,10 +130,6 @@ config("compiler") {
         cflags += [ "-m64" ]
       }
 
-      # TODO(thakis): Remove this once llvm.org/PR24167 is fixed.
-      if (is_asan) {
-        cflags += [ "/fallback" ]
-      }
       if (exec_script("//build/win/use_ansi_codes.py", [], "trim string") ==
           "True") {
         cflags += [
@@ -715,12 +711,10 @@ config("runtime_library") {
 default_warning_flags = []
 default_warning_flags_cc = []
 if (is_win) {
-  # TODO(thakis): Make this unconditional once llvm.org/PR24167 is fixed.
-  if (!is_clang || !is_asan) {
-    default_warning_flags += [ "/WX" ]  # Treat warnings as errors.
-  }
-
   default_warning_flags += [
+    # Treat warnings as errors.
+    "/WX",
+
     # Warnings permanently disabled:
 
     # TODO(GYP) The GYP build doesn't have this globally enabled but disabled
-- 
2.11.4.GIT