[llvm-commits] [llvm] r92297 - in /llvm/trunk: lib/AsmParser/LLParser.cpp lib/AsmParser/LLParser.h test/Assembler/metadata.ll
Chris Lattner
sabre at nondot.org
Tue Dec 29 21:14:00 PST 2009
Author: lattner
Date: Tue Dec 29 23:14:00 2009
New Revision: 92297
URL: http://llvm.org/viewvc/llvm-project?rev=92297&view=rev
Log:
reimplement insertvalue/extractvalue metadata handling to not blindly
accept invalid input. Actually add a testcase.
Modified:
llvm/trunk/lib/AsmParser/LLParser.cpp
llvm/trunk/lib/AsmParser/LLParser.h
llvm/trunk/test/Assembler/metadata.ll
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=92297&r1=92296&r2=92297&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Tue Dec 29 23:14:00 2009
@@ -1124,16 +1124,27 @@
}
+/// ParseIndexList - This parses the index list for an insert/extractvalue
+/// instruction. This sets AteExtraComma in the case where we eat an extra
+/// comma at the end of the line and find that it is followed by metadata.
+/// Clients that don't allow metadata can call the version of this function that
+/// only takes one argument.
+///
/// ParseIndexList
/// ::= (',' uint32)+
-bool LLParser::ParseIndexList(SmallVectorImpl<unsigned> &Indices) {
+///
+bool LLParser::ParseIndexList(SmallVectorImpl<unsigned> &Indices,
+ bool &AteExtraComma) {
+ AteExtraComma = false;
+
if (Lex.getKind() != lltok::comma)
return TokError("expected ',' as start of index list");
while (EatIfPresent(lltok::comma)) {
- // FIXME: TERRIBLE HACK. Loses comma state.
- if (Lex.getKind() == lltok::MetadataVar)
- break;
+ if (Lex.getKind() == lltok::MetadataVar) {
+ AteExtraComma = true;
+ return false;
+ }
unsigned Idx;
if (ParseUInt32(Idx)) return true;
Indices.push_back(Idx);
@@ -2803,6 +2814,7 @@
}
if (ParseInstruction(Inst, BB, PFS)) return true;
+
if (EatIfPresent(lltok::comma))
ParseOptionalCustomMetadata();
@@ -3765,11 +3777,14 @@
bool LLParser::ParseExtractValue(Instruction *&Inst, PerFunctionState &PFS) {
Value *Val; LocTy Loc;
SmallVector<unsigned, 4> Indices;
+ bool ParsedExtraComma;
if (ParseTypeAndValue(Val, Loc, PFS) ||
- ParseIndexList(Indices))
+ ParseIndexList(Indices, ParsedExtraComma))
return true;
- if (Lex.getKind() == lltok::MetadataVar)
+ if (ParsedExtraComma) {
+ assert(Lex.getKind() == lltok::MetadataVar && "Should only happen for md");
if (ParseOptionalCustomMetadata()) return true;
+ }
if (!isa<StructType>(Val->getType()) && !isa<ArrayType>(Val->getType()))
return Error(Loc, "extractvalue operand must be array or struct");
@@ -3786,14 +3801,17 @@
bool LLParser::ParseInsertValue(Instruction *&Inst, PerFunctionState &PFS) {
Value *Val0, *Val1; LocTy Loc0, Loc1;
SmallVector<unsigned, 4> Indices;
+ bool ParsedExtraComma;
if (ParseTypeAndValue(Val0, Loc0, PFS) ||
ParseToken(lltok::comma, "expected comma after insertvalue operand") ||
ParseTypeAndValue(Val1, Loc1, PFS) ||
- ParseIndexList(Indices))
+ ParseIndexList(Indices, ParsedExtraComma))
return true;
- if (Lex.getKind() == lltok::MetadataVar)
+ if (ParsedExtraComma) {
+ assert(Lex.getKind() == lltok::MetadataVar && "Should only happen for md");
if (ParseOptionalCustomMetadata()) return true;
-
+ }
+
if (!isa<StructType>(Val0->getType()) && !isa<ArrayType>(Val0->getType()))
return Error(Loc0, "extractvalue operand must be array or struct");
Modified: llvm/trunk/lib/AsmParser/LLParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.h?rev=92297&r1=92296&r2=92297&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.h (original)
+++ llvm/trunk/lib/AsmParser/LLParser.h Tue Dec 29 23:14:00 2009
@@ -173,7 +173,14 @@
bool ParseOptionalAlignment(unsigned &Alignment);
bool ParseOptionalCustomMetadata();
bool ParseOptionalInfo(unsigned &Alignment);
- bool ParseIndexList(SmallVectorImpl<unsigned> &Indices);
+ bool ParseIndexList(SmallVectorImpl<unsigned> &Indices,bool &AteExtraComma);
+ bool ParseIndexList(SmallVectorImpl<unsigned> &Indices) {
+ bool AteExtraComma;
+ if (ParseIndexList(Indices, AteExtraComma)) return true;
+ if (AteExtraComma)
+ return TokError("expected index");
+ return false;
+ }
// Top-Level Entities
bool ParseTopLevelEntities();
Modified: llvm/trunk/test/Assembler/metadata.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/metadata.ll?rev=92297&r1=92296&r2=92297&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/metadata.ll (original)
+++ llvm/trunk/test/Assembler/metadata.ll Tue Dec 29 23:14:00 2009
@@ -5,11 +5,13 @@
call void @llvm.dbg.func.start(metadata !"foo")
+ extractvalue {{i32, i32}, i32} undef, 0, 1, !foo !0
+
ret void, !foo !0, !bar !1
}
!0 = metadata !{i32 662302, i32 26, metadata !1, null}
-!1 = metadata !{i32 4}
+!1 = metadata !{i32 4, metadata !"foo"}
declare void @llvm.dbg.func.start(metadata) nounwind readnone
More information about the llvm-commits
mailing list