AsmParser: Don't crash on an ill-formed MDNodeVector
authorDavid Majnemer <david.majnemer@gmail.com>
Thu, 11 Dec 2014 20:44:09 +0000 (20:44 +0000)
committerDavid Majnemer <david.majnemer@gmail.com>
Thu, 11 Dec 2014 20:44:09 +0000 (20:44 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224053 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AsmParser/LLParser.cpp
test/Assembler/invalid-mdnode-vector.ll [new file with mode: 0644]

index ca4ba6e07f3580530563eba6583859e66d2bba08..ae007ce3693247b65fd52c895d5140e31fec81b1 100644 (file)
@@ -4686,8 +4686,8 @@ int LLParser::ParseInsertValue(Instruction *&Inst, PerFunctionState &PFS) {
 ///   ::= 'null' | TypeAndValue
 bool LLParser::ParseMDNodeVector(SmallVectorImpl<Metadata *> &Elts,
                                  PerFunctionState *PFS) {
-  assert(Lex.getKind() == lltok::lbrace);
-  Lex.Lex();
+  if (ParseToken(lltok::lbrace, "expected '{' here"))
+    return true;
 
   // Check for an empty list.
   if (EatIfPresent(lltok::rbrace))
diff --git a/test/Assembler/invalid-mdnode-vector.ll b/test/Assembler/invalid-mdnode-vector.ll
new file mode 100644 (file)
index 0000000..411cae7
--- /dev/null
@@ -0,0 +1,4 @@
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
+
+!0 = metadata!
+; CHECK: expected '{' here