switch TypeHasCycleThroughItself from using an std::set to using a SmallPtrSet,

[oota-llvm.git] / include / llvm / Instructions.h

diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h
index 66cdc392a7ffb80f867f0d004312775e76e856c7..b92e9010b9d77934981f8ddd860122011e00bd17 100644 (file)
--- a/include/llvm/Instructions.h
+++ b/include/llvm/Instructions.h
@@ -379,7 +379,8 @@ static inline const Type *checkType(const Type *Ty) {
 ///
 class GetElementPtrInst : public Instruction {
   GetElementPtrInst(const GetElementPtrInst &GEPI);
-  void init(Value *Ptr, Value* const *Idx, unsigned NumIdx, const std::string &Name);
+  void init(Value *Ptr, Value* const *Idx, unsigned NumIdx,
+            const std::string &Name);
   void init(Value *Ptr, Value *Idx, const std::string &Name);
 
   template<typename InputIterator>
@@ -1452,15 +1453,16 @@ DEFINE_TRANSPARENT_OPERAND_ACCESSORS(ShuffleVectorInst, Value)
 /// ExtractValueInst - This instruction extracts a struct member or array
 /// element value from an aggregate value.
 ///
-class ExtractValueInst : public Instruction {
+class ExtractValueInst : public UnaryInstruction {
   SmallVector<unsigned, 4> Indices;
 
   ExtractValueInst(const ExtractValueInst &EVI);
-  void init(Value *Agg, const unsigned *Idx, unsigned NumIdx, const std::string &Name);
-  void init(Value *Agg, unsigned Idx, const std::string &Name);
+  void init(const unsigned *Idx, unsigned NumIdx,
+            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
@@ -1474,7 +1476,7 @@ class ExtractValueInst : public Instruction {
     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
   }
 
@@ -1524,12 +1526,13 @@ class ExtractValueInst : public Instruction {
                     Instruction *InsertBefore = 0);
   ExtractValueInst(Value *Agg, unsigned Idx,
                     const std::string &Name, BasicBlock *InsertAtEnd);
-public:
+
   // allocate space for exactly one operand
   void *operator new(size_t s) {
     return User::operator new(s, 1);
   }
 
+public:
   template<typename InputIterator>
   static ExtractValueInst *Create(Value *Agg, InputIterator IdxBegin, 
                                   InputIterator IdxEnd,
@@ -1562,9 +1565,6 @@ public:
 
   virtual ExtractValueInst *clone() const;
 
-  /// Transparently provide more efficient getOperand methods.
-  DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Value);
-
   // getType - Overload to return most specific pointer type...
   const PointerType *getType() const {
     return reinterpret_cast<const PointerType*>(Instruction::getType());
@@ -1600,7 +1600,7 @@ public:
   }
 
   unsigned getNumIndices() const {  // Note: always non-negative
-    return Indices.size();
+    return (unsigned)Indices.size();
   }
 
   bool hasIndices() const {
@@ -1617,21 +1617,16 @@ public:
   }
 };
 
-template <>
-struct OperandTraits<ExtractValueInst> : FixedNumOperandTraits<1> {
-};
-
 template<typename InputIterator>
 ExtractValueInst::ExtractValueInst(Value *Agg,
                                    InputIterator IdxBegin, 
                                    InputIterator IdxEnd,
                                    const std::string &Name,
                                    Instruction *InsertBefore)
-  : Instruction(checkType(getIndexedType(Agg->getType(), IdxBegin, IdxEnd)),
-                ExtractValue,
-                OperandTraits<ExtractValueInst>::op_begin(this),
-                1, InsertBefore) {
-  init(Agg, IdxBegin, IdxEnd, Name,
+  : UnaryInstruction(checkType(getIndexedType(Agg->getType(),
+                                             IdxBegin, IdxEnd)),
+                    ExtractValue, Agg, InsertBefore) {
+  init(IdxBegin, IdxEnd, Name,
        typename std::iterator_traits<InputIterator>::iterator_category());
 }
 template<typename InputIterator>
@@ -1640,16 +1635,13 @@ ExtractValueInst::ExtractValueInst(Value *Agg,
                                    InputIterator IdxEnd,
                                    const std::string &Name,
                                    BasicBlock *InsertAtEnd)
-  : Instruction(checkType(getIndexedType(Agg->getType(), IdxBegin, IdxEnd)),
-                ExtractValue,
-                OperandTraits<ExtractValueInst>::op_begin(this),
-                1, InsertAtEnd) {
-  init(Agg, IdxBegin, IdxEnd, Name,
+  : UnaryInstruction(checkType(getIndexedType(Agg->getType(),
+                                             IdxBegin, IdxEnd)),
+                    ExtractValue, Agg, InsertAtEnd) {
+  init(IdxBegin, IdxEnd, Name,
        typename std::iterator_traits<InputIterator>::iterator_category());
 }
 
-DEFINE_TRANSPARENT_OPERAND_ACCESSORS(ExtractValueInst, Value)
-
 
 //===----------------------------------------------------------------------===//
 //                                InsertValueInst Class
@@ -1663,7 +1655,8 @@ class InsertValueInst : public Instruction {
 
   void *operator new(size_t, unsigned); // Do not implement
   InsertValueInst(const InsertValueInst &IVI);
-  void init(Value *Agg, Value *Val, const unsigned *Idx, unsigned NumIdx, const std::string &Name);
+  void init(Value *Agg, Value *Val, const unsigned *Idx, unsigned NumIdx,
+            const std::string &Name);
   void init(Value *Agg, Value *Val, unsigned Idx, const std::string &Name);
 
   template<typename InputIterator>
@@ -1714,7 +1707,7 @@ public:
   }
 
   template<typename InputIterator>
-  static InsertValueInst *Create(Value *Agg, Value *Val, InputIterator IdxBegin, 
+  static InsertValueInst *Create(Value *Agg, Value *Val, InputIterator IdxBegin,
                                  InputIterator IdxEnd,
                                  const std::string &Name = "",
                                  Instruction *InsertBefore = 0) {
@@ -1778,7 +1771,7 @@ public:
   }
 
   unsigned getNumIndices() const {  // Note: always non-negative
-    return Indices.size();
+    return (unsigned)Indices.size();
   }
 
   bool hasIndices() const {