diff --git a/lib/Target/X86/X86ISelPattern.cpp b/lib/Target/X86/X86ISelPattern.cpp
index 34d1356..22c926a8 100644
--- a/lib/Target/X86/X86ISelPattern.cpp
+++ b/lib/Target/X86/X86ISelPattern.cpp
@@ -331,6 +331,21 @@
       // FP_REG_KILL insertion.
       ContainsFPCode = false;
 
+      // Scan the PHI nodes that already are inserted into this basic block.  If
+      // any of them is a PHI of a floating point value, we need to insert an
+      // FP_REG_KILL.
+      SSARegMap *RegMap = BB->getParent()->getSSARegMap();
+      for (MachineBasicBlock::iterator I = BB->begin(), E = BB->end();
+           I != E; ++I) {
+        assert(I->getOpcode() == X86::PHI &&
+               "Isn't just PHI nodes?");
+        if (RegMap->getRegClass(I->getOperand(0).getReg()) ==
+            X86::RFPRegisterClass) {
+          ContainsFPCode = true;
+          break;
+        }
+      }
+
       // Compute the RegPressureMap, which is an approximation for the number of
       // registers required to compute each node.
       ComputeRegPressure(DAG.getRoot());