Roll Clang 216630:217949 (try 2)

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.
-CLANG_REVISION=216630
+CLANG_REVISION=217949
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"
 LLVM_BUILD_DIR="${LLVM_DIR}/../llvm-build/Release+Asserts"
 COMPILER_RT_BUILD_DIR="${LLVM_DIR}/../llvm-build/compiler-rt"
 LLVM_BOOTSTRAP_DIR="${LLVM_DIR}/../llvm-bootstrap"
 LLVM_BOOTSTRAP_INSTALL_DIR="${LLVM_DIR}/../llvm-bootstrap-install"
 CLANG_DIR="${LLVM_DIR}/tools/clang"
 COMPILER_RT_DIR="${LLVM_DIR}/compiler-rt"
 LIBCXX_DIR="${LLVM_DIR}/projects/libcxx"
@@ skipping 198 matching lines @@
 # Check that cmake and ninja are available.
 if ! which cmake > /dev/null; then
   echo "CMake needed to build clang; please install"
   exit 1
 fi
 if ! which ninja > /dev/null; then
   echo "ninja needed to build clang, please install"
   exit 1
 fi
 
+echo Reverting previously patched files
+for i in \
+      "${CLANG_DIR}/test/Index/crash-recovery-modules.m" \
+      "${CLANG_DIR}/unittests/libclang/LibclangTest.cpp" \
+      "${COMPILER_RT_DIR}/lib/asan/asan_rtl.cc" \
+      "${COMPILER_RT_DIR}/test/asan/TestCases/Linux/new_array_cookie_test.cc" \
+      ; do
+  if [[ -e "${i}" ]]; then
+    svn revert "${i}"
+  fi;
+done
+
 echo Getting LLVM r"${CLANG_REVISION}" in "${LLVM_DIR}"
 if ! svn co --force "${LLVM_REPO_URL}/llvm/trunk@${CLANG_REVISION}" \
                     "${LLVM_DIR}"; then
   echo Checkout failed, retrying
   rm -rf "${LLVM_DIR}"
   svn co --force "${LLVM_REPO_URL}/llvm/trunk@${CLANG_REVISION}" "${LLVM_DIR}"
 fi
 
 echo Getting clang r"${CLANG_REVISION}" in "${CLANG_DIR}"
 svn co --force "${LLVM_REPO_URL}/cfe/trunk@${CLANG_REVISION}" "${CLANG_DIR}"
@@ skipping 17 matching lines @@
 # 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}"
-svn revert test/Index/crash-recovery-modules.m
 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}"
-svn revert unittests/libclang/LibclangTest.cpp
 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
 
-# Apply r216684 to fix ASan array cookie instrumentation problem.
-# (See https://code.google.com/p/chromium/issues/detail?id=400849#c17)
-pushd "${COMPILER_RT_DIR}"
-svn revert lib/asan/asan_rtl.cc
-svn revert test/asan/TestCases/Linux/new_array_cookie_test.cc
-cat << 'EOF' |
---- a/lib/asan/asan_rtl.cc
-+++ b/lib/asan/asan_rtl.cc
-@@ -269,7 +269,7 @@ void InitializeFlags(Flags *f, const char *env) {
-   f->allow_reexec = true;
-   f->print_full_thread_history = true;
-   f->poison_heap = true;
--  f->poison_array_cookie = true;
-+  f->poison_array_cookie = false;
-   f->poison_partial = true;
-   // Turn off alloc/dealloc mismatch checker on Mac and Windows for now.
-   // https://code.google.com/p/address-sanitizer/issues/detail?id=131
-diff --git a/test/asan/TestCases/Linux/new_array_cookie_test.cc b/test/asan/TestCases/Linux/new_array_cookie_test.cc
-index 339120b..49545f0 100644
---- a/test/asan/TestCases/Linux/new_array_cookie_test.cc
-+++ b/test/asan/TestCases/Linux/new_array_cookie_test.cc
-@@ -1,6 +1,6 @@
- // REQUIRES: asan-64-bits
--// RUN: %clangxx_asan -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
--// RUN: %clangxx_asan -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
-+// RUN: %clangxx_asan -O3 %s -o %t
-+// RUN                                     %run %t
- // RUN: ASAN_OPTIONS=poison_array_cookie=1 not %run %t 2>&1  | FileCheck %s
- // RUN: ASAN_OPTIONS=poison_array_cookie=0 %run %t
- #include <stdio.h>
-EOF
-patch -p1
-popd
-
 # 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.
   CC="$gcc_toolchain/bin/gcc"
@@ skipping 234 matching lines @@
 
 if [[ -n "$run_tests" ]]; then
   # Run Chrome tool tests.
   ninja -C "${TOOL_BUILD_DIR}" 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}"