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

[Dan Gohman]

Author: djg
Date: Sat May 31 14:09:08 2008
New Revision: 51820

URL: http://llvm.org/viewvc/llvm-project?rev=51820&view=rev
Log:
Fix some bugs with the handling of indices in insertvalue/extractvalue.

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

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

==============================================================================
--- llvm/trunk/include/llvm/Instructions.h (original)
+++ llvm/trunk/include/llvm/Instructions.h Sat May 31 14:09:08 2008
@@ -1590,10 +1590,8 @@
   }  
   static const Type *getIndexedType(const Type *Ptr, unsigned Idx);
 
-  inline op_iterator       idx_begin()       { return op_begin()+1; }
-  inline const_op_iterator idx_begin() const { return op_begin()+1; }
-  inline op_iterator       idx_end()         { return op_end(); }
-  inline const_op_iterator idx_end()   const { return op_end(); }
+  inline const unsigned *idx_begin() const { return Indices.begin(); }
+  inline const unsigned *idx_end()   const { return Indices.end(); }
 
   Value *getAggregateOperand() {
     return getOperand(0);
@@ -1606,11 +1604,11 @@
   }
 
   unsigned getNumIndices() const {  // Note: always non-negative
-    return getNumOperands() - 1;
+    return Indices.size();
   }
 
   bool hasIndices() const {
-    return getNumOperands() > 1;
+    return true;
   }
   
   // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1762,10 +1760,8 @@
     return reinterpret_cast<const PointerType*>(Instruction::getType());
   }
 
-  inline unsigned         *idx_begin()       { return Indices.begin(); }
-  inline const unsigned   *idx_begin() const { return Indices.begin(); }
-  inline unsigned         *idx_end()         { return Indices.end(); }
-  inline const unsigned   *idx_end()   const { return Indices.end(); }
+  inline const unsigned *idx_begin() const { return Indices.begin(); }
+  inline const unsigned *idx_end()   const { return Indices.end(); }
 
   Value *getAggregateOperand() {
     return getOperand(0);
@@ -1788,11 +1784,11 @@
   }
 
   unsigned getNumIndices() const {  // Note: always non-negative
-    return getNumOperands() - 2;
+    return Indices.size();
   }
 
   bool hasIndices() const {
-    return getNumOperands() > 2;
+    return true;
   }
   
   // Methods for support type inquiry through isa, cast, and dyn_cast:

Modified: llvm/trunk/lib/VMCore/Constants.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Constants.cpp?rev=51820&r1=51819&r2=51820&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Constants.cpp (original)
+++ llvm/trunk/lib/VMCore/Constants.cpp Sat May 31 14:09:08 2008
@@ -551,7 +551,7 @@
     Op<0>() = Agg;
   }
 
-  /// Indicies - These identify which value to extract.
+  /// Indices - These identify which value to extract.
   const SmallVector<unsigned, 4> Indices;
 
   /// Transparently provide more efficient getOperand methods.
@@ -577,7 +577,7 @@
     Op<1>() = Val;
   }
 
-  /// Indicies - These identify the position for the insertion.
+  /// Indices - These identify the position for the insertion.
   const SmallVector<unsigned, 4> Indices;
 
   /// Transparently provide more efficient getOperand methods.
@@ -2339,7 +2339,7 @@
   // Look up the constant in the table first to ensure uniqueness
   std::vector<Constant*> ArgVec;
   ArgVec.push_back(Agg);
-  SmallVector<unsigned, 4> Indices;
+  SmallVector<unsigned, 4> Indices(Idxs, Idxs + NumIdx);
   const ExprMapKeyType Key(Instruction::ExtractValue, ArgVec, 0, Indices);
   return ExprConstants->getOrCreate(ReqTy, Key);
 }