[llvm-branch-commits] [llvm-branch] r81963 - in /llvm/branches/Apple/Bender-SWB/lib/CodeGen: AsmPrinter/DwarfWriter.cpp MachineModuleInfo.cpp

[Bill Wendling]

Author: void
Date: Tue Sep 15 19:10:30 2009
New Revision: 81963

URL: http://llvm.org/viewvc/llvm-project?rev=81963&view=rev
Log:
Merge r80146 into Bender.

Modified:
    llvm/branches/Apple/Bender-SWB/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
    llvm/branches/Apple/Bender-SWB/lib/CodeGen/MachineModuleInfo.cpp

Modified: llvm/branches/Apple/Bender-SWB/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=81963&r1=81962&r2=81963&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Sep 15 19:10:30 2009
@@ -3977,7 +3977,7 @@
 
       // If there is a personality and landing pads then point to the language
       // specific data area in the exception table.
-      if (EHFrameInfo.PersonalityIndex) {
+      if (MMI->getPersonalities()[0] != NULL) {
         Asm->EmitULEB128Bytes(4);
         Asm->EOL("Augmentation size");
 

Modified: llvm/branches/Apple/Bender-SWB/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/lib/CodeGen/MachineModuleInfo.cpp?rev=81963&r1=81962&r2=81963&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/lib/CodeGen/MachineModuleInfo.cpp Tue Sep 15 19:10:30 2009
@@ -44,7 +44,7 @@
 , CallsUnwindInit(0)
 , DbgInfoAvailable(false)
 {
-  // Always emit "no personality" info
+  // Always emit some info, by default "no personality" info.
   Personalities.push_back(NULL);
 }
 MachineModuleInfo::~MachineModuleInfo() {
@@ -149,7 +149,12 @@
     if (Personalities[i] == Personality)
       return;
   
-  Personalities.push_back(Personality);
+  // If this is the first personality we're adding go ahead and add it at the
+  // beginning.
+  if (Personalities[0] == NULL)
+    Personalities[0] = Personality;
+  else
+    Personalities.push_back(Personality);
 }
 
 /// addCatchTypeInfo - Provide the catch typeinfo for a landing pad.