When creating PathDiagnostics, created a trimmed graph first and report the
BFS path to the root. This also avoids problems with loops in the ExplodedGraph.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49133 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/BugReporter.cpp b/lib/Analysis/BugReporter.cpp
index 2ae0960..db979fa 100644
--- a/lib/Analysis/BugReporter.cpp
+++ b/lib/Analysis/BugReporter.cpp
@@ -69,8 +69,26 @@
SourceManager& SMgr = Ctx.getSourceManager();
-
llvm::OwningPtr<ExplodedGraph<GRExprEngine> > GTrim(G.Trim(&N, &N+1));
+
+ // Find the sink in the trimmed graph.
+ // FIXME: Should we eventually have a sink iterator?
+
+ ExplodedNode<ValueState>* NewN = 0;
+
+ for (ExplodedGraph<GRExprEngine>::node_iterator
+ I = GTrim->nodes_begin(), E = GTrim->nodes_end(); I != E; ++I) {
+
+ if (I->isSink()) {
+ NewN = &*I;
+ break;
+ }
+ }
+
+ assert (NewN);
+ assert (NewN->getLocation() == N->getLocation());
+
+ N = NewN;
while (!N->pred_empty()) {