From: Jonas Paulsson Date: Thu, 24 Jan 2019 07:54:41 +0000 (+0000) Subject: [SystemZ] Remember to reset the NoPHIs property on MF in createPHIsForSelects() X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ca3aae4063f87c27882df51d7293d1bf0063a33;p=llvm [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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@352030 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/SystemZ/SystemZISelLowering.cpp b/lib/Target/SystemZ/SystemZISelLowering.cpp index 0c41f38554f..5a59a33d074 100644 --- a/lib/Target/SystemZ/SystemZISelLowering.cpp +++ b/lib/Target/SystemZ/SystemZISelLowering.cpp @@ -6237,6 +6237,8 @@ static void createPHIsForSelects(MachineBasicBlock::iterator MIItBegin, // 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. diff --git a/test/CodeGen/SystemZ/debuginstr-02.mir b/test/CodeGen/SystemZ/debuginstr-02.mir index 6083c26eeae..205e8b9095a 100644 --- a/test/CodeGen/SystemZ/debuginstr-02.mir +++ b/test/CodeGen/SystemZ/debuginstr-02.mir @@ -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