diff --git a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
index d3a4ec592b1..70c0c8a82eb 100644
--- a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
@@ -128,8 +128,7 @@ void DwarfCFIException::BeginFunction(const MachineFunction *MF) {
 void DwarfCFIException::EndFunction() {
   if (!shouldEmitMoves && !shouldEmitTable) return;
 
-  if (shouldEmitMoves || shouldEmitTable)
-    Asm->OutStreamer.EmitCFIEndProc();
+  Asm->OutStreamer.EmitCFIEndProc();
 
   Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_end",
                                                 Asm->getFunctionNumber()));