Index: llvm/lib/Target/X86/X86CmovConversion.cpp
===================================================================
--- llvm/lib/Target/X86/X86CmovConversion.cpp
+++ llvm/lib/Target/X86/X86CmovConversion.cpp
@@ -851,6 +851,9 @@
     if (Op2Itr != RegRewriteTable.end())
       Op2Reg = Op2Itr->second.second;
 
+    // Required to avoid conflict with the MachineVerifier during testing.
+    F->getProperties().reset(MachineFunctionProperties::Property::NoPHIs);
+
     //  SinkMBB:
     //   %Result = phi [ %FalseValue, FalseMBB ], [ %TrueValue, MBB ]
     //  ...