diff --git a/llvm/include/llvm/Analysis/DSGraph.h b/llvm/include/llvm/Analysis/DSGraph.h
index 66a4e6835e0c..9b283d382755 100644
--- a/llvm/include/llvm/Analysis/DSGraph.h
+++ b/llvm/include/llvm/Analysis/DSGraph.h
@@ -43,7 +43,7 @@ public:
   // destination graph, you may optionally do this by specifying a map to record
   // this into.
   DSGraph(const DSGraph &DSG);
-  DSGraph(const DSGraph &DSG, std::map<const DSNode*, DSNode*> &BUNodeMap);
+  DSGraph(const DSGraph &DSG, std::map<const DSNode*, DSNodeHandle> &NodeMap);
   ~DSGraph();
 
   bool hasFunction() const { return Func != 0; }
@@ -138,7 +138,7 @@ public:
   //
   DSNodeHandle cloneInto(const DSGraph &G,
                          std::map<Value*, DSNodeHandle> &OldValMap,
-                         std::map<const DSNode*, DSNode*> &OldNodeMap,
+                         std::map<const DSNode*, DSNodeHandle> &OldNodeMap,
                          AllocaBit StripAllocas = KeepAllocaBit);
 
   /// mergeInGraph - The method is used for merging graphs together.  If the
diff --git a/llvm/include/llvm/Analysis/DSNode.h b/llvm/include/llvm/Analysis/DSNode.h
index 346188da88e5..2b01ec595cbb 100644
--- a/llvm/include/llvm/Analysis/DSNode.h
+++ b/llvm/include/llvm/Analysis/DSNode.h
@@ -198,7 +198,7 @@ public:
 
   /// remapLinks - Change all of the Links in the current node according to the
   /// specified mapping.
-  void remapLinks(std::map<const DSNode*, DSNode*> &OldNodeMap);
+  void remapLinks(std::map<const DSNode*, DSNodeHandle> &OldNodeMap);
 
 private:
   friend class DSNodeHandle;