diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index a9bbf3d1a6e..b461b8a7a9c 100644
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -662,13 +662,6 @@ void X86RegisterInfo::emitFrameMoves(MachineFunction &MF,
      TargetFrameInfo::StackGrowsUp ?
      TD->getPointerSize() : -TD->getPointerSize());
 
-  if (hasFP(MF)) {
-    // Save FP
-    MachineLocation FPDst(MachineLocation::VirtualFP, 2*stackGrowth);
-    MachineLocation FPSrc(FramePtr);
-    Moves.push_back(MachineMove(ReadyLabelId, FPDst, FPSrc));
-  }
-
   MachineLocation FPDst(hasFP(MF) ? FramePtr : StackPtr);
   MachineLocation FPSrc(MachineLocation::VirtualFP);
   Moves.push_back(MachineMove(ReadyLabelId, FPDst, FPSrc));
@@ -715,6 +708,13 @@ void X86RegisterInfo::emitFrameMoves(MachineFunction &MF,
     MachineLocation CSSrc(Reg);
     Moves.push_back(MachineMove(FrameLabelId, CSDst, CSSrc));
   }
+
+  if (hasFP(MF)) {
+    // Save FP
+    MachineLocation FPDst(MachineLocation::VirtualFP, 2*stackGrowth);
+    MachineLocation FPSrc(FramePtr);
+    Moves.push_back(MachineMove(ReadyLabelId, FPDst, FPSrc));
+  }
 }