From e8ef4cc053257c8cc330d4995aa775785e7f3f04 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 26 Aug 2011 21:36:12 +0000 Subject: [PATCH] Update the dominator tree with the correct dominator for the new 'unwind' block. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138664 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/DwarfEHPrepare.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/CodeGen/DwarfEHPrepare.cpp b/lib/CodeGen/DwarfEHPrepare.cpp index d2b129a448e..ed9e409d3e5 100644 --- a/lib/CodeGen/DwarfEHPrepare.cpp +++ b/lib/CodeGen/DwarfEHPrepare.cpp @@ -693,6 +693,7 @@ bool DwarfEHPrepare::InsertUnwindResumeCalls() { // Extract the exception object from the ResumeInst and add it to the PHI node // that feeds the _Unwind_Resume call. + BasicBlock *UnwindBBDom = Resumes[0]->getParent(); for (SmallVectorImpl::iterator I = Resumes.begin(), E = Resumes.end(); I != E; ++I) { ResumeInst *RI = *I; @@ -700,6 +701,7 @@ bool DwarfEHPrepare::InsertUnwindResumeCalls() { ExtractValueInst *ExnObj = ExtractValueInst::Create(RI->getOperand(0), 0, "exn.obj", RI); PN->addIncoming(ExnObj, RI->getParent()); + UnwindBBDom = DT->findNearestCommonDominator(RI->getParent(), UnwindBBDom); RI->eraseFromParent(); } @@ -709,6 +711,9 @@ bool DwarfEHPrepare::InsertUnwindResumeCalls() { // We never expect _Unwind_Resume to return. new UnreachableInst(Ctx, UnwindBB); + + // Now update DominatorTree analysis information. + DT->addNewBlock(UnwindBB, UnwindBBDom); return true; }