X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=include%2Fllvm%2FDerivedTypes.h;h=12219c535425c1b000d2d2b392af755db681a0fa;hb=80a75bfae980df96f969f1c05b0c4a80ce975240;hp=5aaa76ede3e3fbc1f46ca1cfa8fb6b0399df7c8d;hpb=645fc4edc23930365595e3e4b3314db0433a8182;p=oota-llvm.git

diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h
index 5aaa76ede3e..12219c53542 100644
--- a/include/llvm/DerivedTypes.h
+++ b/include/llvm/DerivedTypes.h
@@ -31,7 +31,6 @@ class PointerValType;
 class VectorValType;
 class IntegerValType;
 class APInt;
-class ParamAttrsList;
 
 class DerivedType : public Type {
   friend class Type;
@@ -140,12 +139,11 @@ public:
 class FunctionType : public DerivedType {
   friend class TypeMap<FunctionValType, FunctionType>;
   bool isVarArgs;
-  const ParamAttrsList *ParamAttrs;
 
   FunctionType(const FunctionType &);                   // Do not implement
   const FunctionType &operator=(const FunctionType &);  // Do not implement
   FunctionType(const Type *Result, const std::vector<const Type*> &Params,
-               bool IsVarArgs, const ParamAttrsList *Attrs = 0);
+               bool IsVarArgs);
 
 public:
   /// FunctionType::get - This static method is the primary way of constructing
@@ -154,12 +152,7 @@ public:
   static FunctionType *get(
     const Type *Result, ///< The result type
     const std::vector<const Type*> &Params, ///< The types of the parameters
-    bool isVarArg, ///< Whether this is a variable argument length function
-    const ParamAttrsList *Attrs = 0
-      ///< Indicates the parameter attributes to use, if any. The 0th entry
-      ///< in the list refers to the return type. Parameters are numbered
-      ///< starting at 1. This argument must be on the heap and FunctionType
-      ///< owns it after its passed here.
+    bool isVarArg  ///< Whether this is a variable argument length function
   );
 
   inline bool isVarArg() const { return isVarArgs; }
@@ -177,14 +170,6 @@ public:
   ///
   unsigned getNumParams() const { return NumContainedTys - 1; }
 
-  bool isStructReturn() const;
-  
-  /// The parameter attributes for the \p ith parameter are returned. The 0th
-  /// parameter refers to the return type of the function.
-  /// @returns The ParameterAttributes for the \p ith parameter.
-  /// @brief Get the attributes for a parameter
-  const ParamAttrsList *getParamAttrs() const { return ParamAttrs; }
-
   // Implement the AbstractTypeUser interface.
   virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy);
   virtual void typeBecameConcrete(const DerivedType *AbsTy);
@@ -263,11 +248,11 @@ public:
     return T->getTypeID() == StructTyID;
   }
 
-  bool isPacked() const { return getSubclassData(); }
+  bool isPacked() const { return (0 != getSubclassData()) ? true : false; }
 };
 
 
-/// SequentialType - This is the superclass of the array, pointer and packed
+/// SequentialType - This is the superclass of the array, pointer and vector
 /// type classes.  All of these represent "arrays" in memory.  The array type
 /// represents a specifically sized array, pointer types are unsized/unknown
 /// size arrays, vector types represent specifically sized arrays that
@@ -279,9 +264,12 @@ class SequentialType : public CompositeType {
   PATypeHandle ContainedType; ///< Storage for the single contained type
   SequentialType(const SequentialType &);                  // Do not implement!
   const SequentialType &operator=(const SequentialType &); // Do not implement!
+
+  // avoiding warning: 'this' : used in base member initializer list
+  SequentialType* this_() { return this; }
 protected:
   SequentialType(TypeID TID, const Type *ElType) 
-    : CompositeType(TID), ContainedType(ElType, this) {
+    : CompositeType(TID), ContainedType(ElType, this_()) {
     ContainedTys = &ContainedType; 
     NumContainedTys = 1;
   }