Remove support code that was used to pin asan to an older revision.

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 dc555552d549b14e8f2a5a37a75f1b8659c56105..7471b8a241034e1270ed10f3a3d586e5842f9283 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -9,8 +9,6 @@
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
 CLANG_REVISION=179138
-# ASan Mac builders are pinned to this revision, see http://crbug.com/170629.
-CLANG_ASAN_MAC_REVISION=${CLANG_REVISION}
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"
@@ -36,9 +34,6 @@ mac_only=
 run_tests=
 bootstrap=
 with_android=yes
-# Temporary workaround for http://crbug.com/170629: use older Clang for ASan
-# Mac builders.
-is_asan_mac_builder_hackfix=
 with_tools_extra=
 chrome_tools="plugins"
 
@@ -63,11 +58,6 @@ while [[ $# > 0 ]]; do
     --without-android)
       with_android=
       ;;
-    # Temporary workaround for http://crbug.com/170629 - use older Clang for
-    # ASan Mac builders.
-    --is-asan-mac-builder-hackfix)
-      is_asan_mac_builder_hackfix=yes
-      ;;
     --with-tools-extra)
       with_tools_extra=yes
       ;;
@@ -86,8 +76,6 @@ while [[ $# > 0 ]]; do
       echo "--mac-only: Do initial download only on Mac systems."
       echo "--run-tests: Run tests after building. Only for local builds."
       echo "--without-android: Don't build ASan Android runtime library."
-      echo "--is-asan-mac-builder-hackfix: Use older Clang" \
-           "to build ASan on Mac."
       echo "--with-tools-extra: Also build the clang-tools-extra repository."
       echo "--with-chrome-tools: Select which chrome tools to build." \
            "Defaults to plugins."
@@ -99,43 +87,6 @@ while [[ $# > 0 ]]; do
   shift
 done
 
-# Are we on a Chrome buildbot running ASan?
-function on_asan_mac_host {
-  if [[ "${OS}" != "Darwin" ]]; then
-    return 1
-  fi
-  HOST="$(hostname -s)"
-  # Old (10.6) Chrome Mac ASan Builder. Kept here till we fully migrate to 10.8
-  if [[ "${HOST}" == "vm633-m1" ]]; then
-    return 0
-  fi
-  # 10.8 Chrome Mac ASan Builder.
-  if [[ "${HOST}" == "vm672-m1" ]]; then
-    return 0
-  fi
-  # Chrome Mac ASan LKGR.
-  if [[ "${HOST}" == "mini11-a1" ]]; then
-    return 0
-  fi
-  # mac_asan trybots. These share machines with the mac_layout bots, so only
-  # pin clang if the slave is used for an _asan build, not for a layout build.
-  if [[ "${PWD}" != *asan* ]]; then
-    return 1
-  fi
-  for num in {600..655}
-  do
-    if [[ "${HOST}" == "vm${num}-m4" ]]; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-# Use older Clang for ASan Mac builds. See http://crbug.com/170629.
-if [[ -n "${is_asan_mac_builder_hackfix}" ]] || on_asan_mac_host; then
-  CLANG_REVISION=${CLANG_ASAN_MAC_REVISION}
-fi
-
 # --mac-only prevents the initial download on non-mac systems, but if clang has
 # already been downloaded in the past, this script keeps it up to date even if
 # --mac-only is passed in and the system isn't a mac. People who don't like this