Adjusted QualType deserialization to reflect updated deserialization API.

We now serialize ivar references inside of ASTContext.

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

diff --git a/AST/ASTContext.cpp b/AST/ASTContext.cpp
index c46efa91e7ae58c93b91412cb12c83e9d936ddde..816a50b29c4be8d1552317c6fb0876f507fc3809 100644 (file)
--- a/AST/ASTContext.cpp
+++ b/AST/ASTContext.cpp
@@ -1298,10 +1298,10 @@ static inline void EmitSet(const llvm::FoldingSet<T>& set, llvm::Serializer& S)
 
 /// Emit - Serialize an ASTContext object to Bitcode.
 void ASTContext::Emit(llvm::Serializer& S) const {
-  // FIXME: S.EmitRef(SourceMgr);
-  // FIXME: S.EmitRef(Target);
-  // FIXME: S.EmitRef(Idents);
-  // FIXME: S.EmitRef(Selectors);
+  S.EmitRef(SourceMgr);
+  S.EmitRef(Target);
+  S.EmitRef(Idents);
+  S.EmitRef(Selectors);
   // FIXME: BuildinInfo
 
   EmitSet(ComplexTypes,S);

diff --git a/AST/TypeSerialization.cpp b/AST/TypeSerialization.cpp
index d21ce6bb94fddb48b8537aeec5efc7575af49142..92dff502d42caf3e6290b6cc906325aea0f5798c 100644 (file)
--- a/AST/TypeSerialization.cpp
+++ b/AST/TypeSerialization.cpp
@@ -24,7 +24,7 @@ void QualType::Emit(llvm::Serializer& S) const {
 }
 
 void QualType::Read(llvm::Deserializer& D) {
-  D.ReadPtr(ThePtr);
+  D.ReadUIntPtr(ThePtr);
   ThePtr |= D.ReadInt();
 }