fixup! Fix error message

Change-Id: I4d10a0480e008419f6e962e7467b9076f7bd9826

Author: hchandel

llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp

@@ -1667,10 +1667,11 @@ bool RISCVAsmParser::matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
     return generateImmOutOfRangeError(Operands, ErrorInfo, 1, (1 << 5));
   case Match_InvalidUImm5GE6Plus1:
     return generateImmOutOfRangeError(Operands, ErrorInfo, 6, (1 << 5));
-  case Match_InvalidUImm5Slist:
-    return generateImmOutOfRangeError(
-        Operands, ErrorInfo, 0, (1 << 5) - 1,
-        "immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31 in the range ");
+  case Match_InvalidUImm5Slist: {
+    SMLoc ErrorLoc = ((RISCVOperand &)*Operands[ErrorInfo]).getStartLoc();
+    return Error(ErrorLoc,
+                 "immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31");
+  }
   case Match_InvalidUImm6:
     return generateImmOutOfRangeError(Operands, ErrorInfo, 0, (1 << 6) - 1);
   case Match_InvalidUImm7:

llvm/test/MC/RISCV/xqcisync-invalid.s

@@ -69,7 +69,7 @@ qc.syncwl
 qc.syncwl  1
 
 
-# CHECK-PLUS: :[[@LINE+1]]:11: error: immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31 in the range [0, 31]
+# CHECK-PLUS: :[[@LINE+1]]:11: error: immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31
 qc.c.sync 45
 
 # CHECK: :[[@LINE+1]]:15: error: invalid operand for instruction
@@ -82,7 +82,7 @@ qc.c.sync
 qc.c.sync 8
 
 
-# CHECK-PLUS: :[[@LINE+1]]:12: error: immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31 in the range [0, 31]
+# CHECK-PLUS: :[[@LINE+1]]:12: error: immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31
 qc.c.syncr 56
 
 # CHECK: :[[@LINE+1]]:16: error: invalid operand for instruction
@@ -95,7 +95,7 @@ qc.c.syncr
 qc.c.syncr   8
 
 
-# CHECK-PLUS: :[[@LINE+1]]:13: error: immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31 in the range [0, 31]
+# CHECK-PLUS: :[[@LINE+1]]:13: error: immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31
 qc.c.syncwf 88
 
 # CHECK: :[[@LINE+1]]:16: error: invalid operand for instruction
@@ -108,7 +108,7 @@ qc.c.syncwf
 qc.c.syncwf  31
 
 
-# CHECK-PLUS: :[[@LINE+1]]:13: error: immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31 in the range [0, 31]
+# CHECK-PLUS: :[[@LINE+1]]:13: error: immediate must be one of: 0, 1, 2, 4, 8, 15, 16, 31
 qc.c.syncwl 99
 
 # CHECK: :[[@LINE+1]]:17: error: invalid operand for instruction