diff options
author | Axel Naumann <Axel.Naumann@cern.ch> | 2011-01-27 10:55:51 +0000 |
---|---|---|
committer | Axel Naumann <Axel.Naumann@cern.ch> | 2011-01-27 10:55:51 +0000 |
commit | 04331169f04198eb769925fa17696a21989c9d8b (patch) | |
tree | ab0f5501fbd99cfa645a22c52ea86aea47005eb6 /lib/Basic/FileManager.cpp | |
parent | 6ec278d1a354517e20f13a877481453ee7940c78 (diff) |
TextDiagnosticPrinter.cpp: Show diagnostics as far as possible even with invalid PresomedLoc, instead of just silencing it.
FileManager.cpp: Allow virtual files in nonexistent directories.
FileManager.cpp: Close FileDescriptor for virtual files that correspond to actual files.
FileManager.cpp: Enable virtual files to be created even for files that were flagged as NON_EXISTENT_FILE, e.g. by a prior (unsuccessful) addFile().
ASTReader.cpp: Read a PCH even if the original source files cannot be found.
Add a test for reading a PCH of a file that has been removed and diagnostics referencing that file.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124374 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Basic/FileManager.cpp')
-rw-r--r-- | lib/Basic/FileManager.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp index bb37c999d1..cbe90bfdc1 100644 --- a/lib/Basic/FileManager.cpp +++ b/lib/Basic/FileManager.cpp @@ -350,18 +350,17 @@ FileManager::getVirtualFile(llvm::StringRef Filename, off_t Size, FileEntries.GetOrCreateValue(Filename); // See if there is already an entry in the map. - if (NamedFileEnt.getValue()) - return NamedFileEnt.getValue() == NON_EXISTENT_FILE - ? 0 : NamedFileEnt.getValue(); + if (NamedFileEnt.getValue() && NamedFileEnt.getValue() != NON_EXISTENT_FILE) + return NamedFileEnt.getValue(); ++NumFileCacheMisses; // By default, initialize it to invalid. NamedFileEnt.setValue(NON_EXISTENT_FILE); + // We allow the directory to not exist. If it does exist we store it. + // const DirectoryEntry *DirInfo = getDirectoryFromFile(*this, Filename); - if (DirInfo == 0) // Directory doesn't exist, file can't exist. - return 0; FileEntry *UFE = new FileEntry(); VirtualFileEntries.push_back(UFE); @@ -381,8 +380,13 @@ FileManager::getVirtualFile(llvm::StringRef Filename, off_t Size, // newly-created file entry. int FileDescriptor = -1; struct stat StatBuf; - if (getStatValue(InterndFileName, StatBuf, &FileDescriptor)) + if (getStatValue(InterndFileName, StatBuf, &FileDescriptor)) { + // If the stat process opened the file, close it to avoid a FD leak. + if (FileDescriptor != -1) + close(FileDescriptor); + return UFE; + } UFE->FD = FileDescriptor; llvm::SmallString<128> FilePath(UFE->Name); |