summaryrefslogtreecommitdiffstats
path: root/clang/unittests/Basic/FileManagerTest.cpp
diff options
context:
space:
mode:
authorBen Langmuir <blangmuir@apple.com>2014-02-20 21:59:23 +0000
committerBen Langmuir <blangmuir@apple.com>2014-02-20 21:59:23 +0000
commitc8130a74f498c5ca3d1d6276df392bae337cf221 (patch)
tree04fd5f2ab091ffba1896562844e19ef94baddea4 /clang/unittests/Basic/FileManagerTest.cpp
parent37eb422f69e22490396a45cc65de93ccc75ffa2d (diff)
downloadbcm5719-llvm-c8130a74f498c5ca3d1d6276df392bae337cf221.tar.gz
bcm5719-llvm-c8130a74f498c5ca3d1d6276df392bae337cf221.zip
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/unittests/Basic/FileManagerTest.cpp')
-rw-r--r--clang/unittests/Basic/FileManagerTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/unittests/Basic/FileManagerTest.cpp b/clang/unittests/Basic/FileManagerTest.cpp
index f8ce50d531e..5b35e687350 100644
--- a/clang/unittests/Basic/FileManagerTest.cpp
+++ b/clang/unittests/Basic/FileManagerTest.cpp
@@ -48,7 +48,7 @@ public:
// Implement FileSystemStatCache::getStat().
virtual LookupResult getStat(const char *Path, FileData &Data, bool isFile,
- int *FileDescriptor) {
+ vfs::File **F, vfs::FileSystem &FS) {
if (StatCalls.count(Path) != 0) {
Data = StatCalls[Path];
return CacheExists;
OpenPOWER on IntegriCloud