diff options
| -rw-r--r-- | lib/Core/Executor.cpp | 4 | ||||
| -rw-r--r-- | lib/Module/LowerSwitch.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index be92b16a..fe53fc9b 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -1553,8 +1553,12 @@ void Executor::executeInstruction(ExecutionState &state, KInstruction *ki) { std::map<ref<Expr>, BasicBlock *> expressionOrder; // Iterate through all non-default cases and order them by expressions +#if LLVM_VERSION_CODE > LLVM_VERSION(3, 4) + for (auto i : si->cases()) { +#else for (SwitchInst::CaseIt i = si->case_begin(), e = si->case_end(); i != e; ++i) { +#endif ref<Expr> value = evalConstant(i.getCaseValue()); BasicBlock *caseSuccessor = i.getCaseSuccessor(); diff --git a/lib/Module/LowerSwitch.cpp b/lib/Module/LowerSwitch.cpp index 1a194245..0f4e8b1e 100644 --- a/lib/Module/LowerSwitch.cpp +++ b/lib/Module/LowerSwitch.cpp @@ -114,8 +114,12 @@ void LowerSwitchPass::processSwitchInst(SwitchInst *SI) { } CaseVector cases; - + +#if LLVM_VERSION_CODE > LLVM_VERSION(3, 4) + for (auto i : SI->cases()) +#else for (SwitchInst::CaseIt i = SI->case_begin(), e = SI->case_end(); i != e; ++i) +#endif cases.push_back(SwitchCase(i.getCaseValue(), i.getCaseSuccessor())); |