From ad333484ea5ae976b83e35ccd3f6cfa6e71290e2 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 14 Aug 2002 18:24:09 +0000 Subject: Remove support for Not ConstantExpr. This simplifies the unary case to only have to support the cast instruction, so the function is renamed to getCast. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3328 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Bytecode/Reader/ConstantReader.cpp | 3 ++- lib/Bytecode/Reader/InstructionReader.cpp | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'lib/Bytecode/Reader') 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 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)); -- cgit v1.2.3-70-g09d2