From 210e6c187670c8b3b18b255e91480581126c34fa Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Mon, 23 Jun 2008 16:48:17 +0000 Subject: [PATCH] Remove two convenience constructors because they're now private, and the private implementation doesn't really need the convenience. llvm-svn: 52629 --- llvm/include/llvm/Instructions.h | 13 ++++--------- llvm/lib/VMCore/Instructions.cpp | 18 ------------------ 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/llvm/include/llvm/Instructions.h b/llvm/include/llvm/Instructions.h index 403e82aea1ff..f9e0a2e5ce1f 100644 --- a/llvm/include/llvm/Instructions.h +++ b/llvm/include/llvm/Instructions.h @@ -1520,13 +1520,6 @@ class ExtractValueInst : public UnaryInstruction { InputIterator IdxBegin, InputIterator IdxEnd, const std::string &Name, BasicBlock *InsertAtEnd); - /// Constructors - These two constructors are convenience methods because one - /// and two index extractvalue instructions are so common. - ExtractValueInst(Value *Agg, unsigned Idx, const std::string &Name = "", - Instruction *InsertBefore = 0); - ExtractValueInst(Value *Agg, unsigned Idx, - const std::string &Name, BasicBlock *InsertAtEnd); - // allocate space for exactly one operand void *operator new(size_t s) { return User::operator new(s, 1); @@ -1555,12 +1548,14 @@ public: static ExtractValueInst *Create(Value *Agg, unsigned Idx, const std::string &Name = "", Instruction *InsertBefore = 0) { - return new ExtractValueInst(Agg, Idx, Name, InsertBefore); + unsigned Idxs[1] = { Idx }; + return new ExtractValueInst(Agg, Idxs, Idxs + 1, Name, InsertBefore); } static ExtractValueInst *Create(Value *Agg, unsigned Idx, const std::string &Name, BasicBlock *InsertAtEnd) { - return new ExtractValueInst(Agg, Idx, Name, InsertAtEnd); + unsigned Idxs[1] = { Idx }; + return new ExtractValueInst(Agg, Idxs, Idxs + 1, Name, InsertAtEnd); } virtual ExtractValueInst *clone() const; diff --git a/llvm/lib/VMCore/Instructions.cpp b/llvm/lib/VMCore/Instructions.cpp index 1ce58eb6e75b..4bcd560ee835 100644 --- a/llvm/lib/VMCore/Instructions.cpp +++ b/llvm/lib/VMCore/Instructions.cpp @@ -1465,24 +1465,6 @@ const Type* ExtractValueInst::getIndexedType(const Type *Agg, return getIndexedType(Agg, &Idx, 1); } -ExtractValueInst::ExtractValueInst(Value *Agg, - unsigned Idx, - const std::string &Name, - BasicBlock *InsertAtEnd) - : UnaryInstruction(checkType(getIndexedType(Agg->getType(), &Idx, 1)), - ExtractValue, Agg, InsertAtEnd) { - init(Idx, Name); -} - -ExtractValueInst::ExtractValueInst(Value *Agg, - unsigned Idx, - const std::string &Name, - Instruction *InsertBefore) - : UnaryInstruction(checkType(getIndexedType(Agg->getType(), &Idx, 1)), - ExtractValue, Agg, InsertBefore) { - init(Idx, Name); -} - //===----------------------------------------------------------------------===// // BinaryOperator Class //===----------------------------------------------------------------------===//