Remove two convenience constructors because they're now private, and the

private implementation doesn't really need the convenience.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52629 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h
index 403e82aea1ff17f1fbae6c297925a42c051afd85..f9e0a2e5ce1fabb02e81adc0fce9b67309c117c6 100644 (file)
--- a/include/llvm/Instructions.h
+++ b/include/llvm/Instructions.h
@@ -1520,13 +1520,6 @@ class ExtractValueInst : public UnaryInstruction {
                           InputIterator IdxBegin, InputIterator IdxEnd,
                           const std::string &Name, BasicBlock *InsertAtEnd);
 
                           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);
   // 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) {
   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) {
   }
   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;
   }
 
   virtual ExtractValueInst *clone() const;

diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index 1ce58eb6e75beef5f23416500db9d643b9c71bb3..4bcd560ee8358782f84ca604c6354491481e46b2 100644 (file)
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -1465,24 +1465,6 @@ const Type* ExtractValueInst::getIndexedType(const Type *Agg,
   return getIndexedType(Agg, &Idx, 1);
 }
 
   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
 //===----------------------------------------------------------------------===//
 //===----------------------------------------------------------------------===//
 //                             BinaryOperator Class
 //===----------------------------------------------------------------------===//