From: Bill Wendling <isanbard@gmail.com>
Date: Tue, 6 Dec 2011 22:18:12 +0000 (+0000)
Subject: Re-enable compact unwind. It seems to work now. <rdar://problem/10441838>
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=054a8be1544191b6107771dbae15b916110d8a2a;p=oota-llvm.git

Re-enable compact unwind. It seems to work now. <rdar://problem/10441838>

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

diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp
index d2bbd7d559d..8157b4177a1 100644
--- a/lib/MC/MCDwarf.cpp
+++ b/lib/MC/MCDwarf.cpp
@@ -1009,10 +1009,7 @@ void MCDwarfFrameEmitter::Emit(MCStreamer &Streamer,
   ArrayRef<MCDwarfFrameInfo> FrameArray = Streamer.getFrameInfos();
 
   // Emit the compact unwind info if available.
-  // FIXME: This emits both the compact unwind and the old CIE/FDE
-  //        information. Only one of those is needed.
-  // FIXME: Disable. This seems to still be causing failures.
-  if (false && IsEH && MOFI->getCompactUnwindSection())
+  if (IsEH && MOFI->getCompactUnwindSection())
     for (unsigned i = 0, n = Streamer.getNumFrameInfos(); i < n; ++i) {
       const MCDwarfFrameInfo &Frame = Streamer.getFrameInfo(i);
       if (Frame.CompactUnwindEncoding)