diff options
Diffstat (limited to 'lib/CodeGen/CGCXXTemp.cpp')
| -rw-r--r-- | lib/CodeGen/CGCXXTemp.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/CodeGen/CGCXXTemp.cpp b/lib/CodeGen/CGCXXTemp.cpp index 177c6db3e8..4768556f6b 100644 --- a/lib/CodeGen/CGCXXTemp.cpp +++ b/lib/CodeGen/CGCXXTemp.cpp @@ -54,7 +54,13 @@ void CodeGenFunction::PopCXXTemporary() { assert(!CleanupInfo.EndBlock && "Should not have an end block for temporary cleanup!"); - EmitBlock(Info.DtorBlock); + llvm::BasicBlock *CurBB = Builder.GetInsertBlock(); + if (CurBB && !CurBB->getTerminator() && + Info.DtorBlock->getNumUses() == 0) { + CurBB->getInstList().splice(CurBB->end(), Info.DtorBlock->getInstList()); + delete Info.DtorBlock; + } else + EmitBlock(Info.DtorBlock); llvm::BasicBlock *CondEnd = 0; |