[llvm-commits] [llvm] r80689 - /llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp

[Jim Grosbach]

Author: grosbach
Date: Tue Sep  1 12:19:13 2009
New Revision: 80689

URL: http://llvm.org/viewvc/llvm-project?rev=80689&view=rev
Log:
revert inadvertant change from previous commit

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp?rev=80689&r1=80688&r2=80689&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfException.cpp Tue Sep  1 12:19:13 2009
@@ -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.