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

ARM: Fix an old refacto. 

Fixes PR15520.

llvm-svn: 177167
This commit is contained in:
Benjamin Kramer 2013-03-15 17:27:39 +00:00
parent ebafd2f187
commit 2f5457141a
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Target/ARM/ARMAsmPrinter.cpp
View File

@ -1357,7 +1357,7 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) {
OutStreamer.EmitInstruction(MCInstBuilder(ARM::MOVr) OutStreamer.EmitInstruction(MCInstBuilder(ARM::MOVr)
.addReg(ARM::PC) .addReg(ARM::PC)
.addImm(MI->getOperand(0).getReg()) .addReg(MI->getOperand(0).getReg())
// Add predicate operands. // Add predicate operands.
.addImm(ARMCC::AL) .addImm(ARMCC::AL)
.addReg(0) .addReg(0)

14
llvm/test/CodeGen/ARM/call_nolink.ll
View File

@ -1,5 +1,4 @@
; RUN: llc < %s -march=arm -mtriple=arm-linux-gnueabi | \ ; RUN: llc < %s -march=arm -mtriple=arm-linux-gnueabi | FileCheck %s
; RUN: not grep "bx lr"
%struct.anon = type { i32 (i32, i32, i32)*, i32, i32, [3 x i32], i8*, i8*, i8* } %struct.anon = type { i32 (i32, i32, i32)*, i32, i32, [3 x i32], i8*, i8*, i8* }
@r = external global [14 x i32] ; <[14 x i32]*> [#uses=4] @r = external global [14 x i32] ; <[14 x i32]*> [#uses=4]
@ -8,6 +7,8 @@
@numi = external global i32 ; <i32*> [#uses=1] @numi = external global i32 ; <i32*> [#uses=1]
@counter = external global [2 x i32] ; <[2 x i32]*> [#uses=1] @counter = external global [2 x i32] ; <[2 x i32]*> [#uses=1]
; CHECK: main_bb_2E_i_bb205_2E_i_2E_i_bb115_2E_i_2E_i:
; CHECK-NOT: bx lr
define void @main_bb_2E_i_bb205_2E_i_2E_i_bb115_2E_i_2E_i() { define void @main_bb_2E_i_bb205_2E_i_2E_i_bb115_2E_i_2E_i() {
newFuncRoot: newFuncRoot:
@ -50,3 +51,12 @@ bb115.i.i: ; preds = %bb115.i.i.bb115.i.i_crit_edge, %newFuncRoot
icmp slt i32 %tmp166.i.i, %tmp168.i.i ; <i1>:0 [#uses=1] icmp slt i32 %tmp166.i.i, %tmp168.i.i ; <i1>:0 [#uses=1]
br i1 %0, label %bb115.i.i.bb115.i.i_crit_edge, label %bb115.i.i.bb170.i.i_crit_edge.exitStub br i1 %0, label %bb115.i.i.bb115.i.i_crit_edge, label %bb115.i.i.bb170.i.i_crit_edge.exitStub
} }
define void @PR15520(void ()* %fn) {
call void %fn()
ret void
; CHECK: PR15520:
; CHECK: mov lr, pc
; CHECK: mov pc, r0
}