From: Chandler Carruth <chandlerc@gmail.com>
Date: Thu, 24 Apr 2014 07:48:18 +0000 (+0000)
Subject: [LCG] Switch the SCC's parent iterators to be value iterators rather
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=63ed439ab5ac43a4b36e347df35db84707fc6894;p=oota-llvm.git

[LCG] Switch the SCC's parent iterators to be value iterators rather
than pointer iterators.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207086 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Analysis/LazyCallGraph.h b/include/llvm/Analysis/LazyCallGraph.h
index 039b8d77521..24607b293fb 100644
--- a/include/llvm/Analysis/LazyCallGraph.h
+++ b/include/llvm/Analysis/LazyCallGraph.h
@@ -41,6 +41,7 @@
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/iterator.h"
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/Function.h"
@@ -228,7 +229,7 @@ public:
 
   public:
     typedef SmallVectorImpl<Node *>::const_iterator iterator;
-    typedef SmallSetVector<SCC *, 1>::const_iterator parent_iterator;
+    typedef pointee_iterator<SmallSetVector<SCC *, 1>::const_iterator> parent_iterator;
 
     iterator begin() const { return Nodes.begin(); }
     iterator end() const { return Nodes.end(); }
diff --git a/unittests/Analysis/LazyCallGraphTest.cpp b/unittests/Analysis/LazyCallGraphTest.cpp
index 22a95563fb4..781d98ee503 100644
--- a/unittests/Analysis/LazyCallGraphTest.cpp
+++ b/unittests/Analysis/LazyCallGraphTest.cpp
@@ -329,7 +329,7 @@ TEST(LazyCallGraphTest, InterSCCEdgeRemoval) {
 
   EXPECT_EQ("b", A.begin()->getFunction().getName());
   EXPECT_EQ(B.end(), B.begin());
-  EXPECT_EQ(&AC, *BC.parent_begin());
+  EXPECT_EQ(&AC, &*BC.parent_begin());
 
   CG.removeEdge(A, lookupFunction(*M, "b"));