6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-15 07:34:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug in the LLParser where we failed to diagnose landingpads with non-constant clause operands.

Browse Source 
Fixing this also exposed a related issue where the landingpad under construction was not
cleaned up when an error was raised, which would cause bad reference errors before the
error could actually be printed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231634 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2015-03-09 07:13:42 +00:00
parent 40e66277f7
commit 8e120d80c3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/AsmParser/LLParser.cpp
View File

@ -5041,7 +5041,7 @@ bool LLParser::ParseLandingPad(Instruction *&Inst, PerFunctionState &PFS) {
ParseTypeAndValue(PersFn, PersFnLoc, PFS))
return true;
LandingPadInst *LP = LandingPadInst::Create(Ty, PersFn, 0);
std::unique_ptr<LandingPadInst> LP(LandingPadInst::Create(Ty, PersFn, 0));
LP->setCleanup(EatIfPresent(lltok::kw_cleanup));
while (Lex.getKind() == lltok::kw_catch || Lex.getKind() == lltok::kw_filter){
@ -5055,10 +5055,8 @@ bool LLParser::ParseLandingPad(Instruction *&Inst, PerFunctionState &PFS) {
Value *V;
LocTy VLoc;
if (ParseTypeAndValue(V, VLoc, PFS)) {
delete LP;
if (ParseTypeAndValue(V, VLoc, PFS))
return true;
}
// A 'catch' type expects a non-array constant. A filter clause expects an
// array constant.
@ -5070,10 +5068,13 @@ bool LLParser::ParseLandingPad(Instruction *&Inst, PerFunctionState &PFS) {
Error(VLoc, "'filter' clause has an invalid type");
}
LP->addClause(cast<Constant>(V));
Constant *CV = dyn_cast<Constant>(V);
if (!CV)
return Error(VLoc, "clause argument must be a constant");
LP->addClause(CV);
}
Inst = LP;
Inst = LP.release();
return false;
}

7
test/Assembler/invalid-landingpad.ll Normal file
View File

@ -0,0 +1,7 @@
; RUN: not llvm-as < %s 2>&1 | FileCheck %s
; CHECK: clause argument must be a constant
define void @test(i32 %in) {
landingpad {} personality void()* null filter i32 %in
}