diff --git a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
index 8dc01e5..d3a4ec5 100644
--- a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
@@ -128,7 +128,7 @@
 void DwarfCFIException::EndFunction() {
   if (!shouldEmitMoves && !shouldEmitTable) return;
 
-  if (shouldEmitMoves)
+  if (shouldEmitMoves || shouldEmitTable)
     Asm->OutStreamer.EmitCFIEndProc();
 
   Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_end",