2 files changed, 30 insertions, 0 deletions
diff --git a/AST/DeclSerialization.cpp b/AST/DeclSerialization.cpp
index cfab8cc76d..3e2ce0fcc8 100644
--- a/AST/DeclSerialization.cpp
+++ b/AST/DeclSerialization.cpp
@@ -43,6 +43,9 @@ Decl* Decl::Create(Deserializer& D) {
     case BlockVar:
       return BlockVarDecl::CreateImpl(D);
       
+    case Field:
+      return FieldDecl::CreateImpl(D);
+      
     case FileVar:
       return FileVarDecl::CreateImpl(D);
       
@@ -217,6 +220,24 @@ ParmVarDecl* ParmVarDecl::CreateImpl(Deserializer& D) {
 }
 
 //===----------------------------------------------------------------------===//
+//      FieldDecl Serialization.
+//===----------------------------------------------------------------------===//
+
+void FieldDecl::EmitImpl(Serializer& S) const {
+  S.Emit(getType());
+  NamedDecl::EmitInRec(S);
+  S.EmitOwnedPtr(BitWidth);  
+}
+
+FieldDecl* FieldDecl::CreateImpl(Deserializer& D) {
+  QualType DeclType = QualType::ReadVal(D);
+  FieldDecl* decl = new FieldDecl(SourceLocation(),NULL,DeclType);
+  decl->ReadInRec(D);
+  decl->BitWidth = D.ReadOwnedPtr<Expr>();
+  return decl;
+}
+
+//===----------------------------------------------------------------------===//
 //      FunctionDecl Serialization.
 //===----------------------------------------------------------------------===//
 
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 0ffb3277dd..5930d96711 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -505,6 +505,15 @@ public:
     return D->getKind() >= FieldFirst && D->getKind() <= FieldLast;
   }
   static bool classof(const FieldDecl *D) { return true; }
+
+protected:
+  /// EmitImpl - Serialize this FieldDecl.  Called by Decl::Emit.
+  virtual void EmitImpl(llvm::Serializer& S) const;
+  
+  /// CreateImpl - Deserialize a FieldDecl.  Called by Decl::Create.
+  static FieldDecl* CreateImpl(llvm::Deserializer& D);
+  
+  friend Decl* Decl::Create(llvm::Deserializer& D);  
 };
 
 /// EnumConstantDecl - An instance of this object exists for each enum constant