OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -806,17 +806,18 @@ 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 {
if (const Stmt *grandparentX = PDB.getParent(parentX)) {
const PathDiagnosticLocation &W =
PDB.getEnclosingStmtLocation(PDB.getParent(parentX));
PDB.getEnclosingStmtLocation(grandparentX);
if (W != Y) X = W;
}
}
}
if (X != Y && PrevLoc.asLocation() != X.asLocation()) {
PD.push_front(new PathDiagnosticControlFlowPiece(X, PrevLoc));