[llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp LowerInvoke.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.150 -> 1.151
LowerInvoke.cpp updated: 1.6 -> 1.7

---
Log message:

rename the "exceptional" destination of an invoke instruction to the 'unwind' dest



---
Diffs of the changes:  (+4 -4)

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.150 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.151
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.150	Mon Feb  2 14:09:56 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sun Feb  8 15:43:50 2004
@@ -1839,7 +1839,7 @@
              UI != E; ++UI)
           if (PHINode *PN = dyn_cast<PHINode>(*UI))
             if (PN->getParent() == II->getNormalDest() ||
-                PN->getParent() == II->getExceptionalDest())
+                PN->getParent() == II->getUnwindDest())
               return false;
   }
 
@@ -1904,7 +1904,7 @@
 
   Instruction *NC;
   if (InvokeInst *II = dyn_cast<InvokeInst>(Caller)) {
-    NC = new InvokeInst(Callee, II->getNormalDest(), II->getExceptionalDest(),
+    NC = new InvokeInst(Callee, II->getNormalDest(), II->getUnwindDest(),
                         Args, Caller->getName(), Caller);
   } else {
     NC = new CallInst(Callee, Args, Caller->getName(), Caller);


Index: llvm/lib/Transforms/Scalar/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.6 llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.7
--- llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.6	Sun Feb  8 13:53:56 2004
+++ llvm/lib/Transforms/Scalar/LowerInvoke.cpp	Sun Feb  8 15:43:50 2004
@@ -169,7 +169,7 @@
       new BranchInst(II->getNormalDest(), II);
 
       // Remove any PHI node entries from the exception destination.
-      II->getExceptionalDest()->removePredecessor(BB);
+      II->getUnwindDest()->removePredecessor(BB);
 
       // Remove the invoke instruction now.
       BB->getInstList().erase(II);
@@ -256,7 +256,7 @@
       new StoreInst(OldEntry, JBListHead, InsertLoc);
 
       // Now we change the invoke into a branch instruction.
-      new BranchInst(II->getNormalDest(), II->getExceptionalDest(), IsNormal, II);
+      new BranchInst(II->getNormalDest(), II->getUnwindDest(), IsNormal, II);
 
       // Remove the InvokeInst now.
       BB->getInstList().erase(II);