Updated serialization of ParmVarDecl to serialize out objcDeclQualifier.

Previously this field was serialized out in VarDecl (a parent class), but
now the field belongs to ParmVarDecl.

llvm-svn: 44989

2 files changed, 10 insertions, 5 deletions

diff --git a/clang/AST/DeclSerialization.cpp b/clang/AST/DeclSerialization.cpp
index f2ed75b4b56..cc29210f4fe 100644
--- a/clang/AST/DeclSerialization.cpp
+++ b/clang/AST/DeclSerialization.cpp
@@ -146,15 +146,11 @@ void ValueDecl::ReadInRec(Deserializer& D) {
 void VarDecl::EmitInRec(Serializer& S) const {
   ValueDecl::EmitInRec(S);
   S.EmitInt(getStorageClass());             // From VarDecl.
-  // FIXME: This is now in ParmVarDecl
-  // S.EmitInt(getObjcDeclQualifier());        // From VarDecl.
 }
 
 void VarDecl::ReadInRec(Deserializer& D) {
   ValueDecl::ReadInRec(D);
   SClass = static_cast<StorageClass>(D.ReadInt());  // From VarDecl. 
-  // FIXME: This is now in ParmVarDecl
-  // objcDeclQualifier = static_cast<ObjcDeclQualifier>(D.ReadInt());  // VarDecl.
 }
 
     //===------------------------------------------------------------===//
@@ -219,12 +215,18 @@ FileVarDecl* FileVarDecl::CreateImpl(Deserializer& D) {
 //      ParmDecl Serialization.
 //===----------------------------------------------------------------------===//
 
+void ParmVarDecl::EmitImpl(llvm::Serializer& S) const {
+  VarDecl::EmitImpl(S);
+  S.EmitInt(getObjcDeclQualifier());        // From ParmVarDecl.
+}
+
 ParmVarDecl* ParmVarDecl::CreateImpl(Deserializer& D) {
   ParmVarDecl* decl =
     new ParmVarDecl(SourceLocation(),NULL,QualType(),None,NULL);
   
   decl->VarDecl::ReadImpl(D);
-  
+  decl->objcDeclQualifier = static_cast<ObjcDeclQualifier>(D.ReadInt());
+
   return decl;
 }
 
diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
index 8fd68295fbc..efa79d5372f 100644
--- a/clang/include/clang/AST/Decl.h
+++ b/clang/include/clang/AST/Decl.h
@@ -410,6 +410,9 @@ private:
   ObjcDeclQualifier objcDeclQualifier : 6;
   
 protected:
+  /// EmitImpl - Serialize this ParmVarDecl. Called by Decl::Emit.
+  virtual void EmitImpl(llvm::Serializer& S) const;
+  
   /// CreateImpl - Deserialize a ParmVarDecl.  Called by Decl::Create.
   static ParmVarDecl* CreateImpl(llvm::Deserializer& D);