[analyzer; alternate arrows] the initializer of a ForStmt isn't interesting either.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@181356 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/StaticAnalyzer/Core/BugReporter.cpp b/lib/StaticAnalyzer/Core/BugReporter.cpp
index dd8aaae..7ee172a 100644
--- a/lib/StaticAnalyzer/Core/BugReporter.cpp
+++ b/lib/StaticAnalyzer/Core/BugReporter.cpp
@@ -1848,11 +1848,11 @@
}
}
-static bool isIncrementInForLoop(const Stmt *S, const Stmt *FL) {
+static bool isIncrementOrInitInForLoop(const Stmt *S, const Stmt *FL) {
const ForStmt *FS = dyn_cast<ForStmt>(FL);
- if (!FL)
+ if (!FS)
return false;
- return FS->getInc() == S;
+ return FS->getInc() == S || FS->getInit() == S;
}
typedef llvm::DenseSet<const PathDiagnosticCallPiece *>
@@ -1907,6 +1907,13 @@
// again.
return true;
}
+
+ // If the first edge (in isolation) is a transition from the
+ // initialization or increment in a for loop then remove it.
+ if (level1 && isIncrementOrInitInForLoop(s1Start, level1)) {
+ path.erase(I);
+ return true;
+ }
}
PathPieces::iterator NextI = I; ++NextI;
@@ -1956,15 +1963,16 @@
// NOTE: this will be limited later in cases where we add barriers
// to prevent this optimization.
//
- if (s1End && s1End == s2Start &&
- isa<Expr>(s1End) &&
- (PM.isConsumedExpr(cast<Expr>(s1End)) ||
- isIncrementInForLoop(s1End, level2)) &&
- (!level2 || !isConditionForTerminator(level2, s1End))) {
- PieceI->setEndLocation(PieceNextI->getEndLocation());
- path.erase(NextI);
- hasChanges = true;
- continue;
+ if (s1End && s1End == s2Start && level2) {
+ if (isIncrementOrInitInForLoop(s1End, level2) ||
+ (isa<Expr>(s1End) && PM.isConsumedExpr(cast<Expr>(s1End)) &&
+ !isConditionForTerminator(level2, s1End)))
+ {
+ PieceI->setEndLocation(PieceNextI->getEndLocation());
+ path.erase(NextI);
+ hasChanges = true;
+ continue;
+ }
}
// No changes at this index? Move to the next one.
