[llvm] r335370 - [X86] Don't allow ESP/RSP to be used as an index register in assembly.

[Craig Topper via llvm-commits]

Author: ctopper
Date: Fri Jun 22 10:15:58 2018
New Revision: 335370

URL: http://llvm.org/viewvc/llvm-project?rev=335370&view=rev
Log:
[X86] Don't allow ESP/RSP to be used as an index register in assembly.

Fixes PR37892

Modified:
    llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
    llvm/trunk/test/MC/X86/x86_errors.s

Modified: llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp?rev=335370&r1=335369&r2=335370&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp Fri Jun 22 10:15:58 2018
@@ -976,7 +976,8 @@ static bool CheckBaseRegAndIndexRegAndSc
   // both 64-bit or 32-bit registers.
   // To support VSIB, IndexReg can be 128-bit or 256-bit registers.
 
-  if ((BaseReg == X86::RIP && IndexReg != 0) || (IndexReg == X86::RIP)) {
+  if ((BaseReg == X86::RIP && IndexReg != 0) || (IndexReg == X86::RIP) ||
+      (IndexReg == X86::ESP) || (IndexReg == X86::RSP)) {
     ErrMsg = "invalid base+index expression";
     return true;
   }

Modified: llvm/trunk/test/MC/X86/x86_errors.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/x86_errors.s?rev=335370&r1=335369&r2=335370&view=diff
==============================================================================
--- llvm/trunk/test/MC/X86/x86_errors.s (original)
+++ llvm/trunk/test/MC/X86/x86_errors.s Fri Jun 22 10:15:58 2018
@@ -81,3 +81,11 @@ mov (%rax,%rip), %rbx
 
 // 32: error: instruction requires: 64-bit mode
 ljmpq *(%eax)
+
+// 32: error: register %rax is only available in 64-bit mode
+// 64: error: invalid base+index expression
+leaq (%rax,%rsp), %rax
+
+// 32: error: invalid base+index expression
+// 64: error: invalid base+index expression
+leaq (%eax,%esp), %eax