summaryrefslogtreecommitdiff
path: root/lib/CodeGen/AsmPrinter/Win64Exception.cpp
diff options
context:
space:
mode:
authorKai Nacke <kai.nacke@redstar.de>2013-07-08 04:43:23 +0000
committerKai Nacke <kai.nacke@redstar.de>2013-07-08 04:43:23 +0000
commit113d32cea868bd1749b4cdc8d1e52d9dccb8b5a2 (patch)
tree2f6df2330d1b1ea926f448127aacd819806c82e3 /lib/CodeGen/AsmPrinter/Win64Exception.cpp
parent04b84c2f92b8c9cf863853eca33f47f9fbd80fd1 (diff)
downloadllvm-113d32cea868bd1749b4cdc8d1e52d9dccb8b5a2.tar.gz
llvm-113d32cea868bd1749b4cdc8d1e52d9dccb8b5a2.tar.bz2
llvm-113d32cea868bd1749b4cdc8d1e52d9dccb8b5a2.tar.xz
Revert: Emit personality function and Dwarf EH data for Win64 SEH.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185788 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/AsmPrinter/Win64Exception.cpp')
-rw-r--r--lib/CodeGen/AsmPrinter/Win64Exception.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/CodeGen/AsmPrinter/Win64Exception.cpp b/lib/CodeGen/AsmPrinter/Win64Exception.cpp
index 99d53b9cee..156101286b 100644
--- a/lib/CodeGen/AsmPrinter/Win64Exception.cpp
+++ b/lib/CodeGen/AsmPrinter/Win64Exception.cpp
@@ -78,9 +78,9 @@ void Win64Exception::BeginFunction(const MachineFunction *MF) {
if (!shouldEmitPersonality)
return;
- const MCSymbol *PersHandlerSym = TLOF.getCFIPersonalitySymbol(Per, Asm->Mang,
- MMI);
- Asm->OutStreamer.EmitWin64EHHandler(PersHandlerSym, true, true);
+ MCSymbol *GCCHandlerSym =
+ Asm->GetExternalSymbolSymbol("_GCC_specific_handler");
+ Asm->OutStreamer.EmitWin64EHHandler(GCCHandlerSym, true, true);
Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_begin",
Asm->getFunctionNumber()));
@@ -99,8 +99,14 @@ void Win64Exception::EndFunction() {
MMI->TidyLandingPads();
if (shouldEmitPersonality) {
+ const TargetLoweringObjectFile &TLOF = Asm->getObjFileLowering();
+ const Function *Per = MMI->getPersonalities()[MMI->getPersonalityIndex()];
+ const MCSymbol *Sym = TLOF.getCFIPersonalitySymbol(Per, Asm->Mang, MMI);
+
Asm->OutStreamer.PushSection();
Asm->OutStreamer.EmitWin64EHHandlerData();
+ Asm->OutStreamer.EmitValue(MCSymbolRefExpr::Create(Sym, Asm->OutContext),
+ 4);
EmitExceptionTable();
Asm->OutStreamer.PopSection();
}