diff options
| -rw-r--r-- | lib/Transforms/IPO/MutateStructTypes.cpp | 13 | ||||
| -rw-r--r-- | lib/Transforms/Scalar/SCCP.cpp | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lib/Transforms/IPO/MutateStructTypes.cpp b/lib/Transforms/IPO/MutateStructTypes.cpp index fcad5fa050..b5dd937f7e 100644 --- a/lib/Transforms/IPO/MutateStructTypes.cpp +++ b/lib/Transforms/IPO/MutateStructTypes.cpp @@ -369,10 +369,15 @@ void MutateStructTypes::transformMethod(Function *m) { break; case Instruction::Br: { const BranchInst *BI = cast<BranchInst>(I); - NewI = new BranchInst( - cast<BasicBlock>(ConvertValue(BI->getSuccessor(0))), - cast_or_null<BasicBlock>(ConvertValue(BI->getSuccessor(1))), - ConvertValue(BI->getCondition())); + if (BI->isConditional()) { + NewI = + new BranchInst(cast<BasicBlock>(ConvertValue(BI->getSuccessor(0))), + cast<BasicBlock>(ConvertValue(BI->getSuccessor(1))), + ConvertValue(BI->getCondition())); + } else { + NewI = + new BranchInst(cast<BasicBlock>(ConvertValue(BI->getSuccessor(0)))); + } break; } case Instruction::Switch: diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index fd3daa5bef..51a827d14b 100644 --- a/lib/Transforms/Scalar/SCCP.cpp +++ b/lib/Transforms/Scalar/SCCP.cpp @@ -397,8 +397,8 @@ void SCCP::visitBranchInst(BranchInst *BI) { void SCCP::visitSwitchInst(SwitchInst *SI) { InstVal &SCValue = getValueState(SI->getCondition()); if (SCValue.isOverdefined()) { // Overdefined condition? All dests are exe - for(unsigned i = 0; BasicBlock *Succ = SI->getSuccessor(i); ++i) - markExecutable(Succ); + for(unsigned i = 0, E = SI->getNumSuccessors(); i != E; ++i) + markExecutable(SI->getSuccessor(i)); } else if (SCValue.isConstant()) { Constant *CPV = SCValue.getConstant(); // Make sure to skip the "default value" which isn't a value |