Add another null pointer check. Simplify condition.

llvm-svn: 68283
This commit is contained in:
Ted Kremenek 2009-04-02 03:44:00 +00:00
parent 7f905c2f0d
commit a2a735e7fa
1 changed files with 8 additions and 7 deletions

View File

@ -806,15 +806,16 @@ static void GenExtAddEdge(PathDiagnostic& PD,
// FIXME: We need a version of getParent that ignores '()' and casts.
const Stmt *parentY = PDB.getParent(Y.asStmt());
if (IsControlFlowExpr(parentX)) {
if (IsControlFlowExpr(parentY) && parentX == parentY) {
if (parentX && IsControlFlowExpr(parentX)) {
if (parentX == parentY)
break;
}
else {
const PathDiagnosticLocation &W =
PDB.getEnclosingStmtLocation(PDB.getParent(parentX));
if (W != Y) X = W;
if (const Stmt *grandparentX = PDB.getParent(parentX)) {
const PathDiagnosticLocation &W =
PDB.getEnclosingStmtLocation(grandparentX);
if (W != Y) X = W;
}
}
}