Skip emission of final return block if possible (e.g., functions with
a unified return).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63038 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index 2fd8d63..b509843 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -77,9 +77,13 @@
assert(BreakContinueStack.empty() &&
"mismatched push/pop in break/continue stack!");
- // Emit function epilog (to return). This has the nice side effect
- // of also automatically handling code that falls off the end.
- EmitBlock(ReturnBlock);
+ // Emit function epilog (to return). For cleanliness, skip emission
+ // if we know it is safe (when it is unused and the current block is
+ // unterminated).
+ if (!ReturnBlock->use_empty() ||
+ !Builder.GetInsertBlock() ||
+ Builder.GetInsertBlock()->getTerminator())
+ EmitBlock(ReturnBlock);
// Emit debug descriptor for function end.
if (CGDebugInfo *DI = CGM.getDebugInfo()) {