diff options
| author | Dylan McKay <me@dylanmckay.io> | 2017-09-28 10:18:32 +0300 |
|---|---|---|
| committer | Dylan McKay <me@dylanmckay.io> | 2017-09-28 10:18:32 +0300 |
| commit | c2f252c42c27f516cf5101aaa1a9d946811042ad (patch) | |
| tree | 1eada845e06380f4347c269af3326e0255142031 | |
| parent | 6058b5f92272e0acba272022d1c26507fe792f10 (diff) | |
Merging r314180:
------------------------------------------------------------------------
r314180 | dylanmckay | 2017-09-26 13:51:03 +1300 (Tue, 26 Sep 2017) | 7 lines
[AVR] When lowering shifts into loops, put newly generated MBBs in the same
spot as the original MBB
Discovered in avr-rust/rust#62
https://github.com/avr-rust/rust/issues/62
Patch by Gergo Erdi.
------------------------------------------------------------------------
llvm-svn: 314383
| -rw-r--r-- | llvm/lib/Target/AVR/AVRISelLowering.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Target/AVR/AVRISelLowering.cpp b/llvm/lib/Target/AVR/AVRISelLowering.cpp index 7d3faac1dcc2..d8e8bc1ff554 100644 --- a/llvm/lib/Target/AVR/AVRISelLowering.cpp +++ b/llvm/lib/Target/AVR/AVRISelLowering.cpp @@ -1469,8 +1469,10 @@ MachineBasicBlock *AVRTargetLowering::insertShift(MachineInstr &MI, } const BasicBlock *LLVM_BB = BB->getBasicBlock(); - MachineFunction::iterator I = BB->getParent()->begin(); - ++I; + + MachineFunction::iterator I; + for (I = F->begin(); I != F->end() && &(*I) != BB; ++I); + if (I != F->end()) ++I; // Create loop block. MachineBasicBlock *LoopBB = F->CreateMachineBasicBlock(LLVM_BB); |