[PATCH] D153950: Reset NoPHI MachineFunction property in X86CmovConversion

[Orlando Cazalet-Hyams via Phabricator via llvm-commits]

Orlando created this revision.
Herald added subscribers: pengfei, hiraditya.
Herald added a project: All.
Orlando requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

In order to placate the machine-verifier, X86CmovConversion needs to reset the NoPHI property when it inserts a PHI.

Fixes buildbot failure: https://lab.llvm.org/buildbot/#/builders/16/builds/50453


https://reviews.llvm.org/D153950

Files:
  llvm/lib/Target/X86/X86CmovConversion.cpp


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 ]
     //  ...


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D153950.535275.patch
Type: text/x-patch
Size: 568 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230628/234cf020/attachment.bin>