diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-09-25 17:30:25 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-09-25 18:01:23 -0700 |
| commit | a27c28b1427dc2082ab2b31efdbb25f9fde31b61 (patch) | |
| tree | 6f3ff025f542ca3f66a1a01cbf239aeef7784511 /lib/CodeGen/MachineBlockPlacement.cpp | |
| parent | 0e15ffd8cb1ec642eddb96380660914ff2b007e1 (diff) | |
| parent | bc4021f31eaa97ee52655828da3e3de14a39e4a6 (diff) | |
Merge commit 'bc4021f31eaa97ee52655828da3e3de14a39e4a6'
Conflicts:
lib/MC/MCAssembler.cpp
lib/Target/ARM/ARMISelDAGToDAG.cpp
lib/Target/Mips/MipsInstrFPU.td
lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
lib/Target/X86/X86ISelLowering.h
Diffstat (limited to 'lib/CodeGen/MachineBlockPlacement.cpp')
| -rw-r--r-- | lib/CodeGen/MachineBlockPlacement.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/CodeGen/MachineBlockPlacement.cpp b/lib/CodeGen/MachineBlockPlacement.cpp index c4dca2cd15..9a8cc48172 100644 --- a/lib/CodeGen/MachineBlockPlacement.cpp +++ b/lib/CodeGen/MachineBlockPlacement.cpp @@ -500,11 +500,10 @@ void MachineBlockPlacement::buildChain( assert(BB); assert(BlockToChain[BB] == &Chain); assert(*llvm::prior(Chain.end()) == BB); - MachineBasicBlock *BestSucc = 0; // Look for the best viable successor if there is one to place immediately // after this block. - BestSucc = selectBestSuccessor(BB, Chain, BlockFilter); + MachineBasicBlock *BestSucc = selectBestSuccessor(BB, Chain, BlockFilter); // If an immediate successor isn't available, look for the best viable // block among those we've identified as not violating the loop's CFG at |