diff options
| author | Reid Kleckner <rnk@google.com> | 2018-07-26 23:21:51 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2018-07-26 23:21:51 +0000 |
| commit | 4d23f45a11325dfc03a9904cfc1e354c54f06081 (patch) | |
| tree | 3e5a4ecca161edc58b1a8c2f278a6b982c42d572 /clang/lib/Basic/FileManager.cpp | |
| parent | 4a83f0abd8177396493968332031085ff217c6d5 (diff) | |
| download | llvm-4d23f45a11325dfc03a9904cfc1e354c54f06081.zip llvm-4d23f45a11325dfc03a9904cfc1e354c54f06081.tar.gz llvm-4d23f45a11325dfc03a9904cfc1e354c54f06081.tar.bz2 | |
Revert r338057 "[VirtualFileSystem] InMemoryFileSystem::status: Return a Status with the requested name"
This broke clang/test/PCH/case-insensitive-include.c on Windows.
llvm-svn: 338084
Diffstat (limited to 'clang/lib/Basic/FileManager.cpp')
| -rw-r--r-- | clang/lib/Basic/FileManager.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp index 0a79800..7e2d01c 100644 --- a/clang/lib/Basic/FileManager.cpp +++ b/clang/lib/Basic/FileManager.cpp @@ -315,11 +315,9 @@ const FileEntry *FileManager::getFile(StringRef Filename, bool openFile, UFE.InPCH = Data.InPCH; UFE.File = std::move(F); UFE.IsValid = true; - - SmallString<128> RealPathName; - if (!FS->getRealPath(InterndFileName, RealPathName)) - UFE.RealPathName = RealPathName.str(); - + if (UFE.File) + if (auto RealPathName = UFE.File->getName()) + UFE.RealPathName = *RealPathName; return &UFE; } |