Adjust for new DSGraph API

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

diff --git a/lib/Analysis/DataStructure/IPModRef.cpp b/lib/Analysis/DataStructure/IPModRef.cpp
index a8aa6c2ec0f78c6aea2b424421cfb8db140759a8..86bddc8a8d9af1df51129094ee39172d4be2c760 100644 (file)
--- a/lib/Analysis/DataStructure/IPModRef.cpp
+++ b/lib/Analysis/DataStructure/IPModRef.cpp
@@ -166,7 +166,7 @@ DSGraph* FunctionModRefInfo::ResolveCallSiteModRefInfo(CallInst &CI,
 
       // Perform the merging now of the graph for the callee, which will
       // come with mod/ref bits set...
-      Result->mergeInGraph(CS, IPModRefObj.getBUDSGraph(*F),
+      Result->mergeInGraph(CS, *F, IPModRefObj.getBUDSGraph(*F),
                            DSGraph::StripAllocaBit
                            | DSGraph::DontCloneCallNodes
                            | DSGraph::DontCloneAuxCallNodes);

diff --git a/lib/Analysis/IPA/IPModRef.cpp b/lib/Analysis/IPA/IPModRef.cpp
index a8aa6c2ec0f78c6aea2b424421cfb8db140759a8..86bddc8a8d9af1df51129094ee39172d4be2c760 100644 (file)
--- a/lib/Analysis/IPA/IPModRef.cpp
+++ b/lib/Analysis/IPA/IPModRef.cpp
@@ -166,7 +166,7 @@ DSGraph* FunctionModRefInfo::ResolveCallSiteModRefInfo(CallInst &CI,
 
       // Perform the merging now of the graph for the callee, which will
       // come with mod/ref bits set...
-      Result->mergeInGraph(CS, IPModRefObj.getBUDSGraph(*F),
+      Result->mergeInGraph(CS, *F, IPModRefObj.getBUDSGraph(*F),
                            DSGraph::StripAllocaBit
                            | DSGraph::DontCloneCallNodes
                            | DSGraph::DontCloneAuxCallNodes);