diff options
author | Bill Wendling <isanbard@gmail.com> | 2011-07-28 02:27:12 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2011-07-28 02:27:12 +0000 |
commit | 28d735230f0b3ac964f07e91594fb6c38772f0e6 (patch) | |
tree | e74ca64e4599444fd2daeeaa69286e307aa3cb1e /lib | |
parent | 7f66c45f35bdfc69c41f2e1b3b9891a4eca0c0b0 (diff) | |
download | llvm-28d735230f0b3ac964f07e91594fb6c38772f0e6.tar.gz llvm-28d735230f0b3ac964f07e91594fb6c38772f0e6.tar.bz2 llvm-28d735230f0b3ac964f07e91594fb6c38772f0e6.tar.xz |
Make sure that the landingpad instruction takes a Constant* as the clause's value.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136326 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/AsmParser/LLParser.cpp | 7 | ||||
-rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 2 | ||||
-rw-r--r-- | lib/VMCore/Core.cpp | 2 | ||||
-rw-r--r-- | lib/VMCore/Instructions.cpp | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 547abfe24e..b3f4d476a2 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -3528,7 +3528,7 @@ bool LLParser::ParseLandingPad(Instruction *&Inst, PerFunctionState &PFS) { bool IsCleanup = EatIfPresent(lltok::kw_cleanup); - SmallVector<std::pair<LandingPadInst::ClauseType, Value*>, 16> Clauses; + SmallVector<std::pair<LandingPadInst::ClauseType, Constant*>, 16> Clauses; while (Lex.getKind() == lltok::kw_catch || Lex.getKind() == lltok::kw_filter){ LandingPadInst::ClauseType CT; if (Lex.getKind() == lltok::kw_catch) { @@ -3543,14 +3543,15 @@ bool LLParser::ParseLandingPad(Instruction *&Inst, PerFunctionState &PFS) { Value *V; LocTy VLoc; if (ParseTypeAndValue(V, VLoc, PFS)) return true; - Clauses.push_back(std::make_pair(CT, V)); + Clauses.push_back(std::make_pair(CT, cast<Constant>(V))); } while (EatIfPresent(lltok::comma)); } LandingPadInst *LP = LandingPadInst::Create(Ty, PersFn, Clauses.size()); LP->setCleanup(IsCleanup); - for (SmallVectorImpl<std::pair<LandingPadInst::ClauseType, Value*> >::iterator + for (SmallVectorImpl<std::pair<LandingPadInst::ClauseType, + Constant*> >::iterator I = Clauses.begin(), E = Clauses.end(); I != E; ++I) LP->addClause(I->first, I->second); diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 37cc7949af..4b83958e78 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -2550,7 +2550,7 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { return Error("Invalid LANDINGPAD record"); } - LP->addClause(CT, Val); + LP->addClause(CT, cast<Constant>(Val)); } I = LP; diff --git a/lib/VMCore/Core.cpp b/lib/VMCore/Core.cpp index 6664afc188..5e93c73a34 100644 --- a/lib/VMCore/Core.cpp +++ b/lib/VMCore/Core.cpp @@ -1715,7 +1715,7 @@ void LLVMAddClause(LLVMValueRef LandingPad, LLVMLandingPadClauseTy ClauseTy, LLVMValueRef ClauseVal) { unwrap<LandingPadInst>(LandingPad)-> addClause(static_cast<LandingPadInst::ClauseType>(ClauseTy), - unwrap(ClauseVal)); + cast<Constant>(unwrap(ClauseVal))); } void LLVMSetCleanup(LLVMValueRef LandingPad, LLVMBool Val) { diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp index 9398c7f872..968a565197 100644 --- a/lib/VMCore/Instructions.cpp +++ b/lib/VMCore/Instructions.cpp @@ -228,14 +228,14 @@ void LandingPadInst::reserveClauses(unsigned Size) { Use::zap(OldOps, OldOps + e, true); } -void LandingPadInst::addClause(ClauseType CT, Value *ClauseVal) { +void LandingPadInst::addClause(ClauseType CT, Constant *ClauseVal) { unsigned OpNo = getNumOperands(); if (OpNo + 1 > ReservedSpace) growOperands(); assert(OpNo < ReservedSpace && "Growing didn't work!"); ClauseIdxs.push_back(CT); ++NumOperands; - OperandList[OpNo] = ClauseVal; + OperandList[OpNo] = (Value*)ClauseVal; } //===----------------------------------------------------------------------===// |