Fix diagnostic regression where the leak diagnostic could appear earlier in the path than the branches taken.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65407 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 3a88877..faf7839 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -2698,12 +2698,18 @@
Stmt *S = 0;
while (LeakN) {
+ bool atBranch = false;
ProgramPoint P = LeakN->getLocation();
if (const PostStmt *PS = dyn_cast<PostStmt>(&P))
S = PS->getStmt();
- else if (const BlockEdge *BE = dyn_cast<BlockEdge>(&P))
+ else if (const BlockEdge *BE = dyn_cast<BlockEdge>(&P)) {
+ // FIXME: What we really want is to set LeakN to be the node
+ // for the BlockEntrance for the branch we took and have BugReporter
+ // do the right thing.
+ atBranch = true;
S = BE->getSrc()->getTerminator();
+ }
if (S) {
// Scan 'S' for uses of Sym.
@@ -2734,6 +2740,10 @@
break;
}
+ // Don't traverse any higher than the branch.
+ if (atBranch)
+ break;
+
LeakN = LeakN->pred_empty() ? 0 : *(LeakN->pred_begin());
}