[llvm-commits] [llvm] r150814 - in /llvm/trunk: include/llvm/MC/MCObjectFileInfo.h lib/MC/MCObjectFileInfo.cpp

[David Chisnall]

Author: theraven
Date: Fri Feb 17 10:32:07 2012
New Revision: 150814

URL: http://llvm.org/viewvc/llvm-project?rev=150814&view=rev
Log:
Don't lazily allocate eh_frame.  We're not lazily allocating things like the LSDA, which are only used when the eh frame is used, so this lazy allocation doesn't really make sense.

Fix the type of eh_frame on Solaris so that Sun ld doesn't fail to combine them (thus making it impossible for the unwind library to find them and breaking exceptions).


Modified:
    llvm/trunk/include/llvm/MC/MCObjectFileInfo.h
    llvm/trunk/lib/MC/MCObjectFileInfo.cpp

Modified: llvm/trunk/include/llvm/MC/MCObjectFileInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCObjectFileInfo.h?rev=150814&r1=150813&r2=150814&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCObjectFileInfo.h (original)
+++ llvm/trunk/include/llvm/MC/MCObjectFileInfo.h Fri Feb 17 10:32:07 2012
@@ -284,8 +284,6 @@
   const MCSection *getXDataSection() const { return XDataSection; }
 
   const MCSection *getEHFrameSection() {
-    if (!EHFrameSection)
-      InitEHFrameSection();
     return EHFrameSection;
   }
 
@@ -300,9 +298,6 @@
   void InitELFMCObjectFileInfo(Triple T);
   void InitCOFFMCObjectFileInfo(Triple T);
 
-  /// InitEHFrameSection - Initialize EHFrameSection on demand.
-  ///
-  void InitEHFrameSection();
 };
 
 } // end namespace llvm

Modified: llvm/trunk/lib/MC/MCObjectFileInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectFileInfo.cpp?rev=150814&r1=150813&r2=150814&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCObjectFileInfo.cpp (original)
+++ llvm/trunk/lib/MC/MCObjectFileInfo.cpp Fri Feb 17 10:32:07 2012
@@ -142,6 +142,14 @@
   }
 
   // Exception Handling.
+  EHFrameSection =
+    Ctx->getMachOSection("__TEXT", "__eh_frame",
+                         MCSectionMachO::S_COALESCED |
+                         MCSectionMachO::S_ATTR_NO_TOC |
+                         MCSectionMachO::S_ATTR_STRIP_STATIC_SYMS |
+                         MCSectionMachO::S_ATTR_LIVE_SUPPORT,
+                         SectionKind::getReadOnly());
+
   LSDASection = Ctx->getMachOSection("__TEXT", "__gcc_except_tab", 0,
                                      SectionKind::getReadOnlyWithRel());
 
@@ -339,6 +347,17 @@
 
   // Exception Handling Sections.
 
+  // Solaris requires different flags for .eh_frame to seemingly every other
+  // platform.
+  unsigned EHSectionFlags = ELF::SHF_ALLOC;
+  if (T.getOS() == Triple::Solaris)
+    EHSectionFlags |= ELF::SHF_WRITE;
+
+  EHFrameSection =
+    Ctx->getELFSection(".eh_frame", ELF::SHT_PROGBITS, 
+                       EHSectionFlags,
+                       SectionKind::getDataRel());
+
   // FIXME: We're emitting LSDA info into a readonly section on ELF, even though
   // it contains relocatable pointers.  In PIC mode, this is probably a big
   // runtime hit for C++ apps.  Either the contents of the LSDA need to be
@@ -415,6 +434,13 @@
                         COFF::IMAGE_SCN_MEM_WRITE,
                         SectionKind::getDataRel());
 
+  EHFrameSection =
+    Ctx->getCOFFSection(".eh_frame",
+                        COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
+                        COFF::IMAGE_SCN_MEM_READ |
+                        COFF::IMAGE_SCN_MEM_WRITE,
+                        SectionKind::getDataRel());
+
   // FIXME: We're emitting LSDA info into a readonly section on COFF, even
   // though it contains relocatable pointers.  In PIC mode, this is probably a
   // big runtime hit for C++ apps.  Either the contents of the LSDA need to be
@@ -547,25 +573,3 @@
   }
 }
 
-void MCObjectFileInfo::InitEHFrameSection() {
-  if (Env == IsMachO)
-    EHFrameSection =
-      Ctx->getMachOSection("__TEXT", "__eh_frame",
-                           MCSectionMachO::S_COALESCED |
-                           MCSectionMachO::S_ATTR_NO_TOC |
-                           MCSectionMachO::S_ATTR_STRIP_STATIC_SYMS |
-                           MCSectionMachO::S_ATTR_LIVE_SUPPORT,
-                           SectionKind::getReadOnly());
-  else if (Env == IsELF)
-    EHFrameSection =
-      Ctx->getELFSection(".eh_frame", ELF::SHT_PROGBITS,
-                         ELF::SHF_ALLOC,
-                         SectionKind::getDataRel());
-  else
-    EHFrameSection =
-      Ctx->getCOFFSection(".eh_frame",
-                          COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
-                          COFF::IMAGE_SCN_MEM_READ |
-                          COFF::IMAGE_SCN_MEM_WRITE,
-                          SectionKind::getDataRel());
-}