replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EdgeBuilder::cleanUpLocation() should used the PathDiagnosticLocation constructor for a single point, not a range. 

llvm-svn: 71477
This commit is contained in:
Ted Kremenek 2009-05-11 21:42:34 +00:00
parent dc99ec4ebd
commit c0b879b4a7
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
clang/lib/Analysis/BugReporter.cpp
View File

@ -777,36 +777,51 @@ class VISIBILITY_HIDDEN EdgeBuilder {
PathDiagnosticLocation getContextLocation(const PathDiagnosticLocation &L);
PathDiagnosticLocation cleanUpLocation(const PathDiagnosticLocation &L) {
PathDiagnosticLocation cleanUpLocation(PathDiagnosticLocation L,
bool firstCharOnly = false) {
if (const Stmt *S = L.asStmt()) {
const Stmt *Original = S;
while (1) {
// Adjust the location for some expressions that are best referenced
// by one of their subexpressions.
if (const ParenExpr *PE = dyn_cast<ParenExpr>(S))
S = PE->IgnoreParens();
else if (const ConditionalOperator *CO = dyn_cast<ConditionalOperator>(S))
S = CO->getCond();
else if (const ChooseExpr *CE = dyn_cast<ChooseExpr>(S))
S = CE->getCond();
else if (const BinaryOperator *BE = dyn_cast<BinaryOperator>(S))
S = BE->getLHS();
else
break;
switch (S->getStmtClass()) {
default:
break;
case Stmt::ParenExprClass:
S = cast<ParenExpr>(S)->IgnoreParens();
firstCharOnly = true;
continue;
case Stmt::ConditionalOperatorClass:
S = cast<ConditionalOperator>(S)->getCond();
firstCharOnly = true;
continue;
case Stmt::ChooseExprClass:
S = cast<ChooseExpr>(S)->getCond();
firstCharOnly = true;
continue;
case Stmt::BinaryOperatorClass:
S = cast<BinaryOperator>(S)->getLHS();
firstCharOnly = true;
continue;
}
break;
}
return PathDiagnosticLocation(S, L.getManager());
if (S != Original)
L = PathDiagnosticLocation(S, L.getManager());
}
if (firstCharOnly)
L = PathDiagnosticLocation(L.asLocation());
return L;
}
void popLocation() {
if (!CLocs.back().isDead() && CLocs.back().asLocation().isFileID()) {
PathDiagnosticLocation L = cleanUpLocation(CLocs.back());
// For contexts, we only one the first character as the range.
L = PathDiagnosticLocation(L.asLocation(), L.getManager());
rawAddEdge(L);
rawAddEdge( cleanUpLocation(CLocs.back(), true));
}
CLocs.pop_back();
}