[InlineSpiller] Don't call TargetInstrInfo::foldMemoryOperand with an empty list.

Since r287792 if we try to do that we will hit an assert.

llvm-svn: 289001

2 files changed, 27 insertions, 0 deletions

diff --git a/llvm/lib/CodeGen/InlineSpiller.cpp b/llvm/lib/CodeGen/InlineSpiller.cpp
index 3e5ae5f5f07..422f2dc2f2f 100644
--- a/llvm/lib/CodeGen/InlineSpiller.cpp
+++ b/llvm/lib/CodeGen/InlineSpiller.cpp
@@ -768,6 +768,11 @@ foldMemoryOperand(ArrayRef<std::pair<MachineInstr*, unsigned> > Ops,
       FoldOps.push_back(Idx);
   }
 
+  // If we only have implicit uses, we won't be able to fold that.
+  // Moreover, TargetInstrInfo::foldMemoryOperand will assert if we try!
+  if (FoldOps.empty())
+    return false;
+
   MachineInstrSpan MIS(MI);
 
   MachineInstr *FoldMI =
diff --git a/llvm/test/CodeGen/X86/implicit-use-spill.mir b/llvm/test/CodeGen/X86/implicit-use-spill.mir
new file mode 100644
index 00000000000..827f0f186ce
--- /dev/null
+++ b/llvm/test/CodeGen/X86/implicit-use-spill.mir
@@ -0,0 +1,22 @@
+# RUN: llc -run-pass=greedy -mtriple=x86_64-apple-macosx -o - %s 2>&1 | FileCheck %s
+
+# Make sure we don't assert when we try to reload a value that is just implicitly used.
+---
+# CHECK: name: foo
+# This test forces a spill of %0.
+name: foo
+registers:
+  - { id: 0, class: gr64 }
+body: |
+  bb.0:
+  ; CHECK: NOOP implicit-def [[VAL:%[0-9]+]]
+  ; VAL should be spilled before csr_noregs, i.e., before we clobber all the registers
+  ; CHECK-NEXT: MOV64mr [[SLOT:%stack.[0-9]+]], 1, _, 0, _, [[VAL]]
+  ; CHECK-NEXT: NOOP csr_noregs
+  ; We need to reload before the (implicit) use.
+  ; CHECK-NEXT: [[RELOADED_VAL:%[0-9]+]] = MOV64rm [[SLOT]], 1, _, 0, _
+  ; CHECK-NEXT: NOOP implicit [[RELOADED_VAL]]
+  NOOP implicit-def %0
+  NOOP csr_noregs
+  NOOP implicit %0
+...