From 464ceb4ec8524517caa109397a59adcf4262947c Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 20 Feb 2009 00:25:28 +0000 Subject: [PATCH] map source ranges through macro expansions. Before: t.m:5:2: error: invalid operands to binary expression ('typeof(P)' (aka 'struct mystruct') and 'typeof(F)' (aka 'float')) MAX(P, F); ^~~~~~~~~ t.m:1:78: note: instantiated from: #define MAX(A,B) ({ __typeof__(A) __a = (A); __typeof__(B) __b = (B); __a < __b ? __b : __a; }) ^ (no ranges on the second diagnostics) After: t.m:5:2: error: invalid operands to binary expression ('typeof(P)' (aka 'struct mystruct') and 'typeof(F)' (aka 'float')) MAX(P, F); ^~~~~~~~~ t.m:1:78: note: instantiated from: #define MAX(A,B) ({ __typeof__(A) __a = (A); __typeof__(B) __b = (B); __a < __b ? __b : __a; }) ~~~ ^ ~~~ (ranges!) llvm-svn: 65090 --- clang/include/clang/Driver/TextDiagnosticPrinter.h | 2 +- clang/lib/Driver/TextDiagnosticPrinter.cpp | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/clang/include/clang/Driver/TextDiagnosticPrinter.h b/clang/include/clang/Driver/TextDiagnosticPrinter.h index 3f4f06a2c775..8d702b4934e1 100644 --- a/clang/include/clang/Driver/TextDiagnosticPrinter.h +++ b/clang/include/clang/Driver/TextDiagnosticPrinter.h @@ -47,7 +47,7 @@ public: const std::string &SourceLine); void EmitCaretDiagnostic(SourceLocation Loc, - const SourceRange *Ranges, unsigned NumRanges, + SourceRange *Ranges, unsigned NumRanges, SourceManager &SM); virtual void HandleDiagnostic(Diagnostic::Level DiagLevel, diff --git a/clang/lib/Driver/TextDiagnosticPrinter.cpp b/clang/lib/Driver/TextDiagnosticPrinter.cpp index 31b492a27a99..b5226f5131e2 100644 --- a/clang/lib/Driver/TextDiagnosticPrinter.cpp +++ b/clang/lib/Driver/TextDiagnosticPrinter.cpp @@ -102,7 +102,7 @@ void TextDiagnosticPrinter::HighlightRange(const SourceRange &R, } void TextDiagnosticPrinter::EmitCaretDiagnostic(SourceLocation Loc, - const SourceRange *Ranges, + SourceRange *Ranges, unsigned NumRanges, SourceManager &SM) { assert(!Loc.isInvalid() && "must have a valid source location here"); @@ -113,7 +113,18 @@ void TextDiagnosticPrinter::EmitCaretDiagnostic(SourceLocation Loc, SourceLocation OneLevelUp = SM.getImmediateInstantiationRange(Loc).first; EmitCaretDiagnostic(OneLevelUp, Ranges, NumRanges, SM); + // Map the location through the macro. Loc = SM.getInstantiationLoc(SM.getImmediateSpellingLoc(Loc)); + + // Map the ranges. + for (unsigned i = 0; i != NumRanges; ++i) { + SourceLocation S = Ranges[i].getBegin(), E = Ranges[i].getEnd(); + if (S.isMacroID()) + S = SM.getInstantiationLoc(SM.getImmediateSpellingLoc(S)); + if (E.isMacroID()) + E = SM.getInstantiationLoc(SM.getImmediateSpellingLoc(E)); + Ranges[i] = SourceRange(S, E); + } // Emit the file/line/column that this expansion came from. OS << SM.getBufferName(Loc) << ':' << SM.getInstantiationLineNumber(Loc)