[llvm-branch-commits] [llvm-branch] r89271 - in /llvm/branches/Apple/Leela/lib: CodeGen/AsmPrinter/DwarfException.cpp Target/TargetLoweringObjectFile.cpp

[Bill Wendling]

Author: void
Date: Wed Nov 18 17:20:02 2009
New Revision: 89271

URL: http://llvm.org/viewvc/llvm-project?rev=89271&view=rev
Log:
$ svn merge -c 89270 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r89270 into '.':
U    lib/CodeGen/AsmPrinter/DwarfException.cpp
U    lib/Target/TargetLoweringObjectFile.cpp


Modified:
    llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp
    llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp

Modified: llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp?rev=89271&r1=89270&r2=89271&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp Wed Nov 18 17:20:02 2009
@@ -707,7 +707,8 @@
     // somewhere.  This predicate should be moved to a shared location that is
     // in target-independent code.
     //
-    if (LSDASection->getKind().isWriteable() ||
+    if ((LSDASection->getKind().isWriteable() &&
+         !LSDASection->getKind().isDataRel()) ||
         Asm->TM.getRelocationModel() == Reloc::Static)
       TTypeFormat = dwarf::DW_EH_PE_absptr;
     else
@@ -897,14 +898,35 @@
   }
 
   // Emit the Catch TypeInfos.
+  const TargetLoweringObjectFile &TLOF = Asm->getObjFileLowering();
+  unsigned Index = 1;
+
   for (std::vector<GlobalVariable *>::const_reverse_iterator
-         I = TypeInfos.rbegin(), E = TypeInfos.rend(); I != E; ++I) {
-    const GlobalVariable *GV = *I;
-    PrintRelDirective();
+         I = TypeInfos.rbegin(), E = TypeInfos.rend(); I != E; ++I, ++Index) {
+    const GlobalVariable *TI = *I;
+
+    if (TI) {
+      if (!LSDASection->getKind().isDataRel() &&
+          (TTypeFormat == dwarf::DW_EH_PE_absptr ||
+           TI->getLinkage() == GlobalValue::InternalLinkage)) {
+        // Print out the unadorned name of the type info.
+        PrintRelDirective();
+        O << Asm->Mang->getMangledName(TI);
+      } else {
+        bool IsTypeInfoIndirect = false, IsTypeInfoPCRel = false;
+        const MCExpr *TypeInfoRef =
+          TLOF.getSymbolForDwarfGlobalReference(TI, Asm->Mang, Asm->MMI,
+                                                IsTypeInfoIndirect,
+                                                IsTypeInfoPCRel);
 
-    if (GV) {
-      O << Asm->Mang->getMangledName(GV);
+        if (!IsTypeInfoPCRel)
+          TypeInfoRef = CreateLabelDiff(TypeInfoRef, "typeinforef_addr", Index);
+
+        O << MAI->getData32bitsDirective();
+        TypeInfoRef->print(O, MAI);
+      }
     } else {
+      PrintRelDirective();
       O << "0x0";
     }
 

Modified: llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp?rev=89271&r1=89270&r2=89271&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp Wed Nov 18 17:20:02 2009
@@ -782,7 +782,7 @@
   }
 
   // Exception Handling.
-  LSDASection = getMachOSection("__DATA", "__gcc_except_tab", 0,
+  LSDASection = getMachOSection("__TEXT", "__gcc_except_tab", 0,
                                 SectionKind::getDataRel());
   EHFrameSection =
     getMachOSection("__TEXT", "__eh_frame",