diff options
| author | Reid Kleckner <reid@kleckner.net> | 2014-10-31 23:19:46 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2014-10-31 23:19:46 +0000 |
| commit | da00cf5f73446235f0bfe89db90c28fc2d2019f3 (patch) | |
| tree | 47c94cdf8b83ea86908fbd10a72b87295d58e00c /llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp | |
| parent | 75bd66e51d2d4ae485034508aae85e297def8e2e (diff) | |
| download | llvm-da00cf5f73446235f0bfe89db90c28fc2d2019f3.zip llvm-da00cf5f73446235f0bfe89db90c28fc2d2019f3.tar.gz llvm-da00cf5f73446235f0bfe89db90c28fc2d2019f3.tar.bz2 | |
Work around bugs in MSVC "14" CTP 3's conversion logic
It appears to ignore or find ambiguous MachineInstrBuilder's conversion
operators that allow conversion to MachineInstr* and
MachineBasicBlock::bundle_iterator.
As a workaround, add an explicit way to get the MachineInstr.
llvm-svn: 221017
Diffstat (limited to 'llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp b/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp index 599cb00..fdcb522 100644 --- a/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp +++ b/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp @@ -188,7 +188,7 @@ bool Thumb2ITBlockPass::InsertITInstructions(MachineBasicBlock &MBB) { true/*isImp*/, false/*isKill*/)); MachineInstr *LastITMI = MI; - MachineBasicBlock::iterator InsertPos = MIB; + MachineBasicBlock::iterator InsertPos = MIB.getInstr(); ++MBBI; // Form IT block. |