diff options
| author | Jim Grosbach <grosbach@apple.com> | 2009-09-01 17:19:13 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2009-09-01 17:19:13 +0000 |
| commit | 598082b1dd506ca0d6540f2bcaded867bfbf77af (patch) | |
| tree | d9a749ae261b06ed60912726e2620362b408dccd | |
| parent | 2e8a8c4cb8746fbe3d199d69b1efcabe557eec3f (diff) | |
| download | external_llvm-598082b1dd506ca0d6540f2bcaded867bfbf77af.zip external_llvm-598082b1dd506ca0d6540f2bcaded867bfbf77af.tar.gz external_llvm-598082b1dd506ca0d6540f2bcaded867bfbf77af.tar.bz2 | |
revert inadvertant change from previous commit
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80689 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfException.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfException.cpp b/lib/CodeGen/AsmPrinter/DwarfException.cpp index a1fa20e..6d6af83 100644 --- a/lib/CodeGen/AsmPrinter/DwarfException.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfException.cpp @@ -459,8 +459,9 @@ ComputeCallSiteTable(SmallVectorImpl<CallSiteEntry> &CallSites, FirstActions[P.PadIndex] }; - // Try to merge with the previous call-site. - if (PreviousIsInvoke) { + // Try to merge with the previous call-site. SJLJ doesn't do this + if (PreviousIsInvoke && + MAI->getExceptionHandlingType() == ExceptionHandling::Dwarf) { CallSiteEntry &Prev = CallSites.back(); if (Site.PadLabel == Prev.PadLabel && Site.Action == Prev.Action) { // Extend the range of the previous entry. |