diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2014-12-11 20:44:09 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2014-12-11 20:44:09 +0000 |
| commit | 06f960d5d35adec2d098d68e733b529c79c20876 (patch) | |
| tree | 9168841e11070944a0b26c54bdec292728cff0dc | |
| parent | 0855695159d62d4b900909f84d601e87219d454c (diff) | |
| download | bcm5719-llvm-06f960d5d35adec2d098d68e733b529c79c20876.tar.gz bcm5719-llvm-06f960d5d35adec2d098d68e733b529c79c20876.zip | |
AsmParser: Don't crash on an ill-formed MDNodeVector
llvm-svn: 224053
| -rw-r--r-- | llvm/lib/AsmParser/LLParser.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Assembler/invalid-mdnode-vector.ll | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index ca4ba6e07f3..ae007ce3693 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -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/llvm/test/Assembler/invalid-mdnode-vector.ll b/llvm/test/Assembler/invalid-mdnode-vector.ll new file mode 100644 index 00000000000..411cae7faa8 --- /dev/null +++ b/llvm/test/Assembler/invalid-mdnode-vector.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s 2>&1 | FileCheck %s + +!0 = metadata! +; CHECK: expected '{' here |
