From 3cc9be0b5955278e7f8166b8db3e9ba697902190 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Sun, 2 Mar 2008 02:48:09 +0000 Subject: Add an unwind_to field to basic blocks, making them Users instead of Values. This is the first checkin for PR1269, the new EH infrastructure. llvm-svn: 47802 --- llvm/lib/VMCore/BasicBlock.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'llvm/lib/VMCore/BasicBlock.cpp') diff --git a/llvm/lib/VMCore/BasicBlock.cpp b/llvm/lib/VMCore/BasicBlock.cpp index 3ab5e961579..f9bead74d25 100644 --- a/llvm/lib/VMCore/BasicBlock.cpp +++ b/llvm/lib/VMCore/BasicBlock.cpp @@ -70,8 +70,8 @@ template class SymbolTableListTraits; BasicBlock::BasicBlock(const std::string &Name, Function *NewParent, - BasicBlock *InsertBefore) - : Value(Type::LabelTy, Value::BasicBlockVal), Parent(0) { + BasicBlock *InsertBefore, BasicBlock *Dest) + : User(Type::LabelTy, Value::BasicBlockVal, &unwindDest, 0), Parent(0) { // Make sure that we get added to a function LeakDetector::addGarbageObject(this); @@ -85,6 +85,8 @@ BasicBlock::BasicBlock(const std::string &Name, Function *NewParent, } setName(Name); + unwindDest.init(NULL, this); + setUnwindDest(Dest); } @@ -113,6 +115,19 @@ void BasicBlock::eraseFromParent() { getParent()->getBasicBlockList().erase(this); } +const BasicBlock *BasicBlock::getUnwindDest() const { + return cast_or_null(unwindDest.get()); +} + +BasicBlock *BasicBlock::getUnwindDest() { + return cast_or_null(unwindDest.get()); +} + +void BasicBlock::setUnwindDest(BasicBlock *dest) { + NumOperands = unwindDest ? 1 : 0; + unwindDest.set(dest); +} + /// moveBefore - Unlink this basic block from its current function and /// insert it into the function that MovePos lives in, right before MovePos. void BasicBlock::moveBefore(BasicBlock *MovePos) { @@ -151,6 +166,7 @@ Instruction* BasicBlock::getFirstNonPHI() } void BasicBlock::dropAllReferences() { + setUnwindDest(NULL); for(iterator I = begin(), E = end(); I != E; ++I) I->dropAllReferences(); } @@ -177,6 +193,9 @@ void BasicBlock::removePredecessor(BasicBlock *Pred, find(pred_begin(this), pred_end(this), Pred) != pred_end(this)) && "removePredecessor: BB is not a predecessor!"); + if (Pred == getUnwindDest()) + setUnwindDest(NULL); + if (InstList.empty()) return; PHINode *APN = dyn_cast(&front()); if (!APN) return; // Quick exit. -- cgit v1.2.3