[llvm-branch-commits] [llvm-branch] r95237 - /llvm/branches/Apple/Zoidberg/lib/CodeGen/DwarfEHPrepare.cpp

[Jim Grosbach]

Author: grosbach
Date: Wed Feb  3 13:19:14 2010
New Revision: 95237

URL: http://llvm.org/viewvc/llvm-project?rev=95237&view=rev
Log:
merge 94046

Modified:
    llvm/branches/Apple/Zoidberg/lib/CodeGen/DwarfEHPrepare.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/CodeGen/DwarfEHPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/CodeGen/DwarfEHPrepare.cpp?rev=95237&r1=95236&r2=95237&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/CodeGen/DwarfEHPrepare.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/CodeGen/DwarfEHPrepare.cpp Wed Feb  3 13:19:14 2010
@@ -21,6 +21,7 @@
 #include "llvm/IntrinsicInst.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
+#include "llvm/MC/MCAsmInfo.h"
 #include "llvm/Target/TargetLowering.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Transforms/Utils/PromoteMemToReg.h"
@@ -114,6 +115,9 @@
 bool DwarfEHPrepare::NormalizeLandingPads() {
   bool Changed = false;
 
+  const MCAsmInfo *MAI = TLI->getTargetMachine().getMCAsmInfo();
+  bool usingSjLjEH = MAI->getExceptionHandlingType() == ExceptionHandling::SjLj;
+
   for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) {
     TerminatorInst *TI = I->getTerminator();
     if (!isa<InvokeInst>(TI))
@@ -125,9 +129,18 @@
 
     // Check that only invoke unwind edges end at the landing pad.
     bool OnlyUnwoundTo = true;
+    bool SwitchOK = usingSjLjEH;
     for (pred_iterator PI = pred_begin(LPad), PE = pred_end(LPad);
          PI != PE; ++PI) {
       TerminatorInst *PT = (*PI)->getTerminator();
+      // The SjLj dispatch block uses a switch instruction. This is effectively
+      // an unwind edge, so we can disregard it here. There will only ever
+      // be one dispatch, however, so if there are multiple switches, one
+      // of them truly is a normal edge, not an unwind edge.
+      if (SwitchOK && isa<SwitchInst>(PT)) {
+        SwitchOK = false;
+        continue;
+      }
       if (!isa<InvokeInst>(PT) || LPad == PT->getSuccessor(0)) {
         OnlyUnwoundTo = false;
         break;