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

It was causing strange test failures in Mac ASan builds.

BUG=431803, 440602
NOTRY=true
TBR=thakis

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

Cr-Original-Commit-Position: refs/heads/master@{#307594}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d43941e4aca78576419b8ca2d74a416b4af17d84

common.gypi

@@ -2521,9 +2521,6 @@
         # code generated by flex (used in angle) contains that keyword.
         # http://crbug.com/255186
         '-Wno-deprecated-register',
-
-        # TODO(hans): Get this cleaned up.
-        '-Wno-inconsistent-missing-override',
       ],
     },
     'includes': [ 'set_clang_warning_flags.gypi', ],
@@ -4238,7 +4235,7 @@
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
-                  '-fsanitize-coverage=<(asan_coverage)',
+                  '-mllvm -asan-coverage=<(asan_coverage)',
                 ],
               }],
             ],
@@ -4609,6 +4606,16 @@
                   # TODO(eugenis): find a way to reenable this.
                   '-mllvm -asan-globals=0',
                 ],
+                'conditions': [
+                  ['target_arch=="arm"', {
+                    'ldflags': [
+                      # TODO(hans): The ASan runtime is no longer automatically
+                      # added to the link line when using -nostdlib. Can we
+                      # stop adding -nostdlib? (crbug.com/423429)
+                      '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/lib/clang/3.6.0/lib/linux/libclang_rt.asan-arm-android.so',
+                    ],
+                  }],
+                ],
               }],
               ['android_webview_build==0', {
                 'defines': [
@@ -4901,7 +4908,7 @@
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
-                  '-fsanitize-coverage=<(asan_coverage)',
+                  '-mllvm -asan-coverage=<(asan_coverage)',
                 ],
               }],
             ],

config/compiler/BUILD.gn

@@ -762,9 +762,6 @@ config("default_warnings") {
 
         # TODO(thakis): Remove, http://crbug.com/263960
         "-Wno-reserved-user-defined-literal",
-
-        # TODO(hans): Get this cleaned up.
-        "-Wno-inconsistent-missing-override",
       ]
     }
     if (gcc_version >= 48) {

sanitizers/sanitizer_options.cc

@@ -72,7 +72,7 @@ const char *kAsanDefaultOptions =
 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