summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2014-12-11 20:51:54 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2014-12-11 20:51:54 +0000
commit0a14c0ec9dff402f4f4d6605553722b41d4936f8 (patch)
tree14884a558f7953d57172e5d722e29794e5de1087 /llvm
parent54cc3c2f231846e110dcfbc04ff52f266aa6dfb9 (diff)
downloadbcm5719-llvm-0a14c0ec9dff402f4f4d6605553722b41d4936f8.tar.gz
bcm5719-llvm-0a14c0ec9dff402f4f4d6605553722b41d4936f8.zip
AsmParser: Don't crash on an ill-formed MDNodeVector
llvm-svn: 224056
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/AsmParser/LLParser.cpp4
-rw-r--r--llvm/test/Assembler/invalid-mdnode-vector2.ll4
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index ae007ce3693..9e699d1ed3f 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -2968,8 +2968,8 @@ bool LLParser::ParseMetadataAsValue(ValID &ID, PerFunctionState *PFS) {
/// ::= !{...}
/// ::= !"string"
bool LLParser::ParseMetadata(Metadata *&MD, PerFunctionState *PFS) {
- assert(Lex.getKind() == lltok::exclaim);
- Lex.Lex();
+ if (ParseToken(lltok::exclaim, "expected '!' here"))
+ return true;
// MDNode:
// !{ ... }
diff --git a/llvm/test/Assembler/invalid-mdnode-vector2.ll b/llvm/test/Assembler/invalid-mdnode-vector2.ll
new file mode 100644
index 00000000000..3b577bba6cf
--- /dev/null
+++ b/llvm/test/Assembler/invalid-mdnode-vector2.ll
@@ -0,0 +1,4 @@
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
+
+!0 = metadata !{metadata
+; CHECK: expected '!' here
OpenPOWER on IntegriCloud