From 3194f575413613d3653a483859724fe63aba4b66 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Sat, 5 May 2007 20:27:00 +0000 Subject: [PATCH] Use the personality function that was registered with MMI rather than hardwiring in the C++ one. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36789 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/DwarfWriter.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp index 45ccb0cfa6b..52b405cda1a 100644 --- a/lib/CodeGen/DwarfWriter.cpp +++ b/lib/CodeGen/DwarfWriter.cpp @@ -2725,10 +2725,6 @@ private: /// bool shouldEmit; - /// FuncCPPPersonality - C++ personality function. - /// - Function *FuncCPPPersonality; - /// EmitCommonEHFrame - Emit the common eh unwind frame. /// void EmitCommonEHFrame() { @@ -2738,7 +2734,7 @@ private: // 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 @@ private: 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 @@ public: : Dwarf(OS, A, T) , didInitial(false) , shouldEmit(false) - , FuncCPPPersonality(NULL) {} virtual ~DwarfException() {} @@ -3109,7 +3103,6 @@ public: /// content. void BeginModule(Module *M) { this->M = M; - FuncCPPPersonality = M->getFunction("__gxx_personality_v0"); } /// EndModule - Emit all exception information that should come after the -- 2.34.1