X86AsmParser AVX-512: Return error instead of hitting assert

[BrandonTJones]

Summary

When parsing a sequence of tokens beginning with {, it will hit an assert and crash if the token afterwards is not an identifier. Instead of this, return a more verbose error as seen elsewhere in the function.

[BrandonTJones]

ping

[RKSimon]

test case?

[BrandonTJones]

In D57375#1387059, @RKSimon wrote:

test case?

I could not find the file that includes the test case for other similar errors (such as the closing curly brace). It seems to not exist.
Should I create a new test file for this?

[RKSimon]

In D57375#1387060, @BrandonTJones wrote:

In D57375#1387059, @RKSimon wrote:

test case?

I could not find the file that includes the test case for other similar errors (such as the closing curly brace). It seems to not exist.
Should I create a new test file for this?

Yes please, if you can set it up handling this case then we can add more complete test coverage in the future.

[BrandonTJones]

Added test case.

[BrandonTJones]

ping

[RKSimon]

@craig.topper Any comments?

[craig.topper]

LGTM

[BrandonTJones]

I will need someone to commit this change for me. I do not have permission to commit to the svn repo.

llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp

 
 //ParseRoundingModeOp - Parse AVX-512 rounding mode operand
 std::unique_ptr<X86Operand>
 X86AsmParser::ParseRoundingModeOp(SMLoc Start) {
   MCAsmParser &Parser = getParser();
   const AsmToken &Tok = Parser.getTok();
   // Eat "{" and mark the current place.
   const SMLoc consumedToken = consumeToken();
+  if (Tok.isNot(AsmToken::Identifier))
+    return ErrorOperand(Tok.getLoc(), "Expected an identifier after {");
   if (Tok.getIdentifier().startswith("r")){
     int rndMode = StringSwitch<int>(Tok.getIdentifier())
       .Case("rn", X86::STATIC_ROUNDING::TO_NEAREST_INT)
       .Case("rd", X86::STATIC_ROUNDING::TO_NEG_INF)
       .Case("ru", X86::STATIC_ROUNDING::TO_POS_INF)
       .Case("rz", X86::STATIC_ROUNDING::TO_ZERO)
       .Default(-1);
     if (-1 == rndMode)

llvm/test/MC/X86/avx512-err.s

 // RUN: not llvm-mc %s -triple x86_64-unknown-unknown --show-encoding -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
 
 // ERR: Register k0 can't be used as write mask
 vpcmpd $1, %zmm24, %zmm7, %k5{%k0}
 
 // ERR: Expected a {z} mark at this point
 vfmsub213ps %zmm8, %zmm8, %zmm8{%k2} {rn-sae}
 
 // ERR: Expected an op-mask register at this point
 vfmsub213ps %zmm8, %zmm8, %zmm8 {rn-sae}
 
 // ERR: invalid operand for instruction
 cvtsd2sil  {rn-sae}, %xmm1, %eax
+
+// ERR: Expected an identifier after {
+cvtsd2sil  {{sae}, %xmm1, %eax