Revert changes. Will implement this using a different set of primitives

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11091 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 8f223b37bf109da9b7c3f4734f5beba6bba8a9ca..670f9721ae8c2d870a49ed1de5ee592792dda2df 100644 (file)
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -288,9 +288,6 @@ public:
   bool          isHiBits64      () const { return flags & HIFLAG64; }
   bool          isLoBits64      () const { return flags & LOFLAG64; }
 
-  MachineOperand& setUse      () { flags |= USEFLAG; return *this; }
-  MachineOperand& setDef      () { flags |= DEFFLAG; return *this; }
-
   // used to check if a machine register has been allocated to this operand
   bool hasAllocatedReg() const {
     return (regNum >= 0 &&

diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp
index ecd22abe31129b1df37b98cba450f2a43c1d8327..991be42e5317956788860e028061c00d81d79b88 100644 (file)
--- a/lib/CodeGen/TwoAddressInstructionPass.cpp
+++ b/lib/CodeGen/TwoAddressInstructionPass.cpp
@@ -146,17 +146,11 @@ bool TwoAddressInstructionPass::runOnMachineFunction(MachineFunction &MF) {
                 LV.addVirtualRegisterDead(regB, &*mbbi, prevMi);
 
             // replace all occurences of regB with regA
-            // and mark all uses and defs of regA as def&use
             for (unsigned i = 1; i < mi->getNumOperands(); ++i) {
-                MachineOperand& op = mi->getOperand(i);
-                if (op.isRegister()) {
-                    if (op.getReg() == regB)
-                        mi->SetMachineOperandReg(i, regA);
-                    if (op.getReg() == regA)
-                        op.setDef().setUse();
-                }
+                if (mi->getOperand(i).isRegister() &&
+                    mi->getOperand(i).getReg() == regB)
+                    mi->SetMachineOperandReg(i, regA);
             }
-
             DEBUG(std::cerr << "\t\tmodified original to: ";
                   mi->print(std::cerr, TM));
             assert(mi->getOperand(0).getAllocatedRegNum() ==