Merge pull request #135 from goffrie/pr40289

alexcrichton · web-flow · commit 8ba358c8a1c7 · 2019-01-15T14:09:25.000-08:00
Cherry-pick a fix for LLVM issue 40289
diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp
@@ -185,7 +185,8 @@ static unsigned findDeadCallerSavedReg(MachineBasicBlock &MBB,
     }
 
     for (auto CS : AvailableRegs)
-      if (!Uses.count(CS) && CS != X86::RIP)
+      if (!Uses.count(CS) && CS != X86::RIP && CS != X86::RSP &&
+          CS != X86::ESP)
         return CS;
   }
   }
diff --git a/test/CodeGen/X86/pr40289-64bit.ll b/test/CodeGen/X86/pr40289-64bit.ll
@@ -0,0 +1,9 @@
+; RUN: llc < %s -mtriple=x86_64-pc-windows-msvc | FileCheck %s
+
+define cc 92 < 9 x i64 > @clobber() {
+  %1 = alloca i64
+  %2 = load volatile i64, i64* %1
+  ; CHECK-NOT: popq %rsp
+  ; CHECK: addq $8, %rsp
+  ret < 9 x i64 > undef
+}
diff --git a/test/CodeGen/X86/pr40289.ll b/test/CodeGen/X86/pr40289.ll
@@ -0,0 +1,9 @@
+; RUN: llc < %s -mtriple=i686-pc-windows-msvc | FileCheck %s
+
+define < 3 x i32 > @clobber() {
+  %1 = alloca i32
+  %2 = load volatile i32, i32* %1
+  ; CHECK-NOT: popl %esp
+  ; CHECK: addl $4, %esp
+  ret < 3 x i32 > undef
+}

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,8 @@ static unsigned findDeadCallerSavedReg(MachineBasicBlock &MBB,`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`for (auto CS : AvailableRegs)`
`188`		`- if (!Uses.count(CS) && CS != X86::RIP)`
	`188`	`+ if (!Uses.count(CS) && CS != X86::RIP && CS != X86::RSP &&`
	`189`	`+ CS != X86::ESP)`
`189`	`190`	`return CS;`
`190`	`191`	`}`
`191`	`192`	`}`