Taken into account Duncan's comments for r149481 dated by 2nd Feb 2012:
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20120130/136146.html Implemented CaseIterator and it solves almost all described issues: we don't need to mix operand/case/successor indexing anymore. Base iterator class is implemented as a template since it may be initialized either from "const SwitchInst*" or from "SwitchInst*". ConstCaseIt is just a read-only iterator. CaseIt is read-write iterator; it allows to change case successor and case value. Usage of iterator allows totally remove resolveXXXX methods. All indexing convertions done automatically inside the iterator's getters. Main way of iterator usage looks like this: SwitchInst *SI = ... // intialize it somehow for (SwitchInst::CaseIt i = SI->caseBegin(), e = SI->caseEnd(); i != e; ++i) { BasicBlock *BB = i.getCaseSuccessor(); ConstantInt *V = i.getCaseValue(); // Do something. } If you want to convert case number to TerminatorInst successor index, just use getSuccessorIndex iterator's method. If you want initialize iterator from TerminatorInst successor index, use CaseIt::fromSuccessorIndex(...) method. There are also related changes in llvm-clients: klee and clang. llvm-svn: 152298
This commit is contained in:
parent
5b648afb4d
commit
85fcc2daf5
|
@ -504,7 +504,7 @@ static void destroyOptimisticNormalEntry(CodeGenFunction &CGF,
|
|||
llvm::SwitchInst *si = cast<llvm::SwitchInst>(use.getUser());
|
||||
if (si->getNumCases() == 1 && si->getDefaultDest() == unreachableBB) {
|
||||
// Replace the switch with a branch.
|
||||
llvm::BranchInst::Create(si->getCaseSuccessor(0), si);
|
||||
llvm::BranchInst::Create(si->caseBegin().getCaseSuccessor(), si);
|
||||
|
||||
// The switch operand is a load from the cleanup-dest alloca.
|
||||
llvm::LoadInst *condition = cast<llvm::LoadInst>(si->getCondition());
|
||||
|
|
Loading…
Reference in New Issue