Change the include stack of "instantiated from" notes to fall under the control of f/fno-diagnostics-show-note-include-stack flags. This should help with reducing diagnostic spew from macros instantiations.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@132143 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 10 insertions, 0 deletions

diff --git a/test/Misc/include-stack-for-note-flag.cpp b/test/Misc/include-stack-for-note-flag.cpp
index f8d0080f57..328999ded0 100644
--- a/test/Misc/include-stack-for-note-flag.cpp
+++ b/test/Misc/include-stack-for-note-flag.cpp
@@ -9,10 +9,20 @@ int test() {
   return foo(1, 1);
 }
 
+bool macro(int x, int y) {
+  return EQUALS(&x, y);
+}
+
 // STACK: error: no matching function for call to 'foo'
 // STACK:  In file included from
 // STACK: note: candidate function not viable
+// STACK: error: comparison between pointer and integer
+// STACK:  In file included from
+// STACK: note: instantiated from:
 
 // STACKLESS: error: no matching function for call to 'foo'
 // STACKLESS-NOT:  In file included from
 // STACKLESS: note: candidate function not viable
+// STACKLESS: error: comparison between pointer and integer
+// STACKLESS-NOT:  In file included from
+// STACKLESS: note: instantiated from: