[llvm-commits] [llvm] r92300 - in /llvm/trunk/lib/AsmParser: LLParser.cpp LLParser.h
Chris Lattner
sabre at nondot.org
Tue Dec 29 21:31:20 PST 2009
Author: lattner
Date: Tue Dec 29 23:31:19 2009
New Revision: 92300
URL: http://llvm.org/viewvc/llvm-project?rev=92300&view=rev
Log:
rename ParseOptionalCustomMetadata -> ParseInstructionMetadata,
and make it non-optional. This fixes the bug where we'd accept
and ignore a spurious comma after some instructions.
Modified:
llvm/trunk/lib/AsmParser/LLParser.cpp
llvm/trunk/lib/AsmParser/LLParser.h
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=92300&r1=92299&r2=92300&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Tue Dec 29 23:31:19 2009
@@ -1063,14 +1063,13 @@
return false;
}
-/// ParseOptionalCustomMetadata
-/// ::= /* empty */
+/// ParseInstructionMetadata
/// ::= !dbg !42 (',' !dbg !57)*
-bool LLParser::ParseOptionalCustomMetadata() {
- if (Lex.getKind() != lltok::MetadataVar)
- return false;
+bool LLParser::ParseInstructionMetadata() {
+ do {
+ if (Lex.getKind() != lltok::MetadataVar)
+ return TokError("expected metadata after comma");
- while (1) {
std::string Name = Lex.getStrVal();
Lex.Lex();
@@ -1083,13 +1082,8 @@
MDsOnInst.push_back(std::make_pair(MDK, Node));
// If this is the end of the list, we're done.
- if (!EatIfPresent(lltok::comma))
- return false;
-
- // The next value must be a custom metadata id.
- if (Lex.getKind() != lltok::MetadataVar)
- return TokError("expected more custom metadata ids");
- }
+ } while (EatIfPresent(lltok::comma));
+ return false;
}
/// ParseOptionalAlignment
@@ -1113,7 +1107,7 @@
// FIXME: Handle customized metadata info attached with an instruction.
do {
if (Lex.getKind() == lltok::MetadataVar) {
- if (ParseOptionalCustomMetadata()) return true;
+ if (ParseInstructionMetadata()) return true;
} else if (Lex.getKind() == lltok::kw_align) {
if (ParseOptionalAlignment(Alignment)) return true;
} else
@@ -2820,16 +2814,13 @@
// With a normal result, we check to see if the instruction is followed by
// a comma and metadata.
if (EatIfPresent(lltok::comma))
- if (ParseOptionalCustomMetadata())
+ if (ParseInstructionMetadata())
return true;
break;
case InstExtraComma:
// If the instruction parser ate an extra comma at the end of it, it
// *must* be followed by metadata.
- if (Lex.getKind() != lltok::MetadataVar)
- return TokError("expected metadata after comma");
- // Parse it.
- if (ParseOptionalCustomMetadata())
+ if (ParseInstructionMetadata())
return true;
break;
}
Modified: llvm/trunk/lib/AsmParser/LLParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.h?rev=92300&r1=92299&r2=92300&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.h (original)
+++ llvm/trunk/lib/AsmParser/LLParser.h Tue Dec 29 23:31:19 2009
@@ -171,7 +171,7 @@
bool ParseOptionalVisibility(unsigned &Visibility);
bool ParseOptionalCallingConv(CallingConv::ID &CC);
bool ParseOptionalAlignment(unsigned &Alignment);
- bool ParseOptionalCustomMetadata();
+ bool ParseInstructionMetadata();
bool ParseOptionalInfo(unsigned &Alignment);
bool ParseIndexList(SmallVectorImpl<unsigned> &Indices,bool &AteExtraComma);
bool ParseIndexList(SmallVectorImpl<unsigned> &Indices) {
More information about the llvm-commits
mailing list