[llvm] 3aabfa2 - [ms] [llvm-ml] Restore omitted changes requested by reviewer

[Eric Astor via llvm-commits]

Author: Eric Astor
Date: 2020-07-13T10:49:19-04:00
New Revision: 3aabfa28086757f8469ead77c7d319302e49d3c8

URL: https://github.com/llvm/llvm-project/commit/3aabfa28086757f8469ead77c7d319302e49d3c8
DIFF: https://github.com/llvm/llvm-project/commit/3aabfa28086757f8469ead77c7d319302e49d3c8.diff

LOG: [ms] [llvm-ml] Restore omitted changes requested by reviewer

Added: 
    

Modified: 
    llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
    llvm/test/tools/llvm-ml/struct.test

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
index fc8813e79a3e..a3014b2aba92 100644
--- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -1657,7 +1657,7 @@ bool X86AsmParser::ParseIntelExpression(IntelExprStateMachine &SM, SMLoc &End) {
         if (NextTok.is(AsmToken::Identifier) &&
             NextTok.getIdentifier().equals_lower("ptr")) {
           SM.onCast(Identifier);
-          // eat type and ptr
+          // Eat type and PTR.
           consumeToken();
           End = consumeToken();
           break;

diff  --git a/llvm/test/tools/llvm-ml/struct.test b/llvm/test/tools/llvm-ml/struct.test
index 3971cfd6eb23..fa85ecd455dd 100644
--- a/llvm/test/tools/llvm-ml/struct.test
+++ b/llvm/test/tools/llvm-ml/struct.test
@@ -156,6 +156,7 @@ QUUX STRUCT
       x BYTE ?
       y BYTE ?
     ENDS
+    after_struct BYTE ?
   ENDS
   z DWORD ?
 QUUX ENDS
@@ -166,6 +167,7 @@ mov eax, [ebx].QUUX.v
 mov eax, [ebx].QUUX.w
 mov eax, [ebx].QUUX.x
 mov eax, [ebx].QUUX.y
+mov eax, [ebx].QUUX.after_struct
 mov eax, [ebx].QUUX.z
 
 ; CHECK: t9:
@@ -174,6 +176,7 @@ mov eax, [ebx].QUUX.z
 ; CHECK-NEXT: mov eax, dword ptr [ebx + 4]
 ; CHECK-NEXT: mov eax, dword ptr [ebx + 4]
 ; CHECK-NEXT: mov eax, dword ptr [ebx + 5]
+; CHECK-NEXT: mov eax, dword ptr [ebx + 4]
 ; CHECK-NEXT: mov eax, dword ptr [ebx + 8]
 
 t10: