[llvm-commits] [llvm] r52629 - in /llvm/trunk: include/llvm/Instructions.h lib/VMCore/Instructions.cpp

[Dan Gohman]

Author: djg
Date: Mon Jun 23 11:48:17 2008
New Revision: 52629

URL: http://llvm.org/viewvc/llvm-project?rev=52629&view=rev
Log:
Remove two convenience constructors because they're now private, and the
private implementation doesn't really need the convenience.

Modified:
    llvm/trunk/include/llvm/Instructions.h
    llvm/trunk/lib/VMCore/Instructions.cpp

Modified: llvm/trunk/include/llvm/Instructions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=52629&r1=52628&r2=52629&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Instructions.h (original)
+++ llvm/trunk/include/llvm/Instructions.h Mon Jun 23 11:48:17 2008
@@ -1520,13 +1520,6 @@
                           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 @@
   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;

Modified: llvm/trunk/lib/VMCore/Instructions.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=52629&r1=52628&r2=52629&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Instructions.cpp (original)
+++ llvm/trunk/lib/VMCore/Instructions.cpp Mon Jun 23 11:48:17 2008
@@ -1465,24 +1465,6 @@
   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
 //===----------------------------------------------------------------------===//