get rid of ExtractValueInst::init's Value argument, it is already passed to the Unary...

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

diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h
index 6a599d3fceba9bf5ff187b759e55ab2ed6a6647a..b92e9010b9d77934981f8ddd860122011e00bd17 100644 (file)
--- a/include/llvm/Instructions.h
+++ b/include/llvm/Instructions.h
@@ -1457,12 +1457,12 @@ class ExtractValueInst : public UnaryInstruction {
   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 @@ class ExtractValueInst : public UnaryInstruction {
     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 @@ ExtractValueInst::ExtractValueInst(Value *Agg,
   : 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 @@ ExtractValueInst::ExtractValueInst(Value *Agg,
   : 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());
 }
 

diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index 4a297b3345b2f39e155199564979d45257a341d0..a49f6a564c217c4afbfc3ceaa5f2193655ea3ee2 100644 (file)
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -1412,18 +1412,16 @@ InsertValueInst::InsertValueInst(Value *Agg,
 //                             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 @@ ExtractValueInst::ExtractValueInst(Value *Agg,
                                    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 @@ ExtractValueInst::ExtractValueInst(Value *Agg,
                                    Instruction *InsertBefore)
   : UnaryInstruction(checkType(getIndexedType(Agg->getType(), &Idx, 1)),
                     ExtractValue, Agg, InsertBefore) {
-  init(Agg, Idx, Name);
+  init(Idx, Name);
 }
 
 //===----------------------------------------------------------------------===//