aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Transforms/Utils/LowerSwitch.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-04-25 20:47:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-25 20:47:46 +0000
commit37a6adeb1525309c655d8acb341019d475b2a6a5 (patch)
treee6cfb69fbbd937f450eeb83bfb83b9da3b01275a /lib/Transforms/Utils/LowerSwitch.cpp
parent69a8640022b04415ae9fac62f8ab090601d8f889 (diff)
parent36b56886974eae4f9c5ebc96befd3e7bfe5de338 (diff)
downloadexternal_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.tar.gz
external_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.tar.bz2
external_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.zip
Merge "Update to LLVM 3.5a."
Diffstat (limited to 'lib/Transforms/Utils/LowerSwitch.cpp')
-rw-r--r--lib/Transforms/Utils/LowerSwitch.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/Transforms/Utils/LowerSwitch.cpp b/lib/Transforms/Utils/LowerSwitch.cpp
index 2d2a8a54a0..6fb74106e3 100644
--- a/lib/Transforms/Utils/LowerSwitch.cpp
+++ b/lib/Transforms/Utils/LowerSwitch.cpp
@@ -37,9 +37,9 @@ namespace {
initializeLowerSwitchPass(*PassRegistry::getPassRegistry());
}
- virtual bool runOnFunction(Function &F);
-
- virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+ bool runOnFunction(Function &F) override;
+
+ void getAnalysisUsage(AnalysisUsage &AU) const override {
// This is a cluster of orthogonal Transforms
AU.addPreserved<UnifyFunctionExitNodes>();
AU.addPreserved("mem2reg");
@@ -245,7 +245,8 @@ unsigned LowerSwitch::Clusterify(CaseVector& Cases, SwitchInst *SI) {
// Merge case into clusters
if (Cases.size()>=2)
- for (CaseItr I=Cases.begin(), J=llvm::next(Cases.begin()); J!=Cases.end(); ) {
+ for (CaseItr I = Cases.begin(), J = std::next(Cases.begin());
+ J != Cases.end();) {
int64_t nextValue = cast<ConstantInt>(J->Low)->getSExtValue();
int64_t currentValue = cast<ConstantInt>(I->High)->getSExtValue();
BasicBlock* nextBB = J->BB;