Revert "Roll Clang 233105-2:237739-1"

This reverts commit 0e80c361,
which appears to be causing blink test failures.  Example:

https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20%28deps%29/builds/41877

TBR=hans@chromium.org,dpranke@chromium.org
NOTRY=true
NOPRESUBMIT=true
BUG=483026

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

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

build/common.gypi

@@ -3805,14 +3805,6 @@
                 'cflags': ['-fno-unwind-tables', '-fno-asynchronous-unwind-tables'],
                 'defines': ['NO_UNWIND_TABLES'],
               }],
-              ['clang==1', {
-                # Non-unique section names appears to make linker dead stripping
-                # less effective. See http://crbug.com/483026#c20
-                # TODO(hans): Remove this if resolved upstream.
-                'cflags': [
-                  '-funique-section-names',
-                ],
-              }],
             ],
           },
         },

build/config/compiler/BUILD.gn

@@ -377,13 +377,6 @@ config("compiler") {
     } else {
       cflags += [ "-funwind-tables" ]
     }
-
-    if (is_clang && !is_nacl && !is_debug) {
-      # Non-unique section names appears to make linker dead stripping
-      # less effective. See http://crbug.com/483026#c20
-      # TODO(hans): Remove this if resolved upstream.
-      cflags += [ "-funique-section-names" ]
-    }
   }
 
   # Linux/Android common flags setup.

tools/clang/blink_gc_plugin/JsonWriter.h

@@ -7,12 +7,24 @@
 
 #include "llvm/Support/raw_ostream.h"
 
+// TODO(hans): Remove this #ifdef after Clang is rolled past r234897.
+#ifdef LLVM_FORCE_HEAD_REVISION
+#define JSON_WRITER_STREAM std::unique_ptr<llvm::raw_ostream>
+#else
+#define JSON_WRITER_STREAM llvm::raw_fd_ostream*
+#endif
+
 // Helper to write information for the points-to graph.
 class JsonWriter {
  public:
-  static JsonWriter* from(std::unique_ptr<llvm::raw_ostream> os) {
+  static JsonWriter* from(JSON_WRITER_STREAM os) {
     return os ? new JsonWriter(std::move(os)) : 0;
   }
+#ifndef LLVM_FORCE_HEAD_REVISION
+  ~JsonWriter() {
+    delete os_;
+  }
+#endif
   void OpenList() {
     Separator();
     *os_ << "[";
@@ -53,7 +65,7 @@ class JsonWriter {
     *os_ << "\"" << key << "\":\"" << val << "\"";
   }
  private:
-  JsonWriter(std::unique_ptr<llvm::raw_ostream> os) : os_(std::move(os)) {}
+  JsonWriter(JSON_WRITER_STREAM os) : os_(std::move(os)) {}
   void Separator() {
     if (state_.empty())
       return;
@@ -63,7 +75,7 @@ class JsonWriter {
     }
     state_.top() = true;
   }
-  std::unique_ptr<llvm::raw_ostream> os_;
+  JSON_WRITER_STREAM os_;
   std::stack<bool> state_;
 };
 

tools/clang/scripts/update.sh

@@ -8,10 +8,10 @@
 # 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=237739
+CLANG_REVISION=233105
 
 # This is incremented when pushing a new build of Clang at the same revision.
-CLANG_SUB_REVISION=1
+CLANG_SUB_REVISION=2
 
 PACKAGE_VERSION="${CLANG_REVISION}-${CLANG_SUB_REVISION}"
 
@@ -319,8 +319,6 @@ for i in \
       "${COMPILER_RT_DIR}/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc" \
       "${COMPILER_RT_DIR}/test/tsan/signal_segv_handler.cc" \
       "${COMPILER_RT_DIR}/lib/sanitizer_common/sanitizer_coverage_libcdep.cc" \
-      "${COMPILER_RT_DIR}/cmake/config-ix.cmake" \
-      "${COMPILER_RT_DIR}/lib/ubsan/ubsan_platform.h" \
       ; do
   if [[ -e "${i}" ]]; then
     rm -f "${i}"  # For unversioned files.
@@ -403,6 +401,27 @@ EOF
   patch -p0
   popd
 
+  # Cherry-pick r234010 [sancov] Shrink pc array on Android back to 2**24."
+  pushd "${COMPILER_RT_DIR}"
+  cat << 'EOF' |
+diff --git a/lib/sanitizer_common/sanitizer_coverage_libcdep.cc b/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
+index 4b976fc..cfd9e7e 100644
+--- a/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_coverage_libcdep.cc
+@@ -109,7 +109,8 @@ class CoverageData {
+ 
+   // Maximal size pc array may ever grow.
+   // We MmapNoReserve this space to ensure that the array is contiguous.
+-  static const uptr kPcArrayMaxSize = FIRST_32_SECOND_64(1 << 26, 1 << 27);
++  static const uptr kPcArrayMaxSize =
++      FIRST_32_SECOND_64(1 << (SANITIZER_ANDROID ? 24 : 26), 1 << 27);
+   // The amount file mapping for the pc array is grown by.
+   static const uptr kPcArrayMmapSize = 64 * 1024;
+
+EOF
+  patch -p1
+  popd
+
   # This Go bindings test doesn't work after the bootstrap build on Linux. (PR21552)
   pushd "${LLVM_DIR}"
   cat << 'EOF' |
@@ -419,37 +438,6 @@ EOF
   patch -p0
   popd
 
-  # The UBSan run-time, which is now bundled with the ASan run-time, doesn't work
-  # on Mac OS X 10.8 (PR23539).
-  pushd "${COMPILER_RT_DIR}"
-  cat << 'EOF' |
---- a/cmake/config-ix.cmake
-+++ b/cmake/config-ix.cmake
-@@ -319,7 +319,7 @@ else()
- endif()
- 
- if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD")
-+    OS_NAME MATCHES "Linux|FreeBSD")
-   set(COMPILER_RT_HAS_UBSAN TRUE)
- else()
-   set(COMPILER_RT_HAS_UBSAN FALSE)
-diff --git a/lib/ubsan/ubsan_platform.h b/lib/ubsan/ubsan_platform.h
-index 8ba253b..d5dce8d 100644
---- a/lib/ubsan/ubsan_platform.h
-+++ b/lib/ubsan/ubsan_platform.h
-@@ -14,7 +14,7 @@
- #define UBSAN_PLATFORM_H
- 
- // Other platforms should be easy to add, and probably work as-is.
--#if (defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)) && \
-+#if (defined(__linux__) || defined(__FreeBSD__)) && \
-     (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || \
-      defined(__aarch64__) || defined(__mips__) || defined(__powerpc64__))
- # define CAN_SANITIZE_UB 1
-EOF
-  patch -p1
-  popd
 
 fi