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.

llvm-svn: 136761
This commit is contained in:
Anna Zaks 2011-08-03 01:57:49 +00:00
parent cf901ed229
commit 59546b8f79
1 changed files with 19 additions and 4 deletions

View File

@ -1233,14 +1233,29 @@ PathDiagnosticPiece*
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.