ConstExpr::getelementptr now takes a vector of Constants not Values
llvm-svn: 2948
This commit is contained in:
parent
7af3ee9840
commit
980ddf5854
|
@ -969,13 +969,23 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
|
|||
};
|
||||
|
||||
|
||||
// FIXME: ConstExpr::get never return null!
|
||||
ConstExpr: Types CAST ConstVal {
|
||||
ConstantExpr* CPE = ConstantExpr::get($2, $3, $1->get());
|
||||
if (CPE == 0) ThrowException("constant expression builder returned null!");
|
||||
$$ = CPE;
|
||||
}
|
||||
| Types GETELEMENTPTR '(' ConstVal IndexList ')' {
|
||||
ConstantExpr* CPE = ConstantExpr::get($2, $4, *$5, $1->get());
|
||||
vector<Constant*> IdxVec;
|
||||
for (unsigned i = 0, e = $5->size(); i != e; ++i)
|
||||
if (Constant *C = dyn_cast<Constant>((*$5)[i]))
|
||||
IdxVec.push_back(C);
|
||||
else
|
||||
ThrowException("Arguments to getelementptr must be constants!");
|
||||
|
||||
delete $5;
|
||||
|
||||
ConstantExpr* CPE = ConstantExpr::get($2, $4, IdxVec, $1->get());
|
||||
if (CPE == 0) ThrowException("constant expression builder returned null!");
|
||||
$$ = CPE;
|
||||
}
|
||||
|
|
|
@ -218,7 +218,7 @@ bool BytecodeParser::parseConstantValue(const uchar *&Buf, const uchar *EndBuf,
|
|||
if (isExprNumArgs == 1) { // All one-operand expressions
|
||||
V = ConstantExpr::get(opCode, argVec[0], Ty);
|
||||
} else if (opCode == Instruction::GetElementPtr) { // GetElementPtr
|
||||
std::vector<Value*> IdxList(argVec.begin()+1, argVec.end());
|
||||
std::vector<Constant*> IdxList(argVec.begin()+1, argVec.end());
|
||||
V = ConstantExpr::get(opCode, argVec[0], IdxList, Ty);
|
||||
} else { // All other 2-operand expressions
|
||||
V = ConstantExpr::get(opCode, argVec[0], argVec[1], Ty);
|
||||
|
|
Loading…
Reference in New Issue