Fix serialization for TypedefType by allowing TypedefType to access the internal...

The test case Serialization/stmt_exprs.c now passes.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54117 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h
index 952a5dd9baeb7d24b312d78d24183c36d6c41e1b..5d764894c28aae5085dc6828c27af315de521b37 100644 (file)
--- a/include/clang/AST/Type.h
+++ b/include/clang/AST/Type.h
@@ -394,6 +394,7 @@ public:
 private:  
   QualType getCanonicalTypeInternal() const { return CanonicalType; }
   friend class QualType;
+  friend class TypedefType;
 public:
   void dump() const;
   virtual void getAsStringInternal(std::string &InnerString) const = 0;

diff --git a/lib/AST/TypeSerialization.cpp b/lib/AST/TypeSerialization.cpp
index 00b71b65b5fb5e381b5635129b8853589720f32f..60b5c68b0c8e415f975c2784d3f10bc104476594 100644 (file)
--- a/lib/AST/TypeSerialization.cpp
+++ b/lib/AST/TypeSerialization.cpp
@@ -239,7 +239,7 @@ Type* TagType::CreateImpl(ASTContext& Context, Deserializer& D) {
 //===----------------------------------------------------------------------===//
 
 void TypedefType::EmitImpl(Serializer& S) const {
-  S.Emit(QualType((Type*)this,0)/*.getCanonicalType()*/);
+  S.Emit(getCanonicalTypeInternal());
   S.EmitPtr(Decl);
 }
 
@@ -247,7 +247,7 @@ Type* TypedefType::CreateImpl(ASTContext& Context, Deserializer& D) {
   std::vector<Type*>& Types = 
     const_cast<std::vector<Type*>&>(Context.getTypes());
   
-  TypedefType* T = new TypedefType(Type::TypeName, NULL,QualType::ReadVal(D));
+  TypedefType* T = new TypedefType(Type::TypeName, NULL, QualType::ReadVal(D));
   Types.push_back(T);
   
   D.ReadPtr(T->Decl); // May be backpatched.