summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDuncan Sands <baldrick@free.fr>2007-05-05 20:27:00 +0000
committerDuncan Sands <baldrick@free.fr>2007-05-05 20:27:00 +0000
commit3194f575413613d3653a483859724fe63aba4b66 (patch)
treeeee201f08233e932e5031340c65bbdce343bd847 /lib
parent9426caa8b226e5a10752be3dcc5421f3cc41438e (diff)
downloadllvm-3194f575413613d3653a483859724fe63aba4b66.tar.gz
llvm-3194f575413613d3653a483859724fe63aba4b66.tar.bz2
llvm-3194f575413613d3653a483859724fe63aba4b66.tar.xz
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
Diffstat (limited to 'lib')
-rw-r--r--lib/CodeGen/DwarfWriter.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 45ccb0cfa6..52b405cda1 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