From 94d09cbb9f015a3d26e39a001b959ee91a7641af Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Wed, 11 Feb 2015 07:43:58 +0000 Subject: [PATCH] AsmParser: Don't crash when insertvalue has bad operands git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228813 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AsmParser/LLParser.cpp | 7 ++++++- test/Assembler/insertvalue-invalid-type.ll | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 test/Assembler/insertvalue-invalid-type.ll diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 25b2a315023..adf4c9073ab 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -4951,8 +4951,13 @@ int LLParser::ParseInsertValue(Instruction *&Inst, PerFunctionState &PFS) { if (!Val0->getType()->isAggregateType()) return Error(Loc0, "insertvalue operand must be aggregate type"); - if (!ExtractValueInst::getIndexedType(Val0->getType(), Indices)) + Type *IndexedType = ExtractValueInst::getIndexedType(Val0->getType(), Indices); + if (!IndexedType) return Error(Loc0, "invalid indices for insertvalue"); + if (IndexedType != Val1->getType()) + return Error(Loc1, "insertvalue operand and field disagree in type: '" + + getTypeString(Val1->getType()) + "' instead of '" + + getTypeString(IndexedType) + "'"); Inst = InsertValueInst::Create(Val0, Val1, Indices); return AteExtraComma ? InstExtraComma : InstNormal; } diff --git a/test/Assembler/insertvalue-invalid-type.ll b/test/Assembler/insertvalue-invalid-type.ll new file mode 100644 index 00000000000..6be20e56a4f --- /dev/null +++ b/test/Assembler/insertvalue-invalid-type.ll @@ -0,0 +1,9 @@ +; RUN: not llvm-as < %s 2>&1 | FileCheck %s + +; CHECK: insertvalue operand and field disagree in type: 'i8*' instead of 'i32' + +define void @test() { +entry: + insertvalue { i32, i32 } undef, i8* null, 0 + ret void +} -- 2.34.1