diff options
Diffstat (limited to 'lib/CodeGen/AsmPrinter/DwarfException.cpp')
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfException.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfException.cpp b/lib/CodeGen/AsmPrinter/DwarfException.cpp index 2fcee3e285..a1fa20e07f 100644 --- a/lib/CodeGen/AsmPrinter/DwarfException.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfException.cpp @@ -459,9 +459,8 @@ ComputeCallSiteTable(SmallVectorImpl<CallSiteEntry> &CallSites, FirstActions[P.PadIndex] }; - // Try to merge with the previous call-site. SJLJ doesn't do this - if (PreviousIsInvoke && - MAI->getExceptionHandlingType() == ExceptionHandling::Dwarf) { + // Try to merge with the previous call-site. + if (PreviousIsInvoke) { CallSiteEntry &Prev = CallSites.back(); if (Site.PadLabel == Prev.PadLabel && Site.Action == Prev.Action) { // Extend the range of the previous entry. @@ -606,7 +605,7 @@ void DwarfException::EmitExceptionTable() { std::string LSDAName = Asm->Mang->makeNameProper(std::string("LSDA_") + out.str(), Mangler::Private); - EmitLabel(LSDAName.c_str(), 0, false); + O << LSDAName << ":\n"; } // Emit the header. |