commit 33668c0f1a7e374d4c3c53df34efbdf570e0987b
author Jim Grosbach <grosbach@apple.com> Tue Sep 01 17:19:13 2009 +0000
committer Jim Grosbach <grosbach@apple.com> Tue Sep 01 17:19:13 2009 +0000
tree d9a749ae261b06ed60912726e2620362b408dccd
parent 61c6ba85715fdcb66f746678879984151f1e5485

revert inadvertant change from previous commit

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80689 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/AsmPrinter/DwarfException.cpp

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 @@
           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.