commit 806544287553d45e1ce0f08486883f67a5ed4723
author George Burgess IV <gbiv@google.com> Tue May 15 16:14:57 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 15 16:14:57 2018 -0700
tree 5193f44f222e2a04d5bf2a9408c321d326b17624
parent 0ec0360a1944c4572abadef26c4e332490a6f295
parent 63868edc922f8cf875eabb2888efd0c55ce89a04

Merge "Disable dtor inlining for clang-tidy" am: e51fcf01bd am: e19014c924
am: 63868edc92

Change-Id: I6aa30e1b886239a7de7eb2c69e067f7faf1b6688

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 39f1161..f68908b 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1724,10 +1724,19 @@
       my_tidy_flags += -quiet -extra-arg-before=-fno-caret-diagnostics
     endif
 
-    # We might be using the static analyzer through clang-tidy.
-    # https://bugs.llvm.org/show_bug.cgi?id=32914
     ifneq ($(my_tidy_checks),)
+      # We might be using the static analyzer through clang-tidy.
+      # https://bugs.llvm.org/show_bug.cgi?id=32914
       my_tidy_flags += -extra-arg-before=-D__clang_analyzer__
+
+      # A recent change in clang-tidy (r328258) enabled destructor inlining,
+      # which appears to cause a number of false positives. Until that's
+      # resolved, this turns off the effects of r328258.
+      # https://bugs.llvm.org/show_bug.cgi?id=37459
+      my_tidy_flags += -extra-arg-before=-Xclang
+      my_tidy_flags += -extra-arg-before=-analyzer-config
+      my_tidy_flags += -extra-arg-before=-Xclang
+      my_tidy_flags += -extra-arg-before=c++-temp-dtor-inlining=false
     endif
   endif
 endif