Remove M_2_ADDR_FLAG.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31583 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp
index 8d1e912..80a285e 100644
--- a/lib/Target/X86/X86CodeEmitter.cpp
+++ b/lib/Target/X86/X86CodeEmitter.cpp
@@ -470,7 +470,8 @@
REX |= 1 << 3;
if (MI.getNumOperands()) {
- bool isTwoAddr = (Desc.Flags & M_2_ADDR_FLAG) != 0;
+ bool isTwoAddr = II->getNumOperands(Opcode) > 1 &&
+ II->getOperandConstraint(Opcode, 1, TargetInstrInfo::TIED_TO) != -1;
// If it accesses SPL, BPL, SIL, or DIL, then it requires a 0x40 REX prefix.
bool isTrunc8 = isX86_64TruncToByte(Opcode);
@@ -607,7 +608,9 @@
// If this is a two-address instruction, skip one of the register operands.
unsigned CurOp = 0;
- CurOp += (Desc.Flags & M_2_ADDR_FLAG) != 0;
+ if (II->getNumOperands(Opcode) > 1 &&
+ II->getOperandConstraint(Opcode, 1, TargetInstrInfo::TIED_TO) != -1)
+ CurOp++;
unsigned char BaseOpcode = II->getBaseOpcodeFor(Opcode);
switch (Desc.TSFlags & X86II::FormMask) {