lib/Target/ARM/ARMFrameLowering.cpp - Issue 939073008: Rebased PNaCl localmods in LLVM to 223109

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: lib/Target/ARM/ARMFrameLowering.cpp

Issue 939073008: Rebased PNaCl localmods in LLVM to 223109 (Closed)

Patch Set: undo localmod Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: lib/Target/ARM/ARMFrameLowering.cpp

diff --git a/lib/Target/ARM/ARMFrameLowering.cpp b/lib/Target/ARM/ARMFrameLowering.cpp

index 4f3012e9aafc8baebc933efb9ab09274a733dd5b..2ed0e26dce4041ba0467e43e1155346dc15a8dde 100644

--- a/lib/Target/ARM/ARMFrameLowering.cpp

+++ b/lib/Target/ARM/ARMFrameLowering.cpp

@@ -970,7 +970,8 @@ void ARMFrameLowering::emitPopInst(MachineBasicBlock &MBB,

continue;

if (Reg == ARM::LR && !isTailCall && !isVarArg && !isInterrupt &&

- STI.hasV5TOps()) {

+ STI.hasV5TOps() &&

+ !STI.isTargetNaCl() /* @LOCALMOD */) {

Reg = ARM::PC;

LdmOpc = AFI->isThumbFunction() ? ARM::t2LDMIA_RET : ARM::LDMIA_RET;

// Fold the return instruction into the LDM.

« no previous file with comments | « lib/Target/ARM/ARMFastISel.cpp ('k') | lib/Target/ARM/ARMISelDAGToDAG.cpp » ('j') | no next file with comments »