[ARM] Parse Tag_compatibility correctly.

[• chatur01]

Summary

Tag_compatibility takes two arguments, but before this patch it would
erroneously accept just one, it now produces an error in that case.

[t.p.northover]

Hi Charlie,

Just one question on the test:

test/MC/ARM/directive-eabi_attribute-diagnostics.s

31

Is this supposed to be Tag_compatibility?

[• chatur01]

Sorry about that Tim, oversight. Thank you for reviewing.

Merry Christmas!

[t.p.northover]

Thanks Charlie, that looks fine then.

Tim.

[• chatur01]

Thanks for reviewing again Tim :) Committed r225167.

lib/Target/ARM/AsmParser/ARMAsmParser.cpp

       Parser.eatToEndOfStatement();
       return false;
     }
 
     IntegerValue = CE->getValue();
   }
 
   if (Tag == ARMBuildAttrs::compatibility) {
-    if (Parser.getTok().isNot(AsmToken::Comma))
-      IsStringValue = false;
-    else
+    if (Parser.getTok().isNot(AsmToken::Comma)) {
+      Error(Parser.getTok().getLoc(), "comma expected");
+      Parser.eatToEndOfStatement();
+      return false;
+    } else {
       Parser.Lex();
+    }
   }
 
   if (IsStringValue) {
     if (Parser.getTok().isNot(AsmToken::String)) {
       Error(Parser.getTok().getLoc(), "bad string constant");
       Parser.eatToEndOfStatement();
       return false;
     }

test/MC/ARM/directive-eabi_attribute-diagnostics.s

 @ CHECK: error: bad string constant
 @ CHECK:  .eabi_attribute 43, 43
 @ CHECK:                            ^
 
   .eabi_attribute 0
 @ CHECK: error: comma expected
 @ CHECK:  .eabi_attribute 0
 @ CHECK:                         ^
+  .eabi_attribute Tag_compatibility, 1
+@ CHECK: error: comma expected
+@ CHECK: .eabi_attribute Tag_compatibility, 1
+@ CHECK:                                     ^
 
   .eabi_attribute Tag_MPextension_use_old, 0
 @ CHECK: error: attribute name not recognised: Tag_MPextension_use_old
 @ CHECK:  .eabi_attribute Tag_MPextension_use_old, 0
 @ CHECK:                        ^
 

test/MC/ARM/directive-eabi_attribute-overwrite.s

 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
 @ RUN:   | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
 
   .syntax unified
   .thumb
-@ FIXME: The next directive is not correct, Tag_compatibility isn't getting parsed correctly.
-  .eabi_attribute Tag_compatibility, 1
   .eabi_attribute Tag_compatibility, 1, "aeabi"
 
 @ CHECK-ATTR: FileAttributes {
 @ CHECK-ATTR:   Attribute {
 @ CHECK-ATTR:     Value: 1, aeabi
 @ CHECK-ATTR:     TagName: compatibility
 @ CHECK-ATTR:     Description: AEABI Conformant
 @ CHECK-ATTR:   }
 @ CHECK-ATTR: }
 

test/MC/ARM/directive-eabi_attribute.s

 @ CHECK-OBJ-NEXT:   TagName: ABI_WMMX_args
 @ CHECK-OBJ-NEXT:   Description: AAPCS
   .eabi_attribute Tag_ABI_FP_optimization_goals, 1
 @ CHECK: .eabi_attribute 31, 1
 @ CHECK-OBJ:        Tag: 31
 @ CHECK-OBJ-NEXT:   Value: 1
 @ CHECK-OBJ-NEXT:   TagName: ABI_FP_optimization_goals
 @ CHECK-OBJ-NEXT:   Description: Speed
-  .eabi_attribute Tag_compatibility, 1
-@ CHECK: .eabi_attribute 32, 1
   .eabi_attribute Tag_compatibility, 1, "aeabi"
 @ CHECK: .eabi_attribute 32, 1, "aeabi"
 @ CHECK-OBJ:        Tag: 32
 @ CHECK-OBJ-NEXT:   Value: 1, aeabi
 @ CHECK-OBJ-NEXT:   TagName: compatibility
 @ CHECK-OBJ-NEXT:   Description: AEABI Conformant
   .eabi_attribute Tag_CPU_unaligned_access, 0
 @ CHECK: .eabi_attribute 34, 0