2 files changed, 11 insertions, 0 deletions
diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h
index 9ac7b846df..3169726a76 100644
--- a/include/clang/AST/ASTContext.h
+++ b/include/clang/AST/ASTContext.h
@@ -77,6 +77,7 @@ public:
   QualType UnsignedLongLongTy;
   QualType FloatTy, DoubleTy, LongDoubleTy;
   QualType FloatComplexTy, DoubleComplexTy, LongDoubleComplexTy;
+  QualType VoidPtrTy;
   
   ASTContext(SourceManager &SM, TargetInfo &t, IdentifierTable &idents,
              SelectorTable &sels) : 
@@ -173,6 +174,14 @@ public:
 
   // Return the ObjC type encoding for a given type.
   void getObjcEncodingForType(QualType t, std::string &S) const;
+  
+  /// getObjcEncodingForMethodDecl - Return the encoded type for this method
+  /// declaration.
+  void getObjcEncodingForMethodDecl(ObjcMethodDecl *Decl, std::string &S);
+  
+  /// getObjcEncodingTypeSize returns size of type for objective-c encoding
+  /// purpose.
+  int getObjcEncodingTypeSize(QualType t);
     
   // This setter/getter repreents the ObjC 'id' type. It is setup lazily, by
   // Sema.
diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h
index 3140901b7e..59178b8d9b 100644
--- a/include/clang/AST/Type.h
+++ b/include/clang/AST/Type.h
@@ -34,6 +34,7 @@ namespace clang {
   class EnumDecl;
   class ObjcInterfaceDecl;
   class ObjcProtocolDecl;
+  class ObjcMethodDecl;
   class Expr;
   class SourceLocation;
   class PointerType;
@@ -273,6 +274,7 @@ public:
   bool isEnumeralType() const;
   bool isBooleanType() const;
   bool isCharType() const;
+  bool isIntegralType() const;
   
   /// Floating point categories.
   bool isRealFloatingType() const; // C99 6.2.5p10 (float, double, long double)