diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Serialization/ModuleManager.h | 7 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTReader.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/Serialization/ModuleManager.cpp | 12 |
3 files changed, 16 insertions, 8 deletions
diff --git a/clang/include/clang/Serialization/ModuleManager.h b/clang/include/clang/Serialization/ModuleManager.h index 6dcaa210d2d..1e23ca2d687 100644 --- a/clang/include/clang/Serialization/ModuleManager.h +++ b/clang/include/clang/Serialization/ModuleManager.h @@ -92,6 +92,8 @@ public: /// /// \param Type The kind of module being loaded. /// + /// \param ImportLoc The location at which the module is imported. + /// /// \param ImportedBy The module that is importing this module, or NULL if /// this module is imported directly by the user. /// @@ -103,8 +105,9 @@ public: /// \return A pointer to the module that corresponds to this file name, /// and a boolean indicating whether the module was newly added. std::pair<ModuleFile *, bool> - addModule(StringRef FileName, ModuleKind Type, ModuleFile *ImportedBy, - unsigned Generation, std::string &ErrorStr); + addModule(StringRef FileName, ModuleKind Type, SourceLocation ImportLoc, + ModuleFile *ImportedBy, unsigned Generation, + std::string &ErrorStr); /// \brief Remove the given set of modules. void removeModules(ModuleIterator first, ModuleIterator last); diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index ffed8356c90..c1428d5c68b 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -2818,8 +2818,9 @@ ASTReader::ReadASTCore(StringRef FileName, ModuleFile *M; bool NewModule; std::string ErrorStr; - llvm::tie(M, NewModule) = ModuleMgr.addModule(FileName, Type, ImportedBy, - CurrentGeneration, ErrorStr); + llvm::tie(M, NewModule) = ModuleMgr.addModule(FileName, Type, ImportLoc, + ImportedBy, CurrentGeneration, + ErrorStr); if (!M) { // We couldn't load the module. diff --git a/clang/lib/Serialization/ModuleManager.cpp b/clang/lib/Serialization/ModuleManager.cpp index efe442101bb..d5a0a28bdb0 100644 --- a/clang/lib/Serialization/ModuleManager.cpp +++ b/clang/lib/Serialization/ModuleManager.cpp @@ -34,9 +34,9 @@ llvm::MemoryBuffer *ModuleManager::lookupBuffer(StringRef Name) { } std::pair<ModuleFile *, bool> -ModuleManager::addModule(StringRef FileName, ModuleKind Type, - ModuleFile *ImportedBy, unsigned Generation, - std::string &ErrorStr) { +ModuleManager::addModule(StringRef FileName, ModuleKind Type, + SourceLocation ImportLoc, ModuleFile *ImportedBy, + unsigned Generation, std::string &ErrorStr) { const FileEntry *Entry = FileMgr.getFile(FileName); if (!Entry && FileName != "-") { ErrorStr = "file not found"; @@ -51,10 +51,11 @@ ModuleManager::addModule(StringRef FileName, ModuleKind Type, ModuleFile *New = new ModuleFile(Type, Generation); New->FileName = FileName.str(); New->File = Entry; + New->ImportLoc = ImportLoc; Chain.push_back(New); NewModule = true; ModuleEntry = New; - + // Load the contents of the module if (llvm::MemoryBuffer *Buffer = lookupBuffer(FileName)) { // The buffer was already provided for us. @@ -82,6 +83,9 @@ ModuleManager::addModule(StringRef FileName, ModuleKind Type, ModuleEntry->ImportedBy.insert(ImportedBy); ImportedBy->Imports.insert(ModuleEntry); } else { + if (!ModuleEntry->DirectlyImported) + ModuleEntry->ImportLoc = ImportLoc; + ModuleEntry->DirectlyImported = true; } |
