diff options
| -rw-r--r-- | include/llvm/Analysis/DSGraph.h | 5 | ||||
| -rw-r--r-- | include/llvm/Analysis/DataStructure/DSGraph.h | 5 | ||||
| -rw-r--r-- | lib/Analysis/DataStructure/BottomUpClosure.cpp | 4 | ||||
| -rw-r--r-- | lib/Analysis/DataStructure/DataStructure.cpp | 3 | ||||
| -rw-r--r-- | lib/Analysis/DataStructure/TopDownClosure.cpp | 4 |
5 files changed, 5 insertions, 16 deletions
diff --git a/include/llvm/Analysis/DSGraph.h b/include/llvm/Analysis/DSGraph.h index 6eed55ddf7..6fa4d6eeca 100644 --- a/include/llvm/Analysis/DSGraph.h +++ b/include/llvm/Analysis/DSGraph.h @@ -579,14 +579,11 @@ public: // is filled into the OldValMap member. // If StripScalars (StripAllocas) is set to true, Scalar (Alloca) markers // are removed from the graph as the graph is being cloned. - // If CopyCallers is set to true, the PendingCallers list is copied. - // If CopyOrigCalls is set to true, the OrigFunctionCalls list is copied. // DSNodeHandle cloneInto(const DSGraph &G, std::map<Value*, DSNodeHandle> &OldValMap, std::map<const DSNode*, DSNode*> &OldNodeMap, - bool StripScalars = false, bool StripAllocas = false, - bool CopyCallers = true, bool CopyOrigCalls = true); + bool StripScalars = false, bool StripAllocas = false); #if 0 // cloneGlobalInto - Clone the given global node (or the node for the given diff --git a/include/llvm/Analysis/DataStructure/DSGraph.h b/include/llvm/Analysis/DataStructure/DSGraph.h index 6eed55ddf7..6fa4d6eeca 100644 --- a/include/llvm/Analysis/DataStructure/DSGraph.h +++ b/include/llvm/Analysis/DataStructure/DSGraph.h @@ -579,14 +579,11 @@ public: // is filled into the OldValMap member. // If StripScalars (StripAllocas) is set to true, Scalar (Alloca) markers // are removed from the graph as the graph is being cloned. - // If CopyCallers is set to true, the PendingCallers list is copied. - // If CopyOrigCalls is set to true, the OrigFunctionCalls list is copied. // DSNodeHandle cloneInto(const DSGraph &G, std::map<Value*, DSNodeHandle> &OldValMap, std::map<const DSNode*, DSNode*> &OldNodeMap, - bool StripScalars = false, bool StripAllocas = false, - bool CopyCallers = true, bool CopyOrigCalls = true); + bool StripScalars = false, bool StripAllocas = false); #if 0 // cloneGlobalInto - Clone the given global node (or the node for the given diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp index 73786c96c5..6d1a575e6b 100644 --- a/lib/Analysis/DataStructure/BottomUpClosure.cpp +++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp @@ -157,9 +157,7 @@ DSGraph &BUDataStructures::calculateGraph(Function &F) { // structure graph. Strip locals and don't copy the list of callers DSNodeHandle RetVal = Graph->cloneInto(GI, OldValMap, OldNodeMap, /*StripScalars*/ true, - /*StripAllocas*/ true, - /*CopyCallers*/ false, - /*CopyOrigCalls*/ false); + /*StripAllocas*/ true); // Resolve the arguments in the call to the actual values... ResolveArguments(Call, FI, OldValMap); diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index 4b3be84aaf..91c9a7cbd2 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -423,8 +423,7 @@ void DSNode::remapLinks(std::map<const DSNode*, DSNode*> &OldNodeMap) { DSNodeHandle DSGraph::cloneInto(const DSGraph &G, std::map<Value*, DSNodeHandle> &OldValMap, std::map<const DSNode*, DSNode*> &OldNodeMap, - bool StripScalars, bool StripAllocas, - bool CopyCallers, bool CopyOrigCalls) { + bool StripScalars, bool StripAllocas) { assert(OldNodeMap.empty() && "Returned OldNodeMap should be empty!"); unsigned FN = Nodes.size(); // First new node... diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp index c573a52c9e..1fed1ab9a9 100644 --- a/lib/Analysis/DataStructure/TopDownClosure.cpp +++ b/lib/Analysis/DataStructure/TopDownClosure.cpp @@ -134,9 +134,7 @@ DSGraph &TDDataStructures::calculateGraph(Function &F) { // DSNodeHandle RetVal = Graph->cloneInto(CG, OldValMap, OldNodeMap, /*StripScalars*/ true, - /*StripAllocas*/ false, - /*CopyCallers*/ true, - /*CopyOrigCalls*/false); + /*StripAllocas*/ false); ResolveCallSite(*Graph, DSCallSite(CallSiteInCG, OldNodeMap)); } } |