diff options
| author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-02-22 21:30:15 +0000 |
|---|---|---|
| committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-02-22 21:30:15 +0000 |
| commit | d84f60065366d99c3aca4c8f917a35ab9ce4e7f5 (patch) | |
| tree | 5d1e10b9568670bb98979a943db23a092e702448 /llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp | |
| parent | fb1533b3263e710f6eaa36344c6e15f6a9d8a6a2 (diff) | |
| download | llvm-d84f60065366d99c3aca4c8f917a35ab9ce4e7f5.zip llvm-d84f60065366d99c3aca4c8f917a35ab9ce4e7f5.tar.gz llvm-d84f60065366d99c3aca4c8f917a35ab9ce4e7f5.tar.bz2 | |
CodeGen: Bring back MachineBasicBlock::iterator::getInstrIterator()...
This is a little embarrassing.
When I reverted r261504 (getIterator() => getInstrIterator()) in
r261567, I did a `git grep` to see if there were new calls to
`getInstrIterator()` that I needed to migrate. There were 10-20 hits,
and I blindly did a `sed ...` before calling `ninja check`.
However, these were `MachineInstrBundleIterator::getInstrIterator()`,
which predated r261567. Perhaps coincidentally, these had an identical
name and return type.
This commit undoes my careless sed and restores
`MachineBasicBlock::iterator::getInstrIterator()`.
llvm-svn: 261577
Diffstat (limited to 'llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp index b17b002..bb4bda2 100644 --- a/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp +++ b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp @@ -397,7 +397,7 @@ private: std::vector<int64_t> Literals; if (I->isBundle()) { MachineInstr *DeleteMI = I; - MachineBasicBlock::instr_iterator BI = I.getIterator(); + MachineBasicBlock::instr_iterator BI = I.getInstrIterator(); while (++BI != E && BI->isBundledWithPred()) { BI->unbundleFromPred(); for (unsigned i = 0, e = BI->getNumOperands(); i != e; ++i) { |