Roll clang 330570:331747.

Bug: 837440
Change-Id: I216c457b53e795d229228e03df8dad42ac78dc07
Reviewed-on: https://chromium-review.googlesource.com/1049654Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557156}

build/config/compiler/BUILD.gn

@@ -480,10 +480,6 @@ config("compiler") {
     # disabling this (https://bugs.llvm.org/show_bug.cgi?id=18538#c13),
     # but for now it looks like our build might rely on it
     # (https://crbug.com/829795).
-    if (is_win) {
-      # TODO(hans): Expose the flag in clang-cl so we don't need -Xclang.
-      cflags += [ "-Xclang" ]
-    }
     cflags += [ "-fmerge-all-constants" ]
   }
 
@@ -496,12 +492,6 @@ config("compiler") {
       "-mllvm",
       "-Xclang",
       "-instcombine-lower-dbg-declare=0",
-
-      # TODO(rnk): Remove this once it's the default. https://crbug.com/793819
-      "-Xclang",
-      "-mllvm",
-      "-Xclang",
-      "-fast-isel-sink-local-values=1",
     ]
   }
 

tools/clang/plugins/ChromeClassTester.cpp

@@ -154,11 +154,7 @@ bool ChromeClassTester::InImplementationFile(SourceLocation record_location) {
       break;
     }
     record_location =
-#if defined(LLVM_FORCE_HEAD_REVISION)
         source_manager.getImmediateExpansionRange(record_location).getBegin();
-#else
-        source_manager.getImmediateExpansionRange(record_location).first;
-#endif
   }
 
   return false;

tools/clang/scripts/update.py

@@ -27,7 +27,7 @@ import zipfile
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION = '330570'
+CLANG_REVISION = '331747'
 
 use_head_revision = bool(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0')
                          in ('1', 'YES'))
@@ -35,7 +35,7 @@ if use_head_revision:
   CLANG_REVISION = 'HEAD'
 
 # This is incremented when pushing a new build of Clang at the same revision.
-CLANG_SUB_REVISION=2
+CLANG_SUB_REVISION=1
 
 PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION)