Static Analyzer diagnostics visualization: when the last location on a path is end of the function, the arrow should point to the closing brace, not the statement before it. Patch by Ted Kremenek.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136761 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/StaticAnalyzer/Core/BugReporter.cpp b/lib/StaticAnalyzer/Core/BugReporter.cpp
index 84535d5..de59943 100644
--- a/lib/StaticAnalyzer/Core/BugReporter.cpp
+++ b/lib/StaticAnalyzer/Core/BugReporter.cpp
@@ -1233,14 +1233,29 @@
BugReport::getEndPath(BugReporterContext& BRC,
const ExplodedNode* EndPathNode) {
- const Stmt* S = getStmt();
+ const ProgramPoint &PP = EndPathNode->getLocation();
+ PathDiagnosticLocation L;
- if (!S)
- return NULL;
+ if (const BlockEntrance *BE = dyn_cast<BlockEntrance>(&PP)) {
+ const CFGBlock *block = BE->getBlock();
+ if (block->getBlockID() == 0) {
+ L = PathDiagnosticLocation(
+ EndPathNode->getLocationContext()->getDecl()->getBodyRBrace(),
+ BRC.getSourceManager());
+ }
+ }
+
+ if (!L.isValid()) {
+ const Stmt* S = getStmt();
+
+ if (!S)
+ return NULL;
+
+ L = PathDiagnosticLocation(S, BRC.getSourceManager());
+ }
BugReport::ranges_iterator Beg, End;
llvm::tie(Beg, End) = getRanges();
- PathDiagnosticLocation L(S, BRC.getSourceManager());
// Only add the statement itself as a range if we didn't specify any
// special ranges for this report.