Fix IPModRef to use new DS interface

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

diff --git a/lib/Analysis/DataStructure/IPModRef.cpp b/lib/Analysis/DataStructure/IPModRef.cpp
index 3631514b5576b59c3fe25d6caf141a423d335346..3832cb3cad19a8b94a4b50a7707546257970fc74 100644 (file)
--- a/lib/Analysis/DataStructure/IPModRef.cpp
+++ b/lib/Analysis/DataStructure/IPModRef.cpp
@@ -117,14 +117,7 @@ DSGraph *FunctionModRefInfo::ResolveCallSiteModRefInfo(CallInst &CI,
                                std::map<const DSNode*, DSNodeHandle> &NodeMap) {
 
   // Step #1: Clone the top-down graph...
-  std::map<const DSNode*, DSNode*> RawNodeMap;
-  DSGraph *Result = new DSGraph(funcTDGraph, RawNodeMap);
-
-  // Convert the NodeMap from a map to DSNode* to be a map to DSNodeHandle's
-  NodeMap.insert(RawNodeMap.begin(), RawNodeMap.end());
-
-  // We are now done with the old map... so free it's memory...
-  RawNodeMap.clear();
+  DSGraph *Result = new DSGraph(funcTDGraph, NodeMap);
 
   // Step #2: Clear Mod/Ref information...
   Result->maskNodeTypes(~(DSNode::Modified | DSNode::Read));

diff --git a/lib/Analysis/IPA/IPModRef.cpp b/lib/Analysis/IPA/IPModRef.cpp
index 3631514b5576b59c3fe25d6caf141a423d335346..3832cb3cad19a8b94a4b50a7707546257970fc74 100644 (file)
--- a/lib/Analysis/IPA/IPModRef.cpp
+++ b/lib/Analysis/IPA/IPModRef.cpp
@@ -117,14 +117,7 @@ DSGraph *FunctionModRefInfo::ResolveCallSiteModRefInfo(CallInst &CI,
                                std::map<const DSNode*, DSNodeHandle> &NodeMap) {
 
   // Step #1: Clone the top-down graph...
-  std::map<const DSNode*, DSNode*> RawNodeMap;
-  DSGraph *Result = new DSGraph(funcTDGraph, RawNodeMap);
-
-  // Convert the NodeMap from a map to DSNode* to be a map to DSNodeHandle's
-  NodeMap.insert(RawNodeMap.begin(), RawNodeMap.end());
-
-  // We are now done with the old map... so free it's memory...
-  RawNodeMap.clear();
+  DSGraph *Result = new DSGraph(funcTDGraph, NodeMap);
 
   // Step #2: Clear Mod/Ref information...
   Result->maskNodeTypes(~(DSNode::Modified | DSNode::Read));