1 files changed, 3 insertions, 8 deletions
diff --git a/backend/lib/CodeGen/MachineSink.cpp b/backend/lib/CodeGen/MachineSink.cpp
index 7c540e0..95f902d 100644
--- a/backend/lib/CodeGen/MachineSink.cpp
+++ b/backend/lib/CodeGen/MachineSink.cpp
@@ -90,6 +90,9 @@ namespace {
       hasProtectedAttachment(Instruction) || !Instruction.memOperands().empty()) {
     return false;
   }
+  if (Flags.has(InstructionFlag::MayRaiseFPException) &&
+      !Instruction.flags().has(MachineInstrFlag::NoFPExcept))
+    return false;
 
   bool HasDefinition = false;
   for (const MachineOperand &Operand : Instruction.operands()) {
@@ -118,14 +121,6 @@ namespace {
     auto Info = Function.registerInfo().virtualRegisterInfo(*Reg);
     if (!Info)
       return std::unexpected(Info.error());
-    const auto &Type = Info->get().Type;
-    if (Type && Type->isFloat() && !Instruction.flags().has(MachineInstrFlag::NoFPExcept)) {
-      return false;
-    }
-  }
-  if (Stage == MachineCodeMotionStage::PostRegisterAllocation &&
-      !Instruction.flags().has(MachineInstrFlag::NoFPExcept)) {
-    return false;
   }
   return HasDefinition;
 }