[llvm] r352030 - [SystemZ] Remember to reset the NoPHIs property on MF in createPHIsForSelects()

[Jonas Paulsson via llvm-commits]

Author: jonpa
Date: Wed Jan 23 23:54:41 2019
New Revision: 352030

URL: http://llvm.org/viewvc/llvm-project?rev=352030&view=rev
Log:
[SystemZ]  Remember to reset the NoPHIs property on MF in createPHIsForSelects()

After creating new PHI instructions during isel pseudo expansion, the NoPHIs
property of MF should be reset in case it was previously set.

Review: Ulrich Weigand

Modified:
    llvm/trunk/lib/Target/SystemZ/SystemZISelLowering.cpp
    llvm/trunk/test/CodeGen/SystemZ/debuginstr-02.mir

Modified: llvm/trunk/lib/Target/SystemZ/SystemZISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/SystemZISelLowering.cpp?rev=352030&r1=352029&r2=352030&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/SystemZISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/SystemZ/SystemZISelLowering.cpp Wed Jan 23 23:54:41 2019
@@ -6237,6 +6237,8 @@ static void createPHIsForSelects(Machine
     // Add this PHI to the rewrite table.
     RegRewriteTable[DestReg] = std::make_pair(TrueReg, FalseReg);
   }
+
+  MF->getProperties().reset(MachineFunctionProperties::Property::NoPHIs);
 }
 
 // Implement EmitInstrWithCustomInserter for pseudo Select* instruction MI.

Modified: llvm/trunk/test/CodeGen/SystemZ/debuginstr-02.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/debuginstr-02.mir?rev=352030&r1=352029&r2=352030&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/debuginstr-02.mir (original)
+++ llvm/trunk/test/CodeGen/SystemZ/debuginstr-02.mir Wed Jan 23 23:54:41 2019
@@ -1,8 +1,8 @@
 # Check that the backend can handle consecutive select instructions also in
 # the presence of DEBUG_VALUE machine instructions.
 #
-# RUN: llc %s -mtriple=s390x-linux-gnu -mcpu=z13 -start-before=expand-isel-pseudos \
-# RUN:   -o - 2>&1 | FileCheck %s
+# RUN: llc %s -verify-machineinstrs -mtriple=s390x-linux-gnu -mcpu=z13 \
+# RUN:   -start-before=expand-isel-pseudos -o - 2>&1 | FileCheck %s
 #
 # CHECK-LABEL: %bb.1:
 # CHECK:       ldr