maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mips] Fix a bug in MipsLongBranch::replaceBranch, which was erasing 

instructions in delay slots along with the original branch instructions.

llvm-svn: 191978
This commit is contained in:
Akira Hatanaka 2013-10-04 20:51:40 +00:00
parent 698d4ac8a8
commit 55504b4ac9
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/Target/Mips/MipsLongBranch.cpp
View File

@ -237,6 +237,11 @@ void MipsLongBranch::replaceBranch(MachineBasicBlock &MBB, Iter Br,
MIB.addMBB(MBBOpnd); MIB.addMBB(MBBOpnd);
// Bundle the instruction in the delay slot to the newly created branch
// and erase the original branch.
assert(Br->isBundledWithSucc());
MachineBasicBlock::instr_iterator II(Br);
MIBundleBuilder(&*MIB).append(llvm::next(II)->removeFromBundle());
Br->eraseFromParent(); Br->eraseFromParent();
} }

8
llvm/test/CodeGen/Mips/longbranch.ll
View File

@ -1,13 +1,17 @@
; RUN: llc -march=mipsel -force-mips-long-branch < %s | FileCheck %s -check-prefix=O32 ; RUN: llc -march=mipsel -force-mips-long-branch -disable-mips-delay-filler < %s | FileCheck %s -check-prefix=O32
; RUN: llc -march=mips64el -mcpu=mips64 -mattr=n64 -force-mips-long-branch < %s | FileCheck %s -check-prefix=N64 ; RUN: llc -march=mips64el -mcpu=mips64 -mattr=n64 -force-mips-long-branch -disable-mips-delay-filler < %s | FileCheck %s -check-prefix=N64
@g0 = external global i32 @g0 = external global i32
define void @foo1(i32 %s) nounwind { define void @foo1(i32 %s) nounwind {
entry: entry:
; O32: nop
; O32: addiu $sp, $sp, -8
; O32: bal ; O32: bal
; O32: lui $1, 0 ; O32: lui $1, 0
; O32: addiu $1, $1, {{[0-9]+}} ; O32: addiu $1, $1, {{[0-9]+}}
; N64: nop
; N64: daddiu $sp, $sp, -16
; N64: lui $1, 0 ; N64: lui $1, 0
; N64: daddiu $1, $1, 0 ; N64: daddiu $1, $1, 0
; N64: dsll $1, $1, 16 ; N64: dsll $1, $1, 16