[llvm-branch-commits] [llvm-branch] r81702 - in /llvm/branches/release_26/lib/CodeGen: AsmPrinter/DwarfException.cpp MachineModuleInfo.cpp

[Tanya Lattner]

Author: tbrethou
Date: Sun Sep 13 14:13:34 2009
New Revision: 81702

URL: http://llvm.org/viewvc/llvm-project?rev=81702&view=rev
Log:
Merge 80146 from mainline.
If we're emitting additional CIEs due to personality functions
don't emit the default one. Explicitly check for the NULL
CIE later.

Modified:
    llvm/branches/release_26/lib/CodeGen/AsmPrinter/DwarfException.cpp
    llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp

Modified: llvm/branches/release_26/lib/CodeGen/AsmPrinter/DwarfException.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_26/lib/CodeGen/AsmPrinter/DwarfException.cpp?rev=81702&r1=81701&r2=81702&view=diff

==============================================================================
--- llvm/branches/release_26/lib/CodeGen/AsmPrinter/DwarfException.cpp (original)
+++ llvm/branches/release_26/lib/CodeGen/AsmPrinter/DwarfException.cpp Sun Sep 13 14:13:34 2009
@@ -202,7 +202,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) {
       bool is4Byte = TD->getPointerSize() == sizeof(int32_t);
 
       Asm->EmitULEB128Bytes(is4Byte ? 4 : 8);

Modified: llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp?rev=81702&r1=81701&r2=81702&view=diff

==============================================================================
--- llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/branches/release_26/lib/CodeGen/MachineModuleInfo.cpp Sun Sep 13 14:13:34 2009
@@ -45,7 +45,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.