[WebAssembly] Fix error location for parsed symbol/label operands

[asb]

Summary

The previous code didn't take account for the fact that parseExpression my lex additional tokens - because of this, it's necessary to record the location of the current token ahead of the call. This patch additionally makes use of the fact parseExpression will set its End parameter to the end of the expression.

Although this fix could be added independently of D122127, I've opted to make it a child patch in order to ensure the change has some test coverage.

llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp

while (Lexer.isNot(AsmToken::EndOfStatement)) {
           auto BT = WebAssembly::parseBlockType(Id.getString());
           if (BT == WebAssembly::BlockType::Invalid)
             return error("Unknown block type: ", Id);
           addBlockTypeOperand(Operands, NameLoc, BT);
           Parser.Lex();
         } else {
           // Assume this identifier is a label.
           const MCExpr *Val;
+          SMLoc Start = Id.getLoc();
           SMLoc End;
           if (Parser.parseExpression(Val, End))
             return error("Cannot parse symbol: ", Lexer.getTok());
           Operands.push_back(std::make_unique<WebAssemblyOperand>(
-              WebAssemblyOperand::Symbol, Id.getLoc(), Id.getEndLoc(),
+              WebAssemblyOperand::Symbol, Start, End,
               WebAssemblyOperand::SymOp{Val}));
           if (checkForP2AlignIfLoadStore(Operands, Name))
             return true;
         }
         break;
       }
       case AsmToken::Minus:
         Parser.Lex();

llvm/test/MC/WebAssembly/type-checker-errors.s

local_tee_type_mismatch:
   .local f32
   i32.const 1
 # CHECK: :[[@LINE+1]]:3: error: popped i32, expected f32
   local.tee 0
   end_function
 
 global_get_missing_globaltype:
   .functype global_get_missing_globaltype () -> ()
-# FIXME: Error location should be at beginning of operand.
-# CHECK: :[[@LINE+1]]:17: error: symbol foo missing .globaltype
+# CHECK: :[[@LINE+1]]:14: error: symbol foo missing .globaltype
   global.get foo
   end_function
 
 global_get_expected_expression_operand:
   .functype global_get_expected_expression_operand () -> ()
 # CHECK: :[[@LINE+1]]:14: error: expected expression operand
   global.get 1
   end_function
 
 global_set_missing_globaltype:
   .functype global_set_missing_globaltype () -> ()
-# FIXME: Error location should be at beginning of operand.
-# CHECK: :[[@LINE+1]]:17: error: symbol foo missing .globaltype
+# CHECK: :[[@LINE+1]]:14: error: symbol foo missing .globaltype
   global.set foo
   end_function
 
 global_set_expected_expression_operand:
   .functype global_set_expected_expression_operand () -> ()
 # CHECK: :[[@LINE+1]]:14: error: expected expression operand
   global.set 1
   end_function

 table_get_expected_expression_operand:
   .functype table_get_expected_expression_operand () -> ()
 # CHECK: :[[@LINE+1]]:13: error: expected expression operand
   table.get 1
   end_function
 
 table_get_missing_tabletype:
   .functype table_get_missing_tabletype () -> ()
-# FIXME: Error location should be at beginning of operand.
-# CHECK: :[[@LINE+1]]:16: error: symbol foo missing .tabletype
+# CHECK: :[[@LINE+1]]:13: error: symbol foo missing .tabletype
   table.get foo
   end_function
 
 .tabletype valid_table, externref
 
 table_get_empty_stack_while_popping:
   .functype table_get_empty_stack_while_popping () -> ()
 # CHECK: :[[@LINE+1]]:3: error: empty stack while popping i32

 table_set_expected_expression_operand:
   .functype table_set_expected_expression_operand () -> ()
 # CHECK: :[[@LINE+1]]:13: error: expected expression operand
   table.set 1
   end_function
 
 table_set_missing_tabletype:
   .functype table_set_missing_tabletype () -> ()
-# FIXME: Error location should be at beginning ofoperand.
-# CHECK: :[[@LINE+1]]:16: error: symbol foo missing .tabletype
+# CHECK: :[[@LINE+1]]:13: error: symbol foo missing .tabletype
   table.set foo
   end_function
 
 table_set_empty_stack_while_popping_1:
   .functype table_set_empty_stack_while_popping_1 () -> ()
 # CHECK: :[[@LINE+1]]:3: error: empty stack while popping externref
   table.set valid_table
   end_function

 table_fill_expected_expression_operand:
   .functype table_fill_expected_expression_operand () -> ()
 # CHECK: :[[@LINE+1]]:14: error: expected expression operand
   table.fill 1
   end_function
 
 table_fill_missing_tabletype:
   .functype table_fill_missing_tabletype () -> ()
-# FIXME: Error location should be at beginning of operand.
-# CHECK: :[[@LINE+1]]:17: error: symbol foo missing .tabletype
+# CHECK: :[[@LINE+1]]:14: error: symbol foo missing .tabletype
   table.fill foo
   end_function
 
 table_fill_empty_stack_while_popping_1:
   .functype table_fill_empty_stack_while_popping_1 () -> ()
 # CHECK: :[[@LINE+1]]:3: error: empty stack while popping i32
   table.fill valid_table
   end_function

 call_superfluous_value_at_end:
   .functype call_superfluous_value_at_end () -> ()
   call fn_void_to_i32
 # CHECK: :[[@LINE+1]]:3: error: 1 superfluous return values
   end_function
 
 call_missing_functype:
   .functype call_missing_functype () -> ()
-# FIXME: Error location should be at beginning of operand.
-# CHECK: :[[@LINE+1]]:19: error: symbol no_functype missing .functype
+# CHECK: :[[@LINE+1]]:8: error: symbol no_functype missing .functype
   call no_functype
   end_function
 
 return_call_expected_expression_operand:
   .functype return_call_expected_expression_operand () -> ()
 # CHECK: :[[@LINE+1]]:15: error: expected expression operand
   return_call 1
   end_function
 
 return_call_empty_stack_while_popping:
   .functype return_call_empty_stack_while_popping () -> ()
 # CHECK: [[@LINE+1]]:3: error: empty stack while popping i32
   return_call fn_i32_to_void
   end_function
 
 return_call_type_mismatch:
   .functype return_call_type_mismatch () -> ()
   f32.const 1.0
 # CHECK: :[[@LINE+1]]:3: error: popped f32, expected i32
   return_call fn_i32_to_void
   end_function
 
 return_call_missing_functype:
   .functype return_call_missing_functype () -> ()
-# FIXME: Error location should be at beginning of operand.
-# CHECK: :[[@LINE+1]]:26: error: symbol no_functype missing .functype
+# CHECK: :[[@LINE+1]]:15: error: symbol no_functype missing .functype
   return_call no_functype
   end_function
 
 catch_expected_expression_operand:
   .functype catch_expected_expression_operand () -> ()
   try
 # CHECK: :[[@LINE+1]]:9: error: expected expression operand
   catch 1
   end_try
   end_function
 
 catch_missing_tagtype:
   .functype catch_missing_tagtype () -> ()
   try
-# FIXME: Error location should be at beginning of operand.
-# CHECK: :[[@LINE+1]]:19: error: symbol no_tagtype missing .tagtype
+# CHECK: :[[@LINE+1]]:9: error: symbol no_tagtype missing .tagtype
   catch no_tagtype
   end_try
   end_function
 
 catch_superfluous_value_at_end:
   .functype catch_superfluous_value_at_end () -> ()
   .tagtype tag_i32 i32
   try