2 files changed, 30 insertions, 0 deletions
diff --git a/AST/TypeSerialization.cpp b/AST/TypeSerialization.cpp
index cf2ae47f40..93b2ce3271 100644
--- a/AST/TypeSerialization.cpp
+++ b/AST/TypeSerialization.cpp
@@ -70,6 +70,9 @@ void Type::Create(ASTContext& Context, unsigned i, Deserializer& D) {
       D.RegisterPtr(PtrID,ComplexType::CreateImpl(Context,D));
       break;
       
+    case Type::ConstantArray:
+      D.RegisterPtr(PtrID,ConstantArrayType::CreateImpl(Context,D));
+      
     case Type::FunctionProto:
       D.RegisterPtr(PtrID,FunctionTypeProto::CreateImpl(Context,D));
       break;
@@ -97,6 +100,28 @@ Type* ComplexType::CreateImpl(ASTContext& Context, Deserializer& D) {
 }
 
 //===----------------------------------------------------------------------===//
+// ConstantArray
+//===----------------------------------------------------------------------===//
+
+void ConstantArrayType::EmitImpl(Serializer& S) const {
+  S.Emit(getElementType());
+  S.EmitInt(getSizeModifier());
+  S.EmitInt(getIndexTypeQualifier());
+  S.Emit(Size);
+}
+
+Type* ConstantArrayType::CreateImpl(ASTContext& Context, Deserializer& D) {
+  QualType ElTy = QualType::ReadVal(D);
+  ArraySizeModifier am = static_cast<ArraySizeModifier>(D.ReadInt());
+  unsigned ITQ = D.ReadInt();
+
+  llvm::APInt Size;
+  D.Read(Size);
+
+  return Context.getConstantArrayType(ElTy,Size,am,ITQ).getTypePtr();
+}
+
+//===----------------------------------------------------------------------===//
 // FunctionTypeProto
 //===----------------------------------------------------------------------===//
 
diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h
index 430474484b..7c55883fc6 100644
--- a/include/clang/AST/Type.h
+++ b/include/clang/AST/Type.h
@@ -560,6 +560,11 @@ public:
     return T->getTypeClass() == ConstantArray; 
   }
   static bool classof(const ConstantArrayType *) { return true; }
+  
+protected:  
+  virtual void EmitImpl(llvm::Serializer& S) const;
+  static Type* CreateImpl(ASTContext& Context, llvm::Deserializer& D);
+  friend class Type;
 };
 
 // FIXME: VariableArrayType's aren't uniqued (since expressions aren't).