diff --git a/AST/ASTContext.cpp b/AST/ASTContext.cpp
index c46efa91e7..816a50b29c 100644
--- 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 d21ce6bb94..92dff502d4 100644
--- 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();
 }