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

2 files changed, 31 insertions, 20 deletions

diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyPeephole.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyPeephole.cpp
index 39a4bf9dce5..5f457f0a06e 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyPeephole.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyPeephole.cpp
@@ -113,16 +113,21 @@ bool WebAssemblyPeephole::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");
-              MachineOperand &MO = MI.getOperand(0);
-              unsigned OldReg = MO.getReg();
-              unsigned NewReg = MI.getOperand(2).getReg();
-              if (MRI.getRegClass(NewReg) != MRI.getRegClass(OldReg))
-                report_fatal_error(
-                    "Call to builtin function with wrong signature");
-              Changed |= MaybeRewriteToDiscard(OldReg, NewReg, MO, MFI, MRI);
+              const auto &Op2 = MI.getOperand(2);
+              if (Op2.isReg()) {
+                MachineOperand &MO = MI.getOperand(0);
+                unsigned OldReg = MO.getReg();
+                unsigned NewReg = Op2.getReg();
+                if (MRI.getRegClass(NewReg) != MRI.getRegClass(OldReg))
+                  report_fatal_error("Peephole: call to builtin function with "
+                                     "wrong signature, from/to mismatch");
+                Changed |= MaybeRewriteToDiscard(OldReg, NewReg, MO, MFI, MRI);
+              } else if (Op2.isFI()) {
+                break;
+              } else {
+                report_fatal_error("Peephole: call to builtin function with "
+                                   "wrong signature, not consuming reg");
+              }
             }
           }
         }
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyStoreResults.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyStoreResults.cpp
index 1d7fe387c41..5368ab7bf4c 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");
+              }
             }
           }
         }