* Minor Formatting changes.

* MethodType now takes an explicit isVarArg arg instead of an implicit
  voidTy on the argument list


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

1 files changed, 7 insertions, 5 deletions

diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h
index 750b284b55..fdc654d7fc 100644
--- a/include/llvm/DerivedTypes.h
+++ b/include/llvm/DerivedTypes.h
@@ -119,7 +119,8 @@ public:
 
 
   virtual const Type *getContainedType(unsigned i) const {
-    return i == 0 ? ResultType : (i <= ParamTys.size() ? ParamTys[i-1] : 0);
+    return i == 0 ? ResultType : 
+                    (i <= ParamTys.size() ? ParamTys[i-1].get() : 0);
   }
   virtual unsigned getNumContainedTypes() const { return ParamTys.size()+1; }
 
@@ -129,7 +130,8 @@ public:
   //
   virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy);
 
-  static MethodType *get(const Type *Result, const vector<const Type*> &Params);
+  static MethodType *get(const Type *Result, const vector<const Type*> &Params,
+			 bool isVarArg);
 
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -168,7 +170,7 @@ public:
   inline bool isUnsized() const { return NumElements == -1; }
 
   virtual const Type *getContainedType(unsigned i) const { 
-    return i == 0 ? ElementType : 0;
+    return i == 0 ? ElementType.get() : 0;
   }
   virtual unsigned getNumContainedTypes() const { return 1; }
 
@@ -213,7 +215,7 @@ public:
   inline const ElementTypes &getElementTypes() const { return ETypes; }
 
   virtual const Type *getContainedType(unsigned i) const { 
-    return i < ETypes.size() ? ETypes[i] : 0;
+    return i < ETypes.size() ? ETypes[i].get() : 0;
   }
   virtual unsigned getNumContainedTypes() const { return ETypes.size(); }
 
@@ -256,7 +258,7 @@ public:
   inline const Type *getValueType() const { return ValueType; }
 
   virtual const Type *getContainedType(unsigned i) const { 
-    return i == 0 ? ValueType : 0;
+    return i == 0 ? ValueType.get() : 0;
   }
   virtual unsigned getNumContainedTypes() const { return 1; }