[llvm] r222962 - Switch lowering: reformat some for loops etc. NFC
Hans Wennborg
hans at hanshq.net
Sat Nov 29 13:24:12 PST 2014
Author: hans
Date: Sat Nov 29 15:24:12 2014
New Revision: 222962
URL: http://llvm.org/viewvc/llvm-project?rev=222962&view=rev
Log:
Switch lowering: reformat some for loops etc. NFC
Modified:
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=222962&r1=222961&r2=222962&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Nov 29 15:24:12 2014
@@ -2514,15 +2514,14 @@ bool SelectionDAGBuilder::handleBitTests
return false;
size_t numCmps = 0;
- for (CaseItr I = CR.Range.first, E = CR.Range.second;
- I!=E; ++I) {
+ for (CaseItr I = CR.Range.first, E = CR.Range.second; I != E; ++I) {
// Single case counts one, case range - two.
numCmps += (I->Low == I->High ? 1 : 2);
}
// Count unique destinations
SmallSet<MachineBasicBlock*, 4> Dests;
- for (CaseItr I = CR.Range.first, E = CR.Range.second; I!=E; ++I) {
+ for (CaseItr I = CR.Range.first, E = CR.Range.second; I != E; ++I) {
Dests.insert(I->BB);
if (Dests.size() > 3)
// Don't bother the code below, if there are too much unique destinations
@@ -2629,9 +2628,8 @@ bool SelectionDAGBuilder::handleBitTests
void SelectionDAGBuilder::Clusterify(CaseVector& Cases,
const SwitchInst& SI) {
BranchProbabilityInfo *BPI = FuncInfo.BPI;
- // Start with "simple" cases
- for (SwitchInst::ConstCaseIt i = SI.case_begin(), e = SI.case_end();
- i != e; ++i) {
+ // Start with "simple" cases.
+ for (SwitchInst::ConstCaseIt i : SI.cases()) {
const BasicBlock *SuccBB = i.getCaseSuccessor();
MachineBasicBlock *SMBB = FuncInfo.MBBMap[SuccBB];
@@ -2703,9 +2701,9 @@ void SelectionDAGBuilder::visitSwitch(co
// next basic block. Otherwise, just fall through.
if (!SI.getNumCases()) {
// Update machine-CFG edges.
+ SwitchMBB->addSuccessor(Default);
// If this is not a fall-through branch, emit the branch.
- SwitchMBB->addSuccessor(Default);
if (Default != NextBlock)
DAG.setRoot(DAG.getNode(ISD::BR, getCurSDLoc(),
MVT::Other, getControlRoot(),
More information about the llvm-commits
mailing list