Revert of Roll Clang 223108:228129 (patchset #5 id:80001 of...

Revert of Roll Clang 223108:228129 (patchset #5 id:80001 of https://codereview.chromium.org/881763003/)

Reason for revert:
compiler crash in http://build.chromium.org/p/chromium/builders/Mac/builds/33226

Assertion failed: (Offset <= PieceOffset && "overlapping or duplicate pieces"), function emitLocPieces, file /work/chromium/src/third_party/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp, line 1676.

0.	Program arguments: /Volumes/data/b/build/slave/Mac/build/src/third_party/llvm-build/Release+Asserts/bin/clang -cc1 -triple x86_64-apple-macosx10.6.0 /* snip */ -x c ../../third_party/mesa/src/src/mesa/program/prog_opt_constant_fold.c
1.	<eof> parser at end of file
2.	Code generation
clang:error: unable to execute command: Illegal instruction: 4
clang:error: clang frontend command failed due to signal (use -v to see invocation)
clang version 3.7.0 (trunk 228129)
Target: x86_64-apple-darwin13.4.0

Original issue's description:
> Roll Clang 223108:228129
>
> Also introduce a build number in the package name, stop versioning
> the Blink GC plugin, and remove repackage.sh.
>
> BUG=444089
>
> Committed: https://crrev.com/d30327adf468b78f79819a69bca12b64b7cb70ae
> Cr-Commit-Position: refs/heads/master@{#314946}

TBR=thakis@chromium.org,jln@chromium.org,jbauman@chromium.org,hans@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=444089

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

Cr-Commit-Position: refs/heads/master@{#314950}

content/gpu/gpu_main.cc

@@ -60,7 +60,6 @@
 
 #if defined(ADDRESS_SANITIZER)
 #include <sanitizer/asan_interface.h>
-#include <sanitizer/coverage_interface.h>
 #endif
 
 const int kGpuTimeout = 10000;

content/zygote/zygote_main_linux.cc

@@ -64,7 +64,6 @@
 
 #if defined(ADDRESS_SANITIZER)
 #include <sanitizer/asan_interface.h>
-#include <sanitizer/coverage_interface.h>
 #endif
 
 namespace content {

sandbox/linux/bpf_dsl/bpf_dsl_more_unittest.cc

@@ -652,10 +652,6 @@ ResultExpr RedirectAllSyscallsPolicy::EvaluateSyscall(int sysno) const {
   return UnsafeTrap(AllowRedirectedSyscall, NULL);
 }
 
-#if !defined(ADDRESS_SANITIZER)
-// ASan does not allow changing the signal handler for SIGBUS, and treats it as
-// a fatal signal.
-
 int bus_handler_fd_ = -1;
 
 void SigBusHandler(int, siginfo_t* info, void* void_context) {
@@ -684,7 +680,6 @@ BPF_TEST_C(SandboxBPF, SigBus, RedirectAllSyscallsPolicy) {
   BPF_ASSERT(close(fds[1]) == 0);
   BPF_ASSERT(c == 0x55);
 }
-#endif  // !defined(ADDRESS_SANITIZER)
 
 BPF_TEST_C(SandboxBPF, SigMask, RedirectAllSyscallsPolicy) {
   // Signal masks are potentially tricky to handle. For instance, if we

tools/clang/blink_gc_plugin/CMakeLists.txt

 # This line is read by update.sh and other scripts in tools/clang/scripts
 # Note: The spaces are significant.
-set(LIBRARYNAME BlinkGCPlugin)
+set(LIBRARYNAME BlinkGCPlugin_14)
 
 add_llvm_loadable_module("lib${LIBRARYNAME}"
                          BlinkGCPlugin.cpp

tools/clang/blink_gc_plugin/Edge.h

@@ -24,7 +24,6 @@ class Collection;
 // Bare-bones visitor.
 class EdgeVisitor {
  public:
-  virtual ~EdgeVisitor() {}
   virtual void VisitValue(Value*) {}
   virtual void VisitRawPtr(RawPtr*) {}
   virtual void VisitRefPtr(RefPtr*) {}

tools/clang/blink_gc_plugin/RecordInfo.h

@@ -23,7 +23,6 @@ class RecordCache;
 class GraphPoint {
  public:
   GraphPoint() : traced_(false) {}
-  virtual ~GraphPoint() {}
   void MarkTraced() { traced_ = true; }
   bool IsProperlyTraced() { return traced_ || !NeedsTracing().IsNeeded(); }
   virtual const TracingStatus NeedsTracing() = 0;

tools/clang/blink_gc_plugin/tests/test.sh

@@ -29,7 +29,6 @@ do_testcase() {
     flags="$(cat "${3}")"
   fi
   local output="$("${CLANG_PATH}" -c -Wno-c++11-extensions \
-      -Wno-inaccessible-base \
       -Xclang -load -Xclang "${PLUGIN_PATH}" \
       -Xclang -add-plugin -Xclang blink-gc-plugin ${flags} ${1} 2>&1)"
   local json="${input%cpp}graph.json"

tools/clang/plugins/tests/weak_ptr_factory.flags

--Xclang -plugin-arg-find-bad-constructs -Xclang check-templates
+-Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -plugin-arg-find-bad-constructs -Xclang check-weak-ptr-factory-order

tools/clang/scripts/blink_gc_plugin_flags.sh

@@ -13,6 +13,9 @@ if uname -s | grep -q Darwin; then
 else
   LIBSUFFIX=so
 fi
+LIBNAME=\
+$(grep 'set(LIBRARYNAME' "$SRC_DIR"/tools/clang/blink_gc_plugin/CMakeLists.txt \
+    | cut -d ' ' -f 2 | tr -d ')')
 
 FLAGS=""
 PREFIX="-Xclang -plugin-arg-blink-gc-plugin -Xclang"
@@ -28,5 +31,5 @@ for arg in "$@"; do
   fi
 done
 
-echo -Xclang -load -Xclang $CLANG_LIB_PATH/libBlinkGCPlugin.$LIBSUFFIX \
+echo -Xclang -load -Xclang $CLANG_LIB_PATH/lib$LIBNAME.$LIBSUFFIX \
   -Xclang -add-plugin -Xclang blink-gc-plugin $FLAGS

tools/clang/scripts/package.sh

@@ -52,7 +52,6 @@ LLVM_BOOTSTRAP_INSTALL_DIR="${LLVM_DIR}/../llvm-bootstrap-install"
 LLVM_BUILD_DIR="${THIS_DIR}/../../../third_party/llvm-build"
 LLVM_BIN_DIR="${LLVM_BUILD_DIR}/Release+Asserts/bin"
 LLVM_LIB_DIR="${LLVM_BUILD_DIR}/Release+Asserts/lib"
-STAMP_FILE="${LLVM_DIR}/../llvm-build/cr_build_revision"
 
 echo "Diff in llvm:" | tee buildlog.txt
 svn stat "${LLVM_DIR}" 2>&1 | tee -a buildlog.txt
@@ -87,7 +86,8 @@ fi
 "${THIS_DIR}"/update.sh --bootstrap --force-local-build --run-tests \
     ${extra_flags} 2>&1 | tee -a buildlog.txt
 
-R=$(cat "${STAMP_FILE}")
+R=$("${LLVM_BIN_DIR}/clang" --version | \
+     sed -ne 's/clang version .*(trunk \([0-9]*\))/\1/p')
 
 PDIR=clang-$R
 rm -rf $PDIR
@@ -122,7 +122,11 @@ fi
 # Copy plugins. Some of the dylibs are pretty big, so copy only the ones we
 # care about.
 cp "${LLVM_LIB_DIR}/libFindBadConstructs.${SO_EXT}" $PDIR/lib
-cp "${LLVM_LIB_DIR}/libBlinkGCPlugin.${SO_EXT}" $PDIR/lib
+
+BLINKGCPLUGIN_LIBNAME=\
+$(grep 'set(LIBRARYNAME' "$THIS_DIR"/../blink_gc_plugin/CMakeLists.txt \
+    | cut -d ' ' -f 2 | tr -d ')')
+cp "${LLVM_LIB_DIR}/lib${BLINKGCPLUGIN_LIBNAME}.${SO_EXT}" $PDIR/lib
 
 if [[ -n "${gcc_toolchain}" ]]; then
   # Copy the stdlibc++.so.6 we linked Clang against so it can run.
@@ -178,5 +182,3 @@ fi
 echo To upload, run:
 echo gsutil cp -a public-read $PDIR.tgz \
      gs://chromium-browser-clang/$PLATFORM/$PDIR.tgz
-
-# FIXME: Warn if the file already exists on the server.

tools/clang/scripts/plugin_flags.sh

@@ -17,4 +17,5 @@ else
 fi
 
 echo -Xclang -load -Xclang $CLANG_LIB_PATH/libFindBadConstructs.$LIBSUFFIX \
-  -Xclang -add-plugin -Xclang find-bad-constructs
+  -Xclang -add-plugin -Xclang find-bad-constructs -Xclang \
+  -plugin-arg-find-bad-constructs -Xclang check-weak-ptr-factory-order

tools/clang/scripts/repackage.sh

+#!/bin/bash
+# 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.
+
+# This script will check out llvm and clang, build a full package
+# with the latest plugin revisions and then repackage an existing
+# clang-package with the new plugin revisions.
+
+# The new package can be uploaded to replace the existing clang
+# package at the same clang revision.
+
+THIS_DIR="$(dirname "${0}")"
+LLVM_BUILD_DIR="${THIS_DIR}/../../../third_party/llvm-build"
+LLVM_TAR_DIR="${LLVM_BUILD_DIR}/Release+Asserts"
+LLVM_BIN_DIR="${LLVM_TAR_DIR}/bin"
+LLVM_LIB_DIR="${LLVM_TAR_DIR}/lib"
+
+set -eu
+
+if [ "$(uname -s)" = "Darwin" ]; then
+  PLATFORM=Mac
+  SO_EXT="dylib"
+else
+  PLATFORM=Linux_x64
+  SO_EXT="so"
+fi
+
+# Build clang with the new plugin revisions.
+"$THIS_DIR"/package.sh $@
+
+R=$("${LLVM_BIN_DIR}/clang" --version | \
+     sed -ne 's/clang version .*(trunk \([0-9]*\))/\1/p')
+PDIR=clang-$R
+
+if [ ! -f "$PDIR.tgz" ]; then
+    echo "Could not find package archive $PDIR.tgz generated by package.sh"
+    exit 1
+fi
+
+# We don't want to change the clang binary, so fetch the current clang
+# package and add the plugin shared-libraries to the existing package.
+rm -rf $LLVM_BUILD_DIR
+"$THIS_DIR"/update.sh
+
+LIBNAME=\
+$(grep 'set(LIBRARYNAME' "$THIS_DIR"/../blink_gc_plugin/CMakeLists.txt \
+    | cut -d ' ' -f 2 | tr -d ')')
+LIBFILE=lib$LIBNAME.$SO_EXT
+
+# Check that we are actually creating the plugin at a new revision.
+if [ -f "$LLVM_LIB_DIR/$LIBFILE" ]; then
+    echo "The plugin revision $LIBNAME is already in the existing package."
+    exit 1
+fi
+
+cp $PDIR/lib/$LIBFILE "$LLVM_LIB_DIR/"
+if [ "$(uname -s)" = "Darwin" ]; then
+  tar zcf ${PDIR}_repack.tgz -C "$LLVM_TAR_DIR" bin include lib buildlog.txt
+else
+  tar zcf ${PDIR}_repack.tgz -C "$LLVM_TAR_DIR" bin lib buildlog.txt
+fi
+
+echo The clang package has been repackaged with $LIBNAME
+echo To upload, run:
+echo gsutil cp -a public-read ${PDIR}_repack.tgz \
+     gs://chromium-browser-clang/$PLATFORM/$PDIR.tgz