1 files changed, 7 insertions, 3 deletions
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index 2fd8d638d6..b509843daa 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -77,9 +77,13 @@ void CodeGenFunction::FinishFunction(SourceLocation EndLoc) {
   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()) {