1 files changed, 5 insertions, 3 deletions
diff --git a/lib/Analysis/DataStructure/EquivClassGraphs.cpp b/lib/Analysis/DataStructure/EquivClassGraphs.cpp
index 83b9d9a3f8..a778d94c58 100644
--- a/lib/Analysis/DataStructure/EquivClassGraphs.cpp
+++ b/lib/Analysis/DataStructure/EquivClassGraphs.cpp
@@ -271,7 +271,7 @@ void EquivClassGraphs::buildIndirectFunctionSets(Module &M) {
         
         // Clone this member of the equivalence class into MergedG.
         DSGraph::NodeMapTy NodeMap;    
-        MergedG.cloneInto(CBUGraph, MergedG.getReturnNodes(), NodeMap, 0);
+        MergedG.cloneInto(CBUGraph, NodeMap);
       }
       
       // Merge the return nodes of all functions together.
@@ -362,8 +362,10 @@ processSCC(DSGraph &FG, std::vector<DSGraph*> &Stack, unsigned &NextID,
 
     // If the SCC found is not the same as those found in CBU, make sure to
     // merge the graphs as appropriate.
-    DSGraph::NodeMapTy NodeMap;
-    FG.cloneInto(*NG, FG.getReturnNodes(), NodeMap);
+    {
+      DSGraph::NodeMapTy NodeMap;
+      FG.cloneInto(*NG, NodeMap);
+    }
 
     // Update the DSInfo map and delete the old graph...
     for (DSGraph::retnodes_iterator I = NG->retnodes_begin();