diff options
author | Ben Langmuir <blangmuir@apple.com> | 2014-02-20 21:59:23 +0000 |
---|---|---|
committer | Ben Langmuir <blangmuir@apple.com> | 2014-02-20 21:59:23 +0000 |
commit | d7596d64125a962565452d5f7f6bac545ec5a082 (patch) | |
tree | 48db574f2bb6fed3725cc4148a57f4be48ce9c8c /lib/Lex/PTHLexer.cpp | |
parent | 9bce94e59ca9b2afb119f11833227ca6a4eda0ef (diff) |
Recommit virtual file system
Previously reverted in r201755 due to causing an assertion failure.
I've removed the offending assertion, and taught the CompilerInstance to
create a default virtual file system inside createFileManager. In the
future, we should be able to reach into the CompilerInvocation to
customize this behaviour without breaking clients that don't care.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201818 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/PTHLexer.cpp')
-rw-r--r-- | lib/Lex/PTHLexer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Lex/PTHLexer.cpp b/lib/Lex/PTHLexer.cpp index e174222ece..cdc5d7e338 100644 --- a/lib/Lex/PTHLexer.cpp +++ b/lib/Lex/PTHLexer.cpp @@ -675,13 +675,13 @@ public: ~PTHStatCache() {} LookupResult getStat(const char *Path, FileData &Data, bool isFile, - int *FileDescriptor) { + vfs::File **F, vfs::FileSystem &FS) { // Do the lookup for the file's data in the PTH file. CacheTy::iterator I = Cache.find(Path); // If we don't get a hit in the PTH file just forward to 'stat'. if (I == Cache.end()) - return statChained(Path, Data, isFile, FileDescriptor); + return statChained(Path, Data, isFile, F, FS); const PTHStatData &D = *I; |