[llvm-commits] CVS: llvm/lib/CodeGen/DwarfWriter.cpp

[Duncan Sands]

Changes in directory llvm/lib/CodeGen:

DwarfWriter.cpp updated: 1.135 -> 1.136
---
Log message:

Use the personality function that was registered with MMI rather than
hardwiring in the C++ one.


---
Diffs of the changes:  (+2 -9)

 DwarfWriter.cpp |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)


Index: llvm/lib/CodeGen/DwarfWriter.cpp
diff -u llvm/lib/CodeGen/DwarfWriter.cpp:1.135 llvm/lib/CodeGen/DwarfWriter.cpp:1.136
--- llvm/lib/CodeGen/DwarfWriter.cpp:1.135	Sat May  5 11:32:57 2007
+++ llvm/lib/CodeGen/DwarfWriter.cpp	Sat May  5 15:27:00 2007
@@ -2725,10 +2725,6 @@
   ///
   bool shouldEmit;
   
-  /// FuncCPPPersonality - C++ personality function.
-  ///
-  Function *FuncCPPPersonality;
-
   /// EmitCommonEHFrame - Emit the common eh unwind frame.
   ///
   void EmitCommonEHFrame() {
@@ -2738,7 +2734,7 @@
     
     // If there is a personality present then we need to indicate that
     // in the common eh frame.
-    Function *Personality = FuncCPPPersonality;
+    Function *Personality = MMI->getPersonality();
 
     // Size and sign of stack growth.
     int stackGrowth =
@@ -2818,8 +2814,7 @@
   void EmitEHFrame() {
     // If there is a personality present then we need to indicate that
     // in the common eh frame.
-    Function *Personality = FuncCPPPersonality;
-//    Function *Personality = MMI->getPersonality();
+    Function *Personality = MMI->getPersonality();
     MachineFrameInfo *MFI = MF->getFrameInfo();
 
     Asm->SwitchToTextSection(TAI->getDwarfEHFrameSection());
@@ -3094,7 +3089,6 @@
   : Dwarf(OS, A, T)
   , didInitial(false)
   , shouldEmit(false)
-  , FuncCPPPersonality(NULL)
   {}
   
   virtual ~DwarfException() {}
@@ -3109,7 +3103,6 @@
   /// content.
   void BeginModule(Module *M) {
     this->M = M;
-    FuncCPPPersonality = M->getFunction("__gxx_personality_v0");
   }
 
   /// EndModule - Emit all exception information that should come after the