From 1a6c7608b1f47dadf7adae8dbc1fb8345f7ff15e Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Tue, 26 Jan 2016 20:22:42 +0000 Subject: WebAssembly: don't optimize memcpy/memmove/memcpy to frame index r258781 optimized memcpy/memmove/memcpy so the intrinsic call can return its first argument, but missed the frame index case. Teach it to ignore that case so C code doesn't assert out in these cases. llvm-svn: 258851 --- .../Target/WebAssembly/WebAssemblyStoreResults.cpp | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'llvm/lib/Target/WebAssembly/WebAssemblyStoreResults.cpp') diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyStoreResults.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyStoreResults.cpp index 1d7fe38..5368ab7 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyStoreResults.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyStoreResults.cpp @@ -150,16 +150,22 @@ bool WebAssemblyStoreResults::runOnMachineFunction(MachineFunction &MF) { Name == TLI.getLibcallName(RTLIB::MEMSET)) { LibFunc::Func Func; if (LibInfo.getLibFunc(Name, Func)) { - if (!MI.getOperand(2).isReg()) - report_fatal_error( - "Call to builtin function with wrong signature"); - unsigned FromReg = MI.getOperand(2).getReg(); - unsigned ToReg = MI.getOperand(0).getReg(); - if (MRI.getRegClass(FromReg) != MRI.getRegClass(ToReg)) - report_fatal_error( - "Call to builtin function with wrong signature"); - Changed |= - ReplaceDominatedUses(MBB, MI, FromReg, ToReg, MRI, MDT); + const auto &Op2 = MI.getOperand(2); + if (Op2.isReg()) { + unsigned FromReg = Op2.getReg(); + unsigned ToReg = MI.getOperand(0).getReg(); + if (MRI.getRegClass(FromReg) != MRI.getRegClass(ToReg)) + report_fatal_error("Store results: call to builtin function " + "with wrong signature, from/to mismatch"); + Changed |= + ReplaceDominatedUses(MBB, MI, FromReg, ToReg, MRI, MDT); + } else if (Op2.isFI()) { + break; + } else { + report_fatal_error("Store results: call to builtin function " + "with wrong signature, not consuming reg or " + "frame index"); + } } } } -- cgit v1.1