2 files changed, 31 insertions, 1 deletions
diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h
index e272dc956d0..5a6a3c361c7 100644
--- a/clang/include/clang/AST/Type.h
+++ b/clang/include/clang/AST/Type.h
@@ -1183,6 +1183,11 @@ public:
 
   static bool classof(const Type *T) { return T->getTypeClass() == TypeOfTyp; }
   static bool classof(const TypeOfType *) { return true; }
+
+protected:
+  virtual void EmitImpl(llvm::Serializer& S) const;
+  static Type* CreateImpl(ASTContext& Context, llvm::Deserializer& D);
+  friend class Type;
 };
 
 class TagType : public Type {
diff --git a/clang/lib/AST/TypeSerialization.cpp b/clang/lib/AST/TypeSerialization.cpp
index 064b5b8dfe1..42569da400a 100644
--- a/clang/lib/AST/TypeSerialization.cpp
+++ b/clang/lib/AST/TypeSerialization.cpp
@@ -113,7 +113,11 @@ void Type::Create(ASTContext& Context, unsigned i, Deserializer& D) {
     case Type::TypeOfExp:
       D.RegisterPtr(PtrID, TypeOfExpr::CreateImpl(Context, D));
       break;
-      
+
+    case Type::TypeOfTyp:
+      D.RegisterPtr(PtrID, TypeOfType::CreateImpl(Context, D));
+      break;
+
     case Type::TemplateTypeParm:
       D.RegisterPtr(PtrID,TemplateTypeParmType::CreateImpl(Context, D));
       break;
@@ -282,6 +286,7 @@ Type* TypedefType::CreateImpl(ASTContext& Context, Deserializer& D) {
 //===----------------------------------------------------------------------===//
 // TypeOfExpr
 //===----------------------------------------------------------------------===//
+
 void TypeOfExpr::EmitImpl(llvm::Serializer& S) const {
   S.EmitOwnedPtr(TOExpr);
 }
@@ -297,6 +302,26 @@ Type* TypeOfExpr::CreateImpl(ASTContext& Context, Deserializer& D) {
 
   return T;
 }
+
+//===----------------------------------------------------------------------===//
+// TypeOfType
+//===----------------------------------------------------------------------===//
+
+void TypeOfType::EmitImpl(llvm::Serializer& S) const {
+  S.Emit(TOType);
+}
+
+Type* TypeOfType::CreateImpl(ASTContext& Context, Deserializer& D) {
+  QualType TOType = QualType::ReadVal(D);
+
+  std::vector<Type*>& Types = 
+    const_cast<std::vector<Type*>&>(Context.getTypes());
+
+  TypeOfType* T = new TypeOfType(TOType, Context.getCanonicalType(TOType));
+  Types.push_back(T);
+
+  return T;
+}
   
 //===----------------------------------------------------------------------===//
 // TemplateTypeParmType