Commit c343b4ce authored by Bill Wendling's avatar Bill Wendling
Browse files

Approved by Evan: 

$ svn merge -c 113299 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113299 into '.':
U    lib/CodeGen/VirtRegRewriter.cpp

llvm-svn: 113531
parent 68d848b9

llvm/lib/CodeGen/VirtRegRewriter.cpp

+9 −16
Original line number Diff line number Diff line
@@ -67,23 +67,16 @@ VirtRegRewriter::~VirtRegRewriter() {} 
/// Note that operands may be added, so the MO reference is no longer valid.

static void substitutePhysReg(MachineOperand &MO, unsigned Reg,

                              const TargetRegisterInfo &TRI) {

  if (unsigned SubIdx = MO.getSubReg()) {

    // Insert the physical subreg and reset the subreg field.

    MO.setReg(TRI.getSubReg(Reg, SubIdx));

    MO.setSubReg(0);



    // Any def, dead, and kill flags apply to the full virtual register, so they

    // also apply to the full physical register. Add imp-def/dead and imp-kill

    // as needed.

  if (MO.getSubReg()) {

    MO.substPhysReg(Reg, TRI);



    // Any kill flags apply to the full virtual register, so they also apply to

    // the full physical register.

    // We assume that partial defs have already been decorated with a super-reg

    // <imp-def> operand by LiveIntervals.

    MachineInstr &MI = *MO.getParent();

    if (MO.isDef())

      if (MO.isDead())

        MI.addRegisterDead(Reg, &TRI, /*AddIfNotFound=*/ true);

      else

        MI.addRegisterDefined(Reg, &TRI);

    else if (!MO.isUndef() &&

             (MO.isKill() ||

              MI.isRegTiedToDefOperand(&MO-&MI.getOperand(0))))

    if (MO.isUse() && !MO.isUndef() &&

        (MO.isKill() || MI.isRegTiedToDefOperand(&MO-&MI.getOperand(0))))

      MI.addRegisterKilled(Reg, &TRI, /*AddIfNotFound=*/ true);

  } else {

    MO.setReg(Reg);