Move the EH symbol to the asm printer and use it for the SJLJ case too.

llvm-svn: 232475

1 files changed, 2 insertions, 18 deletions

diff --git a/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp b/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp
index 8a040d92aee..14df4c91625 100644
--- a/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp
@@ -25,22 +25,10 @@
 
 using namespace llvm;
 
-EHStreamer::EHStreamer(AsmPrinter *A)
-    : CurExceptionSym(nullptr), Asm(A), MMI(Asm->MMI) {}
+EHStreamer::EHStreamer(AsmPrinter *A) : Asm(A), MMI(Asm->MMI) {}
 
 EHStreamer::~EHStreamer() {}
 
-MCSymbol *EHStreamer::getCurExceptionSym() {
-  if (!CurExceptionSym)
-    CurExceptionSym = Asm->OutContext.createTempSymbol(
-        "exception" + Twine(Asm->getFunctionNumber()));
-  return CurExceptionSym;
-}
-
-void EHStreamer::beginFunction(const MachineFunction *MF) {
-  CurExceptionSym = nullptr;
-}
-
 /// How many leading type ids two landing pads have in common.
 unsigned EHStreamer::sharedTypeIDs(const LandingPadInfo *L,
                                    const LandingPadInfo *R) {
@@ -448,11 +436,7 @@ void EHStreamer::emitExceptionTable() {
     Asm->OutContext.GetOrCreateSymbol(Twine("GCC_except_table")+
                                       Twine(Asm->getFunctionNumber()));
   Asm->OutStreamer.EmitLabel(GCCETSym);
-  Asm->OutStreamer.EmitLabel(getCurExceptionSym());
-
-  if (IsSJLJ)
-    Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("_LSDA_",
-                                                  Asm->getFunctionNumber()));
+  Asm->OutStreamer.EmitLabel(Asm->getCurExceptionSym());
 
   // Emit the LSDA header.
   Asm->EmitEncodingByte(dwarf::DW_EH_PE_omit, "@LPStart");