From c14f59cb72ab025a7c8d4d290d0dae776c1f33c3 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 23 Mar 2005 20:12:08 +0000 Subject: [PATCH] turn a dead conditional into an assert. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20787 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/DataStructure/DataStructure.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index a84c4fe0322..45b27733e2e 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -1347,6 +1347,9 @@ void DSGraph::mergeInGraph(const DSCallSite &CS, const DSGraph &Graph, unsigned CloneFlags) { TIME_REGION(X, "mergeInGraph"); + assert((CloneFlags & DontCloneCallNodes) && + "Doesn't support copying of call nodes!"); + // If this is not a recursive call, clone the graph into this graph... if (&Graph == this) { // Merge the return value with the return value of the context. @@ -1381,13 +1384,6 @@ void DSGraph::mergeInGraph(const DSCallSite &CS, RC.merge(CS.getPtrArg(i), Args[i+1]); } - // If requested, copy all of the calls. - if (!(CloneFlags & DontCloneCallNodes)) { - // Copy the function calls list. - for (fc_iterator I = Graph.fc_begin(), E = Graph.fc_end(); I != E; ++I) - FunctionCalls.push_back(DSCallSite(*I, RC)); - } - // If the user has us copying aux calls (the normal case), set up a data // structure to keep track of which ones we've copied over. std::set CopiedAuxCall; @@ -1405,10 +1401,10 @@ void DSGraph::mergeInGraph(const DSCallSite &CS, // If requested, copy any aux calls that can reach copied nodes. for (afc_iterator I = Graph.afc_begin(), E = Graph.afc_end(); I!=E; ++I) - if (CopiedAuxCall.insert(&*I).second && - PathExistsToClonedNode(*I, RC)) { + if (!CopiedAuxCall.count(&*I) && PathExistsToClonedNode(*I, RC)) { AuxFunctionCalls.push_back(DSCallSite(*I, RC)); MadeChange = true; + CopiedAuxCall.insert(&*I); } } }