From c478e52bf4c12691037856ee103c66946afeab6c Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Thu, 15 Jan 2009 18:40:09 +0000 Subject: [PATCH] avoid using iterators when they get invalidated potentially this fixes PR3332 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62271 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/InlineFunction.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 0b1105ecdcf..63b5f5475dd 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -155,8 +155,18 @@ static void UpdateCallGraphAfterInlining(CallSite CS, // Since we inlined some uninlined call sites in the callee into the caller, // add edges from the caller to all of the callees of the callee. - for (CallGraphNode::iterator I = CalleeNode->begin(), - E = CalleeNode->end(); I != E; ++I) { + CallGraphNode::iterator I = CalleeNode->begin(), E = CalleeNode->end(); + + // Consider the case where CalleeNode == CallerNode. + typedef std::pair CallRecord; + std::vector CallCache; + if (CalleeNode == CallerNode) { + CallCache.assign(I, E); + I = CallCache.begin(); + E = CallCache.end(); + } + + for (; I != E; ++I) { const Instruction *OrigCall = I->first.getInstruction(); DenseMap::iterator VMI = ValueMap.find(OrigCall); @@ -514,8 +524,8 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) { TheCall->replaceAllUsesWith(PHI); } - // Loop over all of the return instructions adding entries to the PHI node as - // appropriate. + // Loop over all of the return instructions adding entries to the PHI node + // as appropriate. if (PHI) { for (unsigned i = 0, e = Returns.size(); i != e; ++i) { ReturnInst *RI = Returns[i];