M_DUMMY_PHI_FLAG is no longer used to distinguish V9::PHI. Get rid of it and

its TargetInstrInfo accessor.

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

diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h
index cf1d11a9377ac4cd0ab3f763828b8c1d1a68d17e..bc25fa722b7dedb212e08c912099cfd2d2216208 100644 (file)
--- a/include/llvm/Target/TargetInstrInfo.h
+++ b/include/llvm/Target/TargetInstrInfo.h
@@ -51,7 +51,6 @@ const unsigned M_BARRIER_FLAG           = 1 << 4;
 const unsigned M_CC_FLAG               = 1 << 6;
 const unsigned M_LOAD_FLAG             = 1 << 10;
 const unsigned M_STORE_FLAG            = 1 << 12;
-const unsigned M_DUMMY_PHI_FLAG        = 1 << 13;
 // 3-addr instructions which really work like 2-addr ones, eg. X86 add/sub
 const unsigned M_2_ADDR_FLAG           = 1 << 15;
 
@@ -203,10 +202,6 @@ public:
   bool isStore(MachineOpCode Opcode) const {
     return get(Opcode).Flags & M_STORE_FLAG;
   }
-  bool isDummyPhiInstr(MachineOpCode Opcode) const {
-    return get(Opcode).Flags & M_DUMMY_PHI_FLAG;
-  }
-
   virtual bool hasResultInterlock(MachineOpCode Opcode) const {
     return true;
   }

diff --git a/lib/Target/SparcV9/SparcV9Instr.def b/lib/Target/SparcV9/SparcV9Instr.def
index b0f550287a8c7ef9a801157ad4b9e89abbccf265..53d24a596a441678bb35bc986fae7510cde0ff61 100644 (file)
--- a/lib/Target/SparcV9/SparcV9Instr.def
+++ b/lib/Target/SparcV9/SparcV9Instr.def
@@ -530,8 +530,7 @@ I(WRCCRi,  "wr",         3,   2, 0, false,  0,  1,  SPARC_SINGLE,   M_CC_FLAG)
 
 // Synthetic phi operation for near-SSA form of machine code
 // Number of operands is variable, indicated by -1.  Result is the first op.
-I(PHI, "<phi>",        -1, 0,   0, false, 0, 0,  SPARC_NONE,  M_DUMMY_PHI_FLAG)
-
+I(PHI, "<phi>",        -1, 0,   0, false, 0, 0,  SPARC_NONE,  0)
 
 #undef B5
 #undef B6