From: Duncan Sands <baldrick@free.fr>
Date: Sat, 14 Jan 2012 17:16:48 +0000 (+0000)
Subject: Speculatively revert commit 148175 (rafael), to see if this fixes
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c464e998e6db00e72c65f9ae10e4a40bf34ceb83;p=oota-llvm.git

Speculatively revert commit 148175 (rafael), to see if this fixes
non-determinism in the 32 bit dragonegg buildbot.  Original commit
message:
Only emit the Leh_func_endN symbol when needed.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148191 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
index d975f1f97be..8ed4f4c43a7 100644
--- a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
@@ -142,14 +142,12 @@ void DwarfCFIException::EndFunction() {
 
   Asm->OutStreamer.EmitCFIEndProc();
 
-  if (!shouldEmitPersonality)
-    return;
-
   Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_end",
                                                 Asm->getFunctionNumber()));
 
   // Map all labels and get rid of any dead landing pads.
   MMI->TidyLandingPads();
 
-  EmitExceptionTable();
+  if (shouldEmitPersonality)
+    EmitExceptionTable();
 }