nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually keep track of the source locations at which particular module

Browse Source 
files are loaded.

llvm-svn: 169027
This commit is contained in:
Douglas Gregor
2012-11-30 19:28:05 +00:00
parent 31e7d2deb3
commit 6fb03aeae1
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Serialization/ModuleManager.cpp
View File

@@ -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;
}