[llvm-branch-commits] [llvm-branch] r86780 - in /llvm/branches/Apple/Leela: lib/CodeGen/AsmPrinter/DwarfException.cpp test/CodeGen/X86/hidden-vis-5.ll

[Bill Wendling]

Author: void
Date: Tue Nov 10 19:25:53 2009
New Revision: 86780

URL: http://llvm.org/viewvc/llvm-project?rev=86780&view=rev
Log:
$ svn merge -c 86779 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r86779 into '.':
A    test/CodeGen/X86/hidden-vis-5.ll
U    lib/CodeGen/AsmPrinter/DwarfException.cpp


Added:
    llvm/branches/Apple/Leela/test/CodeGen/X86/hidden-vis-5.ll
      - copied unchanged from r86779, llvm/trunk/test/CodeGen/X86/hidden-vis-5.ll
Modified:
    llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.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=86780&r1=86779&r2=86780&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp Tue Nov 10 19:25:53 2009
@@ -232,11 +232,16 @@
   // corresponding function is static, this should not be externally visible.
   if (!TheFunc->hasLocalLinkage())
     if (const char *GlobalEHDirective = MAI->getGlobalEHDirective())
-      O << GlobalEHDirective << EHFrameInfo.FnName << "\n";
+      O << GlobalEHDirective << EHFrameInfo.FnName << '\n';
 
   // If corresponding function is weak definition, this should be too.
   if (TheFunc->isWeakForLinker() && MAI->getWeakDefDirective())
-    O << MAI->getWeakDefDirective() << EHFrameInfo.FnName << "\n";
+    O << MAI->getWeakDefDirective() << EHFrameInfo.FnName << '\n';
+
+  // If corresponding function is hidden, this should be too.
+  if (TheFunc->hasHiddenVisibility())
+    if (const char *HiddenDirective = MAI->getHiddenDirective())
+      O << HiddenDirective << EHFrameInfo.FnName << '\n' ;
 
   // If there are no calls then you can't unwind.  This may mean we can omit the
   // EH Frame, but some environments do not handle weak absolute symbols. If