2 files changed, 28 insertions, 0 deletions
diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h
index 60ae34b146e..e272dc956d0 100644
--- a/clang/include/clang/AST/Type.h
+++ b/clang/include/clang/AST/Type.h
@@ -1161,6 +1161,11 @@ public:
 
   static bool classof(const Type *T) { return T->getTypeClass() == TypeOfExp; }
   static bool classof(const TypeOfExpr *) { return true; }
+
+protected:
+  virtual void EmitImpl(llvm::Serializer& S) const;
+  static Type* CreateImpl(ASTContext& Context, llvm::Deserializer& D);
+  friend class Type;
 };
 
 /// TypeOfType (GCC extension).
diff --git a/clang/lib/AST/TypeSerialization.cpp b/clang/lib/AST/TypeSerialization.cpp
index 8e35f187a3e..064b5b8dfe1 100644
--- a/clang/lib/AST/TypeSerialization.cpp
+++ b/clang/lib/AST/TypeSerialization.cpp
@@ -109,6 +109,10 @@ void Type::Create(ASTContext& Context, unsigned i, Deserializer& D) {
     case Type::TypeName:
       D.RegisterPtr(PtrID,TypedefType::CreateImpl(Context,D));
       break;
+
+    case Type::TypeOfExp:
+      D.RegisterPtr(PtrID, TypeOfExpr::CreateImpl(Context, D));
+      break;
       
     case Type::TemplateTypeParm:
       D.RegisterPtr(PtrID,TemplateTypeParmType::CreateImpl(Context, D));
@@ -274,6 +278,25 @@ Type* TypedefType::CreateImpl(ASTContext& Context, Deserializer& D) {
   D.ReadPtr(T->Decl); // May be backpatched.
   return T;
 }
+
+//===----------------------------------------------------------------------===//
+// TypeOfExpr
+//===----------------------------------------------------------------------===//
+void TypeOfExpr::EmitImpl(llvm::Serializer& S) const {
+  S.EmitOwnedPtr(TOExpr);
+}
+
+Type* TypeOfExpr::CreateImpl(ASTContext& Context, Deserializer& D) {
+  Expr* E = D.ReadOwnedPtr<Expr>(Context);
+  
+  std::vector<Type*>& Types = 
+    const_cast<std::vector<Type*>&>(Context.getTypes());
+
+  TypeOfExpr* T = new TypeOfExpr(E, Context.getCanonicalType(E->getType()));
+  Types.push_back(T);
+
+  return T;
+}
   
 //===----------------------------------------------------------------------===//
 // TemplateTypeParmType