diff options
| -rw-r--r-- | lib/Frontend/TextDiagnosticPrinter.cpp | 2 | ||||
| -rw-r--r-- | test/Misc/Inputs/include.h | 2 | ||||
| -rw-r--r-- | test/Misc/include-stack-for-note-flag.cpp | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lib/Frontend/TextDiagnosticPrinter.cpp b/lib/Frontend/TextDiagnosticPrinter.cpp index 0d048a3030..1c47bf7bee 100644 --- a/lib/Frontend/TextDiagnosticPrinter.cpp +++ b/lib/Frontend/TextDiagnosticPrinter.cpp @@ -343,7 +343,7 @@ void TextDiagnosticPrinter::EmitCaretDiagnostic(Diagnostic::Level Level, // "included from" lines. if (LastWarningLoc != PLoc.getIncludeLoc()) { LastWarningLoc = PLoc.getIncludeLoc(); - PrintIncludeStack(Level, LastWarningLoc, SM); + PrintIncludeStack(Diagnostic::Note, LastWarningLoc, SM); } if (DiagOpts->ShowLocation) { diff --git a/test/Misc/Inputs/include.h b/test/Misc/Inputs/include.h index d325775691..72835e90a5 100644 --- a/test/Misc/Inputs/include.h +++ b/test/Misc/Inputs/include.h @@ -1 +1,3 @@ +#define EQUALS(a,b) a == b + int foo(int x) { return x; } 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: |