Clang update.sh: add support for LLVM_FORCE_HEAD_REVISION

tools/clang/scripts/update.sh

 #!/usr/bin/env bash
 # Copyright (c) 2012 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.
 
 # This script will check out llvm and clang into third_party/llvm and build it.
 
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
@@ skipping 13 matching lines @@
 STAMP_FILE="${LLVM_DIR}/../llvm-build/cr_build_revision"
 CHROMIUM_TOOLS_DIR="${THIS_DIR}/.."
 
 ABS_CHROMIUM_TOOLS_DIR="${PWD}/${CHROMIUM_TOOLS_DIR}"
 ABS_LIBCXX_DIR="${PWD}/${LIBCXX_DIR}"
 ABS_LIBCXXABI_DIR="${PWD}/${LIBCXXABI_DIR}"
 ABS_LLVM_DIR="${PWD}/${LLVM_DIR}"
 ABS_LLVM_BUILD_DIR="${PWD}/${LLVM_BUILD_DIR}"
 ABS_COMPILER_RT_DIR="${PWD}/${COMPILER_RT_DIR}"
 
-
-# Use both the clang revision and the plugin revisions to test for updates.
-BLINKGCPLUGIN_REVISION=\
-$(grep 'set(LIBRARYNAME' "$THIS_DIR"/../blink_gc_plugin/CMakeLists.txt \
-    | cut -d ' ' -f 2 | tr -cd '[0-9]')
-CLANG_AND_PLUGINS_REVISION="${CLANG_REVISION}-${BLINKGCPLUGIN_REVISION}"
-
 # ${A:-a} returns $A if it's set, a else.
 LLVM_REPO_URL=${LLVM_URL:-https://llvm.org/svn/llvm-project}
 
 if [[ -z "$GYP_DEFINES" ]]; then
   GYP_DEFINES=
 fi
 if [[ -z "$GYP_GENERATORS" ]]; then
   GYP_GENERATORS=
 fi
 
 
 # Die if any command dies, error on undefined variable expansions.
 set -eu
 
+
+if [[ -n ${LLVM_FORCE_HEAD_REVISION:-''} ]]; then
+  # Use a real version number rather than HEAD to make sure that
+  # --print-revision, stamp file logic, etc. all works naturally.
+  CLANG_REVISION=$(svn info "$LLVM_REPO_URL" \
+      | grep 'Last Changed Rev' | awk '{ printf $4; }')
+fi
+
+# Use both the clang revision and the plugin revisions to test for updates.
+BLINKGCPLUGIN_REVISION=\
+$(grep 'set(LIBRARYNAME' "$THIS_DIR"/../blink_gc_plugin/CMakeLists.txt \
+    | cut -d ' ' -f 2 | tr -cd '[0-9]')
+CLANG_AND_PLUGINS_REVISION="${CLANG_REVISION}-${BLINKGCPLUGIN_REVISION}"
+
+
 OS="$(uname -s)"
 
 # Parse command line options.
 if_needed=
 force_local_build=
 run_tests=
 bootstrap=
 with_android=yes
 chrome_tools="plugins;blink_gc_plugin"
 gcc_toolchain=
+with_patches=yes
 
 if [[ "${OS}" = "Darwin" ]]; then
   with_android=
 fi
 
 while [[ $# > 0 ]]; do
   case $1 in
     --bootstrap)
       bootstrap=yes
       ;;
     --if-needed)
       if_needed=yes
       ;;
     --force-local-build)
       force_local_build=yes
       ;;
     --print-revision)
       echo $CLANG_REVISION
       exit 0
       ;;
     --run-tests)
       run_tests=yes
       ;;
     --without-android)
       with_android=
       ;;
+    --without-patches)
+      with_patches=
+      ;;
     --with-chrome-tools)
       shift
       if [[ $# == 0 ]]; then
         echo "--with-chrome-tools requires an argument."
         exit 1
       fi
       chrome_tools=$1
       ;;
     --gcc-toolchain)
       shift
@@ skipping 17 matching lines @@
       echo "--if-needed: Download clang only if the script thinks it is needed."
       echo "--run-tests: Run tests after building. Only for local builds."
       echo "--print-revision: Print current clang revision and exit."
       echo "--without-android: Don't build ASan Android runtime library."
       echo "--with-chrome-tools: Select which chrome tools to build." \
            "Defaults to plugins;blink_gc_plugin."
       echo "    Example: --with-chrome-tools plugins;empty-string"
       echo "--gcc-toolchain: Set the prefix for which GCC version should"
       echo "    be used for building. For example, to use gcc in"
       echo "    /opt/foo/bin/gcc, use '--gcc-toolchain '/opt/foo"
+      echo "--without-patches: Don't apply local patches."
       echo
       exit 1
       ;;
     *)
       echo "Unknown argument: '$1'."
       echo "Use --help for help."
       exit 1
       ;;
   esac
   shift
 done
 
+if [[ -n ${LLVM_FORCE_HEAD_REVISION:-''} ]]; then
+  force_local_build=yes
+
+  # Skip local patches when using HEAD: they probably don't apply anymore.
+  with_patches=
+
+  echo "LLVM_FORCE_HEAD_REVISION was set; using r${CLANG_REVISION}"
+fi
+
 if [[ -n "$if_needed" ]]; then
   if [[ "${OS}" == "Darwin" ]]; then
     # clang is used on Mac.
     true
   elif [[ "$GYP_DEFINES" =~ .*(clang|tsan|asan|lsan|msan)=1.* ]]; then
     # clang requested via $GYP_DEFINES.
     true
   elif [[ -d "${LLVM_BUILD_DIR}" ]]; then
     # clang previously downloaded, remove third_party/llvm-build to prevent
     # updating.
@@ skipping 139 matching lines @@
 fi
 
 # While we're bundling our own libc++ on OS X, we need to compile libc++abi
 # into it too (since OS X 10.6 doesn't have libc++abi.dylib either).
 if [ "${OS}" = "Darwin" ]; then
   echo Getting libc++abi r"${CLANG_REVISION}" in "${LIBCXXABI_DIR}"
   svn co --force "${LLVM_REPO_URL}/libcxxabi/trunk@${CLANG_REVISION}" \
                  "${LIBCXXABI_DIR}"
 fi
 
-# Apply patch for tests failing with --disable-pthreads (llvm.org/PR11974)
-pushd "${CLANG_DIR}"
-cat << 'EOF' |
+if [[ -n "$with_patches" ]]; then
+
+  # Apply patch for tests failing with --disable-pthreads (llvm.org/PR11974)
+  pushd "${CLANG_DIR}"
+  cat << 'EOF' |
 --- third_party/llvm/tools/clang/test/Index/crash-recovery-modules.m    (revision 202554)
 +++ third_party/llvm/tools/clang/test/Index/crash-recovery-modules.m    (working copy)
 @@ -12,6 +12,8 @@
  
  // REQUIRES: crash-recovery
  // REQUIRES: shell
 +// XFAIL: *
 +//    (PR11974)
  
  @import Crash;
 EOF
 patch -p4
 popd
 
 pushd "${CLANG_DIR}"
 cat << 'EOF' |
 --- unittests/libclang/LibclangTest.cpp (revision 215949)
 +++ unittests/libclang/LibclangTest.cpp (working copy)
 @@ -431,7 +431,7 @@
    EXPECT_EQ(0U, clang_getNumDiagnostics(ClangTU));
  }
 
 -TEST_F(LibclangReparseTest, ReparseWithModule) {
 +TEST_F(LibclangReparseTest, DISABLED_ReparseWithModule) {
    const char *HeaderTop = "#ifndef H\n#define H\nstruct Foo { int bar;";
    const char *HeaderBottom = "\n};\n#endif\n";
    const char *MFile = "#include \"HeaderFile.h\"\nint main() {"
 EOF
-patch -p0
-popd
+  patch -p0
+  popd
 
-# Apply r223211: "Revert r222997."
-pushd "${LLVM_DIR}"
-cat << 'EOF' |
+  # Apply r223211: "Revert r222997."
+  pushd "${LLVM_DIR}"
+  cat << 'EOF' |
 --- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp
 +++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp
 @@ -921,8 +921,6 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
              Value *OriginPtr =
                  getOriginPtrForArgument(&FArg, EntryIRB, ArgOffset);
              setOrigin(A, EntryIRB.CreateLoad(OriginPtr));
 -          } else {
 -            setOrigin(A, getCleanOrigin());
            }
          }
@@ skipping 23 matching lines @@
    /// \brief Get the origin for i-th argument of the instruction I.
 @@ -1088,7 +1088,6 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
      IRB.CreateStore(getCleanShadow(&I), ShadowPtr);
  
      setShadow(&I, getCleanShadow(&I));
 -    setOrigin(&I, getCleanOrigin());
    }
  
    void visitAtomicRMWInst(AtomicRMWInst &I) {
 EOF
-patch -p1
-popd
+  patch -p1
+  popd
 
-# Apply r223219: "Preserve LD_LIBRARY_PATH when using the 'env' command"
-pushd "${CLANG_DIR}"
-cat << 'EOF' |
+  # Apply r223219: "Preserve LD_LIBRARY_PATH when using the 'env' command"
+  pushd "${CLANG_DIR}"
+  cat << 'EOF' |
 --- a/test/Driver/env.c
 +++ b/test/Driver/env.c
 @@ -5,12 +5,14 @@
  // REQUIRES: shell
  //
  // The PATH variable is heavily used when trying to find a linker.
 -// RUN: env -i LC_ALL=C %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
 +// RUN: env -i LC_ALL=C LD_LIBRARY_PATH="$LD_LIBRARY_PATH" \
 +// RUN:   %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
  // RUN:     --target=i386-unknown-linux \
  // RUN:     --sysroot=%S/Inputs/basic_linux_tree \
  // RUN:   | FileCheck --check-prefix=CHECK-LD-32 %s
  //
 -// RUN: env -i LC_ALL=C PATH="" %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
 +// RUN: env -i LC_ALL=C PATH="" LD_LIBRARY_PATH="$LD_LIBRARY_PATH" \
 +// RUN:   %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
  // RUN:     --target=i386-unknown-linux \
  // RUN:     --sysroot=%S/Inputs/basic_linux_tree \
  // RUN:   | FileCheck --check-prefix=CHECK-LD-32 %s
 EOF
-patch -p1
-popd
+  patch -p1
+  popd
 
-# Revert r220714: "Frontend: Define __EXCEPTIONS if -fexceptions is passed"
-pushd "${CLANG_DIR}"
-cat << 'EOF' |
+  # Revert r220714: "Frontend: Define __EXCEPTIONS if -fexceptions is passed"
+  pushd "${CLANG_DIR}"
+  cat << 'EOF' |
 --- a/lib/Frontend/InitPreprocessor.cpp
 +++ b/lib/Frontend/InitPreprocessor.cpp
 @@ -566,7 +566,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
      Builder.defineMacro("__BLOCKS__");
    }
  
 -  if (!LangOpts.MSVCCompat && LangOpts.Exceptions)
 +  if (!LangOpts.MSVCCompat && LangOpts.CXXExceptions)
      Builder.defineMacro("__EXCEPTIONS");
    if (!LangOpts.MSVCCompat && LangOpts.RTTI)
@@ skipping 20 matching lines @@
 +++ b/test/Preprocessor/predefined-exceptions.m
 @@ -1,6 +1,6 @@
  // RUN: %clang_cc1 -x objective-c -fobjc-exceptions -fexceptions -E -dM %s | FileCheck -check-prefix=CHECK-OBJC-NOCXX %s 
  // CHECK-OBJC-NOCXX: #define OBJC_ZEROCOST_EXCEPTIONS 1
 -// CHECK-OBJC-NOCXX: #define __EXCEPTIONS 1
 +// CHECK-OBJC-NOCXX-NOT: #define __EXCEPTIONS 1
  
  // RUN: %clang_cc1 -x objective-c++ -fobjc-exceptions -fexceptions -fcxx-exceptions -E -dM %s | FileCheck -check-prefix=CHECK-OBJC-CXX %s 
  // CHECK-OBJC-CXX: #define OBJC_ZEROCOST_EXCEPTIONS 1
 EOF
-patch -p1
-popd
+  patch -p1
+  popd
 
-# Apply r223177: "Ensure typos in the default values of template parameters get diagnosed."
-pushd "${CLANG_DIR}"
-cat << 'EOF' |
+  # Apply r223177: "Ensure typos in the default values of template parameters get diagnosed."
+  pushd "${CLANG_DIR}"
+  cat << 'EOF' |
 --- a/lib/Parse/ParseTemplate.cpp
 +++ b/lib/Parse/ParseTemplate.cpp
 @@ -676,7 +676,7 @@ Parser::ParseNonTypeTemplateParameter(unsigned Depth, unsigned Position) {
      GreaterThanIsOperatorScope G(GreaterThanIsOperator, false);
      EnterExpressionEvaluationContext Unevaluated(Actions, Sema::Unevaluated);
  
 -    DefaultArg = ParseAssignmentExpression();
 +    DefaultArg = Actions.CorrectDelayedTyposInExpr(ParseAssignmentExpression());
      if (DefaultArg.isInvalid())
        SkipUntil(tok::comma, tok::greater, StopAtSemi | StopBeforeMatch);
@@ skipping 18 matching lines @@
 +++ b/test/SemaCXX/typo-correction-delayed.cpp
 @@ -102,3 +102,7 @@ void f(int *i) {
    __atomic_load(i, i, something_something);  // expected-error-re {{use of undeclared identifier 'something_something'{{$}}}}
  }
  }
 +
 +const int DefaultArg = 9;  // expected-note {{'DefaultArg' declared here}}
 +template <int I = defaultArg> struct S {};  // expected-error {{use of undeclared identifier 'defaultArg'; did you mean 'DefaultArg'?}}
 +S<1> s;
 EOF
-patch -p1
-popd
+  patch -p1
+  popd
 
-# Apply r223209: "Handle delayed corrections in a couple more error paths in ParsePostfixExpressionSuffix."
-pushd "${CLANG_DIR}"
-cat << 'EOF' |
+  # Apply r223209: "Handle delayed corrections in a couple more error paths in ParsePostfixExpressionSuffix."
+  pushd "${CLANG_DIR}"
+  cat << 'EOF' |
 --- a/lib/Parse/ParseExpr.cpp
 +++ b/lib/Parse/ParseExpr.cpp
 @@ -1390,6 +1390,7 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
          SourceLocation OpenLoc = ConsumeToken();
  
          if (ParseSimpleExpressionList(ExecConfigExprs, ExecConfigCommaLocs)) {
 +          (void)Actions.CorrectDelayedTyposInExpr(LHS);
            LHS = ExprError();
          }
  
@@ skipping 13 matching lines @@
  const int DefaultArg = 9;  // expected-note {{'DefaultArg' declared here}}
  template <int I = defaultArg> struct S {};  // expected-error {{use of undeclared identifier 'defaultArg'; did you mean 'DefaultArg'?}}
  S<1> s;
 +
 +namespace foo {}
 +void test_paren_suffix() {
 +  foo::bar({5, 6});  // expected-error-re {{no member named 'bar' in namespace 'foo'{{$}}}} \
 +                     // expected-error {{expected expression}}
 +}
 EOF
-patch -p1
-popd
+  patch -p1
+  popd
 
-# Apply r223705: "Handle possible TypoExprs in member initializers."
-pushd "${CLANG_DIR}"
-cat << 'EOF' |
+  # Apply r223705: "Handle possible TypoExprs in member initializers."
+  pushd "${CLANG_DIR}"
+  cat << 'EOF' |
 --- a/lib/Sema/SemaDeclCXX.cpp
 +++ b/lib/Sema/SemaDeclCXX.cpp
 @@ -2813,6 +2813,11 @@ Sema::BuildMemInitializer(Decl *ConstructorD,
                            SourceLocation IdLoc,
                            Expr *Init,
                            SourceLocation EllipsisLoc) {
 +  ExprResult Res = CorrectDelayedTyposInExpr(Init);
 +  if (!Res.isUsable())
 +    return true;
 +  Init = Res.get();
@@ skipping 10 matching lines @@
                       // expected-error {{expected expression}}
  }
 +
 +const int kNum = 10;  // expected-note {{'kNum' declared here}}
 +class SomeClass {
 +  int Kind;
 +public:
 +  explicit SomeClass() : Kind(kSum) {}  // expected-error {{use of undeclared identifier 'kSum'; did you mean 'kNum'?}}
 +};
 EOF
-patch -p1
-popd
+  patch -p1
+  popd
 
-# Apply r224172: "Typo correction: Ignore temporary binding exprs after overload resolution"
-pushd "${CLANG_DIR}"
-cat << 'EOF' |
+  # Apply r224172: "Typo correction: Ignore temporary binding exprs after overload resolution"
+  pushd "${CLANG_DIR}"
+  cat << 'EOF' |
 --- a/lib/Sema/SemaExprCXX.cpp
 +++ b/lib/Sema/SemaExprCXX.cpp
 @@ -6105,8 +6105,13 @@ public:
      auto Result = BaseTransform::RebuildCallExpr(Callee, LParenLoc, Args,
                                                   RParenLoc, ExecConfig);
      if (auto *OE = dyn_cast<OverloadExpr>(Callee)) {
 -      if (!Result.isInvalid() && Result.get())
 -        OverloadResolution[OE] = cast<CallExpr>(Result.get())->getCallee();
 +      if (!Result.isInvalid() && Result.get()) {
 +        Expr *ResultCall = Result.get();
@@ skipping 27 matching lines @@
 +int main() {
 +  // expected-note@+1 {{'result' declared here}}
 +  const char *result;
 +  // expected-error@+1 {{use of undeclared identifier 'resulta'; did you mean 'result'?}}
 +  if (AssertionResult ar = (Compare("value1", resulta)))
 +    ;
 +  else
 +    printf("ar: %d\n", ar.val);
 +}
 EOF
-patch -p1
-popd
+  patch -p1
+  popd
 
-# Apply r224173: "Implement feedback on r224172 in PR21899"
-pushd "${CLANG_DIR}"
-cat << 'EOF' |
+  # Apply r224173: "Implement feedback on r224172 in PR21899"
+  pushd "${CLANG_DIR}"
+  cat << 'EOF' |
 --- a/lib/Sema/SemaExprCXX.cpp
 +++ b/lib/Sema/SemaExprCXX.cpp
 @@ -6105,7 +6105,7 @@ public:
      auto Result = BaseTransform::RebuildCallExpr(Callee, LParenLoc, Args,
                                                   RParenLoc, ExecConfig);
      if (auto *OE = dyn_cast<OverloadExpr>(Callee)) {
 -      if (!Result.isInvalid() && Result.get()) {
 +      if (Result.isUsable()) {
          Expr *ResultCall = Result.get();
          if (auto *BE = dyn_cast<CXXBindTemporaryExpr>(ResultCall))
@@ skipping 24 matching lines @@
    // expected-note@+1 {{'result' declared here}}
    const char *result;
    // expected-error@+1 {{use of undeclared identifier 'resulta'; did you mean 'result'?}}
 -  if (AssertionResult ar = (Compare("value1", resulta)))
 -    ;
 -  else
 -    printf("ar: %d\n", ar.val);
 +  Overload(resulta);
  }
 EOF
-patch -p1
-popd
+  patch -p1
+  popd
 
-
-# This Go bindings test doesn't work after the bootstrap build on Linux. (PR21552)
-pushd "${LLVM_DIR}"
-cat << 'EOF' |
+  # This Go bindings test doesn't work after the bootstrap build on Linux. (PR21552)
+  pushd "${LLVM_DIR}"
+  cat << 'EOF' |
 Index: test/Bindings/Go/go.test
 ===================================================================
 --- test/Bindings/Go/go.test    (revision 223109)
 +++ test/Bindings/Go/go.test    (working copy)
 @@ -1,3 +1,3 @@
 -; RUN: llvm-go test llvm.org/llvm/bindings/go/llvm
 +; RUN: true
  
  ; REQUIRES: shell
 EOF
-patch -p0
-popd
+  patch -p0
+  popd
 
+fi
 
 # Echo all commands.
 set -x
 
 # Set default values for CC and CXX if they're not set in the environment.
 CC=${CC:-cc}
 CXX=${CXX:-c++}
 
 if [[ -n "${gcc_toolchain}" ]]; then
   # Use the specified gcc installation for building.
@@ skipping 232 matching lines @@
 
 if [[ -n "$run_tests" ]]; then
   # Run Chrome tool tests.
   ninja -C "${LLVM_BUILD_DIR}" cr-check-all
   # Run the LLVM and Clang tests.
   ninja -C "${LLVM_BUILD_DIR}" check-all
 fi
 
 # After everything is done, log success for this revision.
 echo "${CLANG_AND_PLUGINS_REVISION}" > "${STAMP_FILE}"