Roll Clang 233105-2:236765-2

tools/clang/scripts/update.sh

Index: tools/clang/scripts/update.sh
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 2e0f0d0d78b702c6202fa4d438dea8f9ebf2c240..a3a6c28246ffe1788963daa38429e04d32935754 100755
--- a/tools/clang/scripts/update.sh
+++ b/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=233105
+CLANG_REVISION=236765
 
 # This is incremented when pushing a new build of Clang at the same revision.
-CLANG_SUB_REVISION=2
+CLANG_SUB_REVISION=1
 
 PACKAGE_VERSION="${CLANG_REVISION}-${CLANG_SUB_REVISION}"
 
@@ -401,27 +401,6 @@ 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' |