diff --git a/llvm/lib/Target/X86/X86Instr64bit.td b/llvm/lib/Target/X86/X86Instr64bit.td
index 1347831cf011..9824b2e3c2e9 100644
--- a/llvm/lib/Target/X86/X86Instr64bit.td
+++ b/llvm/lib/Target/X86/X86Instr64bit.td
@@ -36,14 +36,14 @@ def i64i8imm   : Operand<i64> {
 def lea64mem : Operand<i64> {
   let PrintMethod = "printlea64mem";
   let MIOperandInfo = (ops GR64, i8imm, GR64_NOSP, i32imm);
-  let ParserMatchClass = X86MemAsmOperand;
+  let ParserMatchClass = X86NoSegMemAsmOperand;
 }
 
 def lea64_32mem : Operand<i32> {
   let PrintMethod = "printlea64_32mem";
   let AsmOperandLowerMethod = "lower_lea64_32mem";
   let MIOperandInfo = (ops GR32, i8imm, GR32_NOSP, i32imm);
-  let ParserMatchClass = X86MemAsmOperand;
+  let ParserMatchClass = X86NoSegMemAsmOperand;
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/test/MC/AsmParser/X86/x86_64-operands.s b/llvm/test/MC/AsmParser/X86/x86_64-operands.s
index fceeb9dac4d8..9e15779138cf 100644
--- a/llvm/test/MC/AsmParser/X86/x86_64-operands.s
+++ b/llvm/test/MC/AsmParser/X86/x86_64-operands.s
@@ -5,4 +5,5 @@
 # CHECK: callq a
         callq a
 
-        
+# CHECK: leaq	-40(%rbp), %r15
+	leaq	-40(%rbp), %r15