maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r354075 "[clang][FileManager] fillRealPathName even if we aren't opening the file" 

The new test doesn't pass on Windows.

llvm-svn: 354169
This commit is contained in:
Reid Kleckner 2019-02-15 20:48:12 +00:00
parent 63c300cfc1
commit e2bb3121fd
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Basic/FileManager.cpp
View File

@ -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;
}

14
clang/unittests/Basic/FileManagerTest.cpp
View File

@ -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