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 | c8130a74f498c5ca3d1d6276df392bae337cf221 (patch) | |
| tree | 04fd5f2ab091ffba1896562844e19ef94baddea4 /clang/lib/Frontend/CacheTokens.cpp | |
| parent | 37eb422f69e22490396a45cc65de93ccc75ffa2d (diff) | |
| download | llvm-c8130a74f498c5ca3d1d6276df392bae337cf221.zip llvm-c8130a74f498c5ca3d1d6276df392bae337cf221.tar.gz llvm-c8130a74f498c5ca3d1d6276df392bae337cf221.tar.bz2 | |
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.
llvm-svn: 201818
Diffstat (limited to 'clang/lib/Frontend/CacheTokens.cpp')
| -rw-r--r-- | clang/lib/Frontend/CacheTokens.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Frontend/CacheTokens.cpp b/clang/lib/Frontend/CacheTokens.cpp index 0c30b04..5cb364e 100644 --- a/clang/lib/Frontend/CacheTokens.cpp +++ b/clang/lib/Frontend/CacheTokens.cpp @@ -516,8 +516,8 @@ public: ~StatListener() {} LookupResult getStat(const char *Path, FileData &Data, bool isFile, - int *FileDescriptor) { - LookupResult Result = statChained(Path, Data, isFile, FileDescriptor); + vfs::File **F, vfs::FileSystem &FS) { + LookupResult Result = statChained(Path, Data, isFile, F, FS); if (Result == CacheMissing) // Failed 'stat'. PM.insert(PTHEntryKeyVariant(Path), PTHEntry()); |