reimplement insertvalue/extractvalue metadata handling to not blindly

accept invalid input.  Actually add a testcase.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@92297 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index 1317b2cbd009b010c5dd786787efe9b1a6de219d..e8a98ea954c9be72fc935a69564ce18982e94968 100644 (file)
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -1124,16 +1124,27 @@ bool LLParser::ParseOptionalInfo(unsigned &Alignment) {
 }
 
 
+/// 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 @@ bool LLParser::ParseBasicBlock(PerFunctionState &PFS) {
     }
 
     if (ParseInstruction(Inst, BB, PFS)) return true;
+    
     if (EatIfPresent(lltok::comma))
       ParseOptionalCustomMetadata();
 
@@ -3765,11 +3777,14 @@ bool LLParser::ParseGetElementPtr(Instruction *&Inst, PerFunctionState &PFS) {
 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::ParseExtractValue(Instruction *&Inst, PerFunctionState &PFS) {
 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");
 

diff --git a/lib/AsmParser/LLParser.h b/lib/AsmParser/LLParser.h
index 7802a1e489bff75fecf3b4a48d969660a8c3ee69..b03fe52d5072d84f7fff405b797ce9b9f1ff8900 100644 (file)
--- a/lib/AsmParser/LLParser.h
+++ b/lib/AsmParser/LLParser.h
@@ -173,7 +173,14 @@ namespace llvm {
     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();

diff --git a/test/Assembler/metadata.ll b/test/Assembler/metadata.ll
index cdb697885847285a36ce37b78f75c7ffa85a90d5..89668a345c0641fdd414b44b1ff5b82e25b90e6b 100644 (file)
--- a/test/Assembler/metadata.ll
+++ b/test/Assembler/metadata.ll
@@ -5,11 +5,13 @@ define void @test() {
   
   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