diff options
author | Reid Kleckner <rnk@google.com> | 2019-02-15 20:48:12 +0000 |
---|---|---|
committer | Reid Kleckner <rnk@google.com> | 2019-02-15 20:48:12 +0000 |
commit | e2bb3121fd4ab5b01f9ec1d2e3e9877db9c6a54c (patch) | |
tree | 0132fa0d4960a1dc2e15595490fe73622957df75 | |
parent | 63c300cfc1f77b8d4d13e543cb0f1d9185deb6f1 (diff) | |
download | llvm-e2bb3121fd4ab5b01f9ec1d2e3e9877db9c6a54c.zip llvm-e2bb3121fd4ab5b01f9ec1d2e3e9877db9c6a54c.tar.gz llvm-e2bb3121fd4ab5b01f9ec1d2e3e9877db9c6a54c.tar.bz2 |
Revert r354075 "[clang][FileManager] fillRealPathName even if we aren't opening the file"
The new test doesn't pass on Windows.
llvm-svn: 354169
-rw-r--r-- | clang/lib/Basic/FileManager.cpp | 3 | ||||
-rw-r--r-- | clang/unittests/Basic/FileManagerTest.cpp | 14 |
2 files changed, 0 insertions, 17 deletions
diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp index 4102676..75caff9 100644 --- a/clang/lib/Basic/FileManager.cpp +++ b/clang/lib/Basic/FileManager.cpp @@ -267,9 +267,6 @@ const FileEntry *FileManager::getFile(StringRef Filename, bool openFile, if (UFE.File) { if (auto PathName = UFE.File->getName()) fillRealPathName(&UFE, *PathName); - } else if (!openFile) { - // We should still fill the path even if we aren't opening the file. - fillRealPathName(&UFE, InterndFileName); } return &UFE; } diff --git a/clang/unittests/Basic/FileManagerTest.cpp b/clang/unittests/Basic/FileManagerTest.cpp index 14c7879..9f05197 100644 --- a/clang/unittests/Basic/FileManagerTest.cpp +++ b/clang/unittests/Basic/FileManagerTest.cpp @@ -346,18 +346,4 @@ TEST_F(FileManagerTest, getVirtualFileFillsRealPathName) { EXPECT_EQ(file->tryGetRealPathName(), ExpectedResult); } -TEST_F(FileManagerTest, getFileDontOpenRealPath) { - auto statCache = llvm::make_unique<FakeStatCache>(); - statCache->InjectDirectory("/tmp/abc", 42); - SmallString<64> Path("/tmp/abc/foo.cpp"); - statCache->InjectFile(Path.str().str().c_str(), 43); - manager.setStatCache(std::move(statCache)); - - const FileEntry *file = manager.getFile(Path, /*openFile=*/false); - - ASSERT_TRUE(file != nullptr); - - ASSERT_EQ(file->tryGetRealPathName(), Path); -} - } // anonymous namespace |