diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-02-16 08:38:03 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-02-16 08:38:03 +0000 |
| commit | a3b0eb2f7fecd0fe15566b01215602a9784003ed (patch) | |
| tree | 833d36d57fb6fd0b80140181b22411401f00b9d4 | |
| parent | 8510f737407242f38426b5066c174259b12bacc4 (diff) | |
| download | bcm5719-llvm-a3b0eb2f7fecd0fe15566b01215602a9784003ed.tar.gz bcm5719-llvm-a3b0eb2f7fecd0fe15566b01215602a9784003ed.zip | |
AsmParser: Reject alloca with function type
llvm-svn: 229363
| -rw-r--r-- | llvm/lib/AsmParser/LLParser.cpp | 8 | ||||
| -rw-r--r-- | llvm/test/Assembler/alloca-invalid-type-2.ll | 9 | ||||
| -rw-r--r-- | llvm/test/Assembler/alloca-invalid-type.ll | 2 | ||||
| -rw-r--r-- | llvm/test/Verifier/2008-03-01-AllocaSized.ll | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index fc829166abf..159bbccc87d 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -5109,16 +5109,16 @@ bool LLParser::ParseCall(Instruction *&Inst, PerFunctionState &PFS, /// ::= 'alloca' 'inalloca'? Type (',' TypeAndValue)? (',' 'align' i32)? int LLParser::ParseAlloc(Instruction *&Inst, PerFunctionState &PFS) { Value *Size = nullptr; - LocTy SizeLoc; + LocTy SizeLoc, TyLoc; unsigned Alignment = 0; Type *Ty = nullptr; bool IsInAlloca = EatIfPresent(lltok::kw_inalloca); - if (ParseType(Ty)) return true; + if (ParseType(Ty, TyLoc)) return true; - if (!PointerType::isValidElementType(Ty)) - return TokError("pointer to this type is invalid"); + if (Ty->isFunctionTy() || !PointerType::isValidElementType(Ty)) + return Error(TyLoc, "invalid type for alloca"); bool AteExtraComma = false; if (EatIfPresent(lltok::comma)) { diff --git a/llvm/test/Assembler/alloca-invalid-type-2.ll b/llvm/test/Assembler/alloca-invalid-type-2.ll new file mode 100644 index 00000000000..7b1cc625542 --- /dev/null +++ b/llvm/test/Assembler/alloca-invalid-type-2.ll @@ -0,0 +1,9 @@ +; RUN: not llvm-as < %s 2>&1 | FileCheck %s + +; CHECK: invalid type for alloca + +define void @test() { +entry: + alloca i32 (i32) + ret void +} diff --git a/llvm/test/Assembler/alloca-invalid-type.ll b/llvm/test/Assembler/alloca-invalid-type.ll index fb2c05cc35a..413bcbd76ba 100644 --- a/llvm/test/Assembler/alloca-invalid-type.ll +++ b/llvm/test/Assembler/alloca-invalid-type.ll @@ -1,6 +1,6 @@ ; RUN: not llvm-as < %s 2>&1 | FileCheck %s -; CHECK: pointer to this type is invalid +; CHECK: invalid type for alloca define void @test() { entry: diff --git a/llvm/test/Verifier/2008-03-01-AllocaSized.ll b/llvm/test/Verifier/2008-03-01-AllocaSized.ll index fc12a96e4f9..7478334959f 100644 --- a/llvm/test/Verifier/2008-03-01-AllocaSized.ll +++ b/llvm/test/Verifier/2008-03-01-AllocaSized.ll @@ -1,5 +1,5 @@ ; RUN: not llvm-as %s -o /dev/null 2>&1 | FileCheck %s -; CHECK: Cannot allocate unsized type +; CHECK: invalid type for alloca ; PR2113 define void @test() { |
