diff options
Diffstat (limited to 'lib/Bytecode')
| -rw-r--r-- | lib/Bytecode/Reader/ConstantReader.cpp | 3 | ||||
| -rw-r--r-- | lib/Bytecode/Reader/InstructionReader.cpp | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/Bytecode/Reader/ConstantReader.cpp b/lib/Bytecode/Reader/ConstantReader.cpp index 921b875644..37e201f280 100644 --- a/lib/Bytecode/Reader/ConstantReader.cpp +++ b/lib/Bytecode/Reader/ConstantReader.cpp @@ -217,7 +217,8 @@ bool BytecodeParser::parseConstantValue(const uchar *&Buf, const uchar *EndBuf, // Construct a ConstantExpr of the appropriate kind if (isExprNumArgs == 1) { // All one-operand expressions - V = ConstantExpr::get(Opcode, ArgVec[0], Ty); + assert(Opcode == Instruction::Cast); + V = ConstantExpr::getCast(ArgVec[0], Ty); } else if (Opcode == Instruction::GetElementPtr) { // GetElementPtr std::vector<Constant*> IdxList(ArgVec.begin()+1, ArgVec.end()); V = ConstantExpr::getGetElementPtr(ArgVec[0], IdxList); diff --git a/lib/Bytecode/Reader/InstructionReader.cpp b/lib/Bytecode/Reader/InstructionReader.cpp index 0916b2b876..0de8f39c57 100644 --- a/lib/Bytecode/Reader/InstructionReader.cpp +++ b/lib/Bytecode/Reader/InstructionReader.cpp @@ -122,13 +122,8 @@ bool BytecodeParser::ParseInstruction(const uchar *&Buf, const uchar *EndBuf, if (ParseRawInst(Buf, EndBuf, Raw)) return failure(true); - if (Raw.Opcode >= Instruction::FirstUnaryOp && - Raw.Opcode < Instruction::NumUnaryOps && Raw.NumOperands == 1) { - Res = UnaryOperator::create((Instruction::UnaryOps)Raw.Opcode, - getValue(Raw.Ty,Raw.Arg1)); - return false; - } else if (Raw.Opcode >= Instruction::FirstBinaryOp && - Raw.Opcode < Instruction::NumBinaryOps && Raw.NumOperands == 2) { + if (Raw.Opcode >= Instruction::FirstBinaryOp && + Raw.Opcode < Instruction::NumBinaryOps && Raw.NumOperands == 2) { Res = BinaryOperator::create((Instruction::BinaryOps)Raw.Opcode, getValue(Raw.Ty, Raw.Arg1), getValue(Raw.Ty, Raw.Arg2)); |