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

[Gabor Greif]

Author: ggreif
Date: Fri Jun  6 16:06:32 2008
New Revision: 52064

URL: http://llvm.org/viewvc/llvm-project?rev=52064&view=rev
Log:
get rid of ExtractValueInst::init's Value argument, it is already passed to the UnaryInstruction ctor

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=52064&r1=52063&r2=52064&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Instructions.h (original)
+++ llvm/trunk/include/llvm/Instructions.h Fri Jun  6 16:06:32 2008
@@ -1457,12 +1457,12 @@
   SmallVector<unsigned, 4> Indices;
 
   ExtractValueInst(const ExtractValueInst &EVI);
-  void init(Value *Agg, const unsigned *Idx, unsigned NumIdx,
+  void init(const unsigned *Idx, unsigned NumIdx,
             const std::string &Name);
-  void init(Value *Agg, unsigned Idx, const std::string &Name);
+  void init(unsigned Idx, const std::string &Name);
 
   template<typename InputIterator>
-  void init(Value *Agg, InputIterator IdxBegin, InputIterator IdxEnd,
+  void init(InputIterator IdxBegin, InputIterator IdxEnd,
             const std::string &Name,
             // This argument ensures that we have an iterator we can
             // do arithmetic on in constant time
@@ -1476,7 +1476,7 @@
     assert(NumIdx > 0 && "ExtractValueInst must have at least one index");
 
     // This requires that the iterator points to contiguous memory.
-    init(Agg, &*IdxBegin, NumIdx, Name); // FIXME: for the general case
+    init(&*IdxBegin, NumIdx, Name); // FIXME: for the general case
                                          // we have to build an array here
   }
 
@@ -1626,7 +1626,7 @@
   : UnaryInstruction(checkType(getIndexedType(Agg->getType(),
 					      IdxBegin, IdxEnd)),
 		     ExtractValue, Agg, InsertBefore) {
-  init(Agg, IdxBegin, IdxEnd, Name,
+  init(IdxBegin, IdxEnd, Name,
        typename std::iterator_traits<InputIterator>::iterator_category());
 }
 template<typename InputIterator>
@@ -1638,7 +1638,7 @@
   : UnaryInstruction(checkType(getIndexedType(Agg->getType(),
 					      IdxBegin, IdxEnd)),
 		     ExtractValue, Agg, InsertAtEnd) {
-  init(Agg, IdxBegin, IdxEnd, Name,
+  init(IdxBegin, IdxEnd, Name,
        typename std::iterator_traits<InputIterator>::iterator_category());
 }
 

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

==============================================================================
--- llvm/trunk/lib/VMCore/Instructions.cpp (original)
+++ llvm/trunk/lib/VMCore/Instructions.cpp Fri Jun  6 16:06:32 2008
@@ -1412,18 +1412,16 @@
 //                             ExtractValueInst Class
 //===----------------------------------------------------------------------===//
 
-void ExtractValueInst::init(Value *Agg, const unsigned *Idx, unsigned NumIdx,
+void ExtractValueInst::init(const unsigned *Idx, unsigned NumIdx,
 			    const std::string &Name) {
   assert(NumOperands == 1 && "NumOperands not initialized?");
-  Op<0>() = Agg;
 
   Indices.insert(Indices.end(), Idx, Idx + NumIdx);
   setName(Name);
 }
 
-void ExtractValueInst::init(Value *Agg, unsigned Idx, const std::string &Name) {
+void ExtractValueInst::init(unsigned Idx, const std::string &Name) {
   assert(NumOperands == 1 && "NumOperands not initialized?");
-  Op<0>() = Agg;
 
   Indices.push_back(Idx);
   setName(Name);
@@ -1467,7 +1465,7 @@
                                    BasicBlock *InsertAtEnd)
   : UnaryInstruction(checkType(getIndexedType(Agg->getType(), &Idx, 1)),
 		     ExtractValue, Agg, InsertAtEnd) {
-  init(Agg, Idx, Name);
+  init(Idx, Name);
 }
 
 ExtractValueInst::ExtractValueInst(Value *Agg,
@@ -1476,7 +1474,7 @@
                                    Instruction *InsertBefore)
   : UnaryInstruction(checkType(getIndexedType(Agg->getType(), &Idx, 1)),
 		     ExtractValue, Agg, InsertBefore) {
-  init(Agg, Idx, Name);
+  init(Idx, Name);
 }
 
 //===----------------------------------------------------------------------===//