Revert "Roll Clang 218707:223109 (+r223211, +r223219, -r220714)" and follow-ups.

build/sanitizers/sanitizer_options.cc

 // 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 file contains the default options for various compiler-based dynamic
 // tools.
 
 #include "build/build_config.h"
 
 #if defined(ADDRESS_SANITIZER) && defined(OS_MACOSX)
@@ skipping 54 matching lines @@
 const char *kAsanDefaultOptions =
     "strict_memcmp=0 symbolize=false check_printf=1 use_sigaltstack=1 "
     "detect_leaks=0 strip_path_prefix=Release/../../ fast_unwind_on_fatal=1 "
     "detect_stack_use_after_return=1 ";
 #endif  // GOOGLE_CHROME_BUILD
 
 #elif defined(OS_MACOSX)
 const char *kAsanDefaultOptions =
     "strict_memcmp=0 replace_intrin=0 check_printf=1 use_sigaltstack=1 "
     "strip_path_prefix=Release/../../ fast_unwind_on_fatal=1 "
-    "detect_stack_use_after_return=1 detect_odr_violation=0 ";
+    "detect_stack_use_after_return=1 ";
 static const char kNaClDefaultOptions[] = "handle_segv=0";
 static const char kNaClFlag[] = "--type=nacl-loader";
 #endif  // OS_LINUX
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 extern "C"
 __attribute__((no_sanitize_address))
 __attribute__((visibility("default")))
 // The function isn't referenced from the executable itself. Make sure it isn't
 // stripped by the linker.
@@ skipping 50 matching lines @@
 __attribute__((no_sanitize_thread))
 __attribute__((visibility("default")))
 // The function isn't referenced from the executable itself. Make sure it isn't
 // stripped by the linker.
 __attribute__((used))
 const char *__tsan_default_suppressions() {
   return kTSanDefaultSuppressions;
 }
 
 #endif  // THREAD_SANITIZER && OS_LINUX