aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/XCore/XCoreFrameLowering.cpp
diff options
context:
space:
mode:
authorRichard Osborne <richard@xmos.com>2013-07-17 10:58:37 +0000
committerRichard Osborne <richard@xmos.com>2013-07-17 10:58:37 +0000
commitdcc4207a00b31687018f87de75846579bbdb9c77 (patch)
treecc693a38a67f19218fec8b91dc4469f955f31c2a /lib/Target/XCore/XCoreFrameLowering.cpp
parenta009d53c4d97e4b9ffe17cb2f6442a40e7407ac8 (diff)
downloadexternal_llvm-dcc4207a00b31687018f87de75846579bbdb9c77.zip
external_llvm-dcc4207a00b31687018f87de75846579bbdb9c77.tar.gz
external_llvm-dcc4207a00b31687018f87de75846579bbdb9c77.tar.bz2
[XCore] Ensure implicit operands aren't lost on the return instruction.
Patch by Robert Lytton. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186500 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/XCore/XCoreFrameLowering.cpp')
-rw-r--r--lib/Target/XCore/XCoreFrameLowering.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Target/XCore/XCoreFrameLowering.cpp b/lib/Target/XCore/XCoreFrameLowering.cpp
index 736a4ef..b57cf9d 100644
--- a/lib/Target/XCore/XCoreFrameLowering.cpp
+++ b/lib/Target/XCore/XCoreFrameLowering.cpp
@@ -223,7 +223,9 @@ void XCoreFrameLowering::emitEpilogue(MachineFunction &MF,
assert(MBBI->getOpcode() == XCore::RETSP_u6
|| MBBI->getOpcode() == XCore::RETSP_lu6);
int Opcode = (isU6) ? XCore::RETSP_u6 : XCore::RETSP_lu6;
- BuildMI(MBB, MBBI, dl, TII.get(Opcode)).addImm(FrameSize);
+ MachineInstrBuilder MIB = BuildMI(MBB, MBBI, dl, TII.get(Opcode)).addImm(FrameSize);
+ for (unsigned i = 3, e = MBBI->getNumOperands(); i < e; ++i)
+ MIB->addOperand(MBBI->getOperand(i)); // copy any variadic operands
MBB.erase(MBBI);
} else {
int Opcode = (isU6) ? XCore::LDAWSP_ru6 : XCore::LDAWSP_lru6;