diff --git a/lib/Target/X86/InstSelectSimple.cpp b/lib/Target/X86/InstSelectSimple.cpp
index fac58cc00ff..b2b15c5b940 100644
--- a/lib/Target/X86/InstSelectSimple.cpp
+++ b/lib/Target/X86/InstSelectSimple.cpp
@@ -834,8 +834,8 @@ void ISel::promote32(unsigned targetReg, const ValueRecord &VR) {
 ///   ret float/double : Top of FP stack
 ///
 void ISel::visitReturnInst(ReturnInst &I) {
-  BuildMI(BB, X86::FP_REG_KILL, 0);
   if (I.getNumOperands() == 0) {
+    BuildMI(BB, X86::FP_REG_KILL, 0);
     BuildMI(BB, X86::RET, 0); // Just emit a 'ret' instruction
     return;
   }
@@ -866,6 +866,7 @@ void ISel::visitReturnInst(ReturnInst &I) {
     visitInstruction(I);
   }
   // Emit a 'ret' instruction
+  BuildMI(BB, X86::FP_REG_KILL, 0);
   BuildMI(BB, X86::RET, 0);
 }
 
diff --git a/lib/Target/X86/X86ISelSimple.cpp b/lib/Target/X86/X86ISelSimple.cpp
index fac58cc00ff..b2b15c5b940 100644
--- a/lib/Target/X86/X86ISelSimple.cpp
+++ b/lib/Target/X86/X86ISelSimple.cpp
@@ -834,8 +834,8 @@ void ISel::promote32(unsigned targetReg, const ValueRecord &VR) {
 ///   ret float/double : Top of FP stack
 ///
 void ISel::visitReturnInst(ReturnInst &I) {
-  BuildMI(BB, X86::FP_REG_KILL, 0);
   if (I.getNumOperands() == 0) {
+    BuildMI(BB, X86::FP_REG_KILL, 0);
     BuildMI(BB, X86::RET, 0); // Just emit a 'ret' instruction
     return;
   }
@@ -866,6 +866,7 @@ void ISel::visitReturnInst(ReturnInst &I) {
     visitInstruction(I);
   }
   // Emit a 'ret' instruction
+  BuildMI(BB, X86::FP_REG_KILL, 0);
   BuildMI(BB, X86::RET, 0);
 }