From 3ef538dd1bb1001fa1a1d50594d13f480a8dfa21 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Mon, 11 May 2009 23:50:59 +0000 Subject: [PATCH] BugReport::getEndPath() - Only add a Stmt's range to the constructed PathDiagnosticEventPiece if the BugReport contained no explicit ranges. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71516 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Analysis/PathDiagnostic.h | 9 +++++---- lib/Analysis/BugReporter.cpp | 13 ++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/include/clang/Analysis/PathDiagnostic.h b/include/clang/Analysis/PathDiagnostic.h index 16b9b06f7b..994b35e5ef 100644 --- a/include/clang/Analysis/PathDiagnostic.h +++ b/include/clang/Analysis/PathDiagnostic.h @@ -244,11 +244,12 @@ class PathDiagnosticEventPiece : public PathDiagnosticSpotPiece { public: PathDiagnosticEventPiece(const PathDiagnosticLocation &pos, - const std::string& s) - : PathDiagnosticSpotPiece(pos, s, Event) {} + const std::string& s, bool addPosRange = true) + : PathDiagnosticSpotPiece(pos, s, Event, addPosRange) {} - PathDiagnosticEventPiece(const PathDiagnosticLocation &pos, const char* s) - : PathDiagnosticSpotPiece(pos, s, Event) {} + PathDiagnosticEventPiece(const PathDiagnosticLocation &pos, const char* s, + bool addPosRange = true) + : PathDiagnosticSpotPiece(pos, s, Event, addPosRange) {} ~PathDiagnosticEventPiece(); diff --git a/lib/Analysis/BugReporter.cpp b/lib/Analysis/BugReporter.cpp index 23f3342399..4726eacb32 100644 --- a/lib/Analysis/BugReporter.cpp +++ b/lib/Analysis/BugReporter.cpp @@ -1198,13 +1198,16 @@ BugReport::getEndPath(BugReporterContext& BRC, if (!S) return NULL; - - FullSourceLoc L(S->getLocStart(), BRC.getSourceManager()); - PathDiagnosticPiece* P = new PathDiagnosticEventPiece(L, getDescription()); - + const SourceRange *Beg, *End; - getRanges(BRC.getBugReporter(), Beg, End); + getRanges(BRC.getBugReporter(), Beg, End); + PathDiagnosticLocation L(S, BRC.getSourceManager()); + // Only add the statement itself as a range if we didn't specify any + // special ranges for this report. + PathDiagnosticPiece* P = new PathDiagnosticEventPiece(L, getDescription(), + Beg == End); + for (; Beg != End; ++Beg) P->addRange(*Beg); -- 2.40.0