Improvements to .section parsing:
* If we have a M or a G, reject sections without the type
* Only parse the flag specific arguments if we have M or G
* Parse the corresponding arguments for M and G
We ignore the G arguments and flag for now.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117608 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/MC/MCParser/ELFAsmParser.cpp b/lib/MC/MCParser/ELFAsmParser.cpp
index 83c562b..62cf6c6 100644
--- a/lib/MC/MCParser/ELFAsmParser.cpp
+++ b/lib/MC/MCParser/ELFAsmParser.cpp
@@ -198,7 +198,7 @@
if (ParseSectionName(SectionName))
return TokError("expected identifier in directive");
- std::string FlagsStr;
+ StringRef FlagsStr;
StringRef TypeName;
int64_t Size = 0;
if (getLexer().is(AsmToken::Comma)) {
@@ -216,21 +216,47 @@
else
TypeStartToken = AsmToken::At;
- if (getLexer().is(AsmToken::Comma)) {
- Lex();
- if (getLexer().is(TypeStartToken)) {
- Lex();
- if (getParser().ParseIdentifier(TypeName))
- return TokError("expected identifier in directive");
+ bool Mergeable = FlagsStr.find('M') != StringRef::npos;
+ bool Group = FlagsStr.find('G') != StringRef::npos;
+ if (getLexer().isNot(AsmToken::Comma)) {
+ if (Mergeable)
+ return TokError("Mergeable section must specify the type");
+ if (Group)
+ return TokError("Group section must specify the type");
+ } else {
+ Lex();
+ if (getLexer().isNot(TypeStartToken))
+ return TokError("expected the type");
+
+ Lex();
+ if (getParser().ParseIdentifier(TypeName))
+ return TokError("expected identifier in directive");
+
+ if (Mergeable) {
+ if (getLexer().isNot(AsmToken::Comma))
+ return TokError("expected the entry size");
+ Lex();
+ if (getParser().ParseAbsoluteExpression(Size))
+ return true;
+ if (Size <= 0)
+ return TokError("entry size must be positive");
+ }
+
+ if (Group) {
+ if (getLexer().isNot(AsmToken::Comma))
+ return TokError("expected group name");
+ Lex();
+ StringRef GroupName;
+ if (getParser().ParseIdentifier(GroupName))
+ return true;
if (getLexer().is(AsmToken::Comma)) {
Lex();
-
- if (getParser().ParseAbsoluteExpression(Size))
+ StringRef Linkage;
+ if (getParser().ParseIdentifier(Linkage))
return true;
-
- if (Size <= 0)
- return TokError("section size must be positive");
+ if (Linkage != "comdat" && Linkage != ".gnu.linkonce")
+ return TokError("Linkage must be 'comdat' or '.gnu.linkonce'");
}
}
}
@@ -275,6 +301,8 @@
case 'd':
Flags |= MCSectionELF::XCORE_SHF_DP_SECTION;
break;
+ case 'G':
+ break;
default:
return TokError("unknown flag");
}