Add another null pointer check. Simplify condition.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68283 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/BugReporter.cpp b/lib/Analysis/BugReporter.cpp
index 7637a16..2baef5e 100644
--- a/lib/Analysis/BugReporter.cpp
+++ b/lib/Analysis/BugReporter.cpp
@@ -806,15 +806,16 @@
// 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;
+ }
}
}