commit e19014c92464ef7bdc6d22c885fad76b4e4ffe17
author George Burgess IV <gbiv@google.com> Tue May 15 15:34:42 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 15 15:34:42 2018 -0700
tree 694e5a5209d8c2e320dfaea2a789a15e90d1debb
parent 910c257a72268f57dd59adc99b31256541be0327
parent e51fcf01bd63191a29e363bdd0592f0c12227064

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

Change-Id: I2a146a0ee711f29a3896ed8b8ce18a5a04b15043

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