commit aedf7144d1167b80cfcc56785aa383c744ae5af3
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Wed Oct 03 01:58:42 2012 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Wed Oct 03 01:58:42 2012 +0000
tree 06d35bc5b8a691358b2112b3b6615f2130b07a6b
parent 842ffe8806f3819aebe39283173d4ed621cea989

Set the file entry for a Module* that was created during deserialization
of a module file.

llvm-svn: 165086

clang/lib/Serialization/ASTReader.cpp

diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 3960fa2..cc6d073 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -3177,6 +3177,7 @@
         return Failure;
       }
       
+      CurrentModule->setASTFile(F.File);
       CurrentModule->IsFromModuleFile = true;
       CurrentModule->IsSystem = IsSystem || CurrentModule->IsSystem;
       CurrentModule->InferSubmodules = InferSubmodules;
@@ -6497,7 +6498,7 @@
   : Listener(new PCHValidator(PP, *this)), DeserializationListener(0),
     SourceMgr(PP.getSourceManager()), FileMgr(PP.getFileManager()),
     Diags(PP.getDiagnostics()), SemaObj(0), PP(PP), Context(Context),
-    Consumer(0), ModuleMgr(FileMgr.getFileSystemOptions()),
+    Consumer(0), ModuleMgr(PP.getFileManager()),
     RelocatablePCH(false), isysroot(isysroot),
     DisableValidation(DisableValidation),
     DisableStatCache(DisableStatCache),