aboutsummaryrefslogtreecommitdiff
path: root/clang/unittests
diff options
context:
space:
mode:
Diffstat (limited to 'clang/unittests')
-rw-r--r--clang/unittests/Basic/FileManagerTest.cpp77
-rw-r--r--clang/unittests/Basic/SourceManagerTest.cpp2
-rw-r--r--clang/unittests/Frontend/CompilerInstanceTest.cpp2
3 files changed, 42 insertions, 39 deletions
diff --git a/clang/unittests/Basic/FileManagerTest.cpp b/clang/unittests/Basic/FileManagerTest.cpp
index d32036d..5389732 100644
--- a/clang/unittests/Basic/FileManagerTest.cpp
+++ b/clang/unittests/Basic/FileManagerTest.cpp
@@ -116,9 +116,9 @@ TEST_F(FileManagerTest, NoVirtualDirectoryExistsBeforeAVirtualFileIsAdded) {
// by what's in the real file system.
manager.setStatCache(std::make_unique<FakeStatCache>());
- ASSERT_FALSE(manager.getDirectory("virtual/dir/foo"));
- ASSERT_FALSE(manager.getDirectory("virtual/dir"));
- ASSERT_FALSE(manager.getDirectory("virtual"));
+ ASSERT_FALSE(manager.getOptionalDirectoryRef("virtual/dir/foo"));
+ ASSERT_FALSE(manager.getOptionalDirectoryRef("virtual/dir"));
+ ASSERT_FALSE(manager.getOptionalDirectoryRef("virtual"));
}
// When a virtual file is added, all of its ancestors should be created.
@@ -126,10 +126,12 @@ TEST_F(FileManagerTest, getVirtualFileCreatesDirectoryEntriesForAncestors) {
// Fake an empty real file system.
manager.setStatCache(std::make_unique<FakeStatCache>());
- manager.getVirtualFile("virtual/dir/bar.h", 100, 0);
- ASSERT_FALSE(manager.getDirectory("virtual/dir/foo"));
+ manager.getVirtualFileRef("virtual/dir/bar.h", 100, 0);
- auto dir = manager.getDirectoryRef("virtual/dir");
+ auto dir = manager.getDirectoryRef("virtual/dir/foo");
+ ASSERT_THAT_EXPECTED(dir, llvm::Failed());
+
+ dir = manager.getDirectoryRef("virtual/dir");
ASSERT_THAT_EXPECTED(dir, llvm::Succeeded());
EXPECT_EQ("virtual/dir", dir->getName());
@@ -172,7 +174,7 @@ TEST_F(FileManagerTest, getFileReturnsValidFileEntryForExistingVirtualFile) {
// Fake an empty real file system.
manager.setStatCache(std::make_unique<FakeStatCache>());
- manager.getVirtualFile("virtual/dir/bar.h", 100, 0);
+ manager.getVirtualFileRef("virtual/dir/bar.h", 100, 0);
auto file = manager.getFileRef("virtual/dir/bar.h");
ASSERT_THAT_EXPECTED(file, llvm::Succeeded());
EXPECT_EQ("virtual/dir/bar.h", file->getName());
@@ -190,11 +192,11 @@ TEST_F(FileManagerTest, getFileReturnsDifferentFileEntriesForDifferentFiles) {
statCache->InjectFile("bar.cpp", 43);
manager.setStatCache(std::move(statCache));
- auto fileFoo = manager.getFile("foo.cpp");
- auto fileBar = manager.getFile("bar.cpp");
+ auto fileFoo = manager.getOptionalFileRef("foo.cpp");
+ auto fileBar = manager.getOptionalFileRef("bar.cpp");
ASSERT_TRUE(fileFoo);
ASSERT_TRUE(fileBar);
- EXPECT_NE(*fileFoo, *fileBar);
+ EXPECT_NE(&fileFoo->getFileEntry(), &fileBar->getFileEntry());
}
// getFile() returns an error if neither a real file nor a virtual file
@@ -208,19 +210,22 @@ TEST_F(FileManagerTest, getFileReturnsErrorForNonexistentFile) {
manager.setStatCache(std::move(statCache));
// Create a virtual bar.cpp file.
- manager.getVirtualFile("bar.cpp", 200, 0);
+ manager.getVirtualFileRef("bar.cpp", 200, 0);
- auto file = manager.getFile("xyz.txt");
+ auto file = manager.getFileRef("xyz.txt");
ASSERT_FALSE(file);
- ASSERT_EQ(file.getError(), std::errc::no_such_file_or_directory);
+ ASSERT_EQ(llvm::errorToErrorCode(file.takeError()),
+ std::make_error_code(std::errc::no_such_file_or_directory));
- auto readingDirAsFile = manager.getFile("MyDirectory");
+ auto readingDirAsFile = manager.getFileRef("MyDirectory");
ASSERT_FALSE(readingDirAsFile);
- ASSERT_EQ(readingDirAsFile.getError(), std::errc::is_a_directory);
+ ASSERT_EQ(llvm::errorToErrorCode(readingDirAsFile.takeError()),
+ std::make_error_code(std::errc::is_a_directory));
- auto readingFileAsDir = manager.getDirectory("foo.cpp");
+ auto readingFileAsDir = manager.getDirectoryRef("foo.cpp");
ASSERT_FALSE(readingFileAsDir);
- ASSERT_EQ(readingFileAsDir.getError(), std::errc::not_a_directory);
+ ASSERT_EQ(llvm::errorToErrorCode(readingFileAsDir.takeError()),
+ std::make_error_code(std::errc::not_a_directory));
}
// The following tests apply to Unix-like system only.
@@ -236,11 +241,11 @@ TEST_F(FileManagerTest, getFileReturnsSameFileEntryForAliasedRealFiles) {
statCache->InjectFile("abc/bar.cpp", 42);
manager.setStatCache(std::move(statCache));
- auto f1 = manager.getFile("abc/foo.cpp");
- auto f2 = manager.getFile("abc/bar.cpp");
+ auto f1 = manager.getOptionalFileRef("abc/foo.cpp");
+ auto f2 = manager.getOptionalFileRef("abc/bar.cpp");
- EXPECT_EQ(f1 ? *f1 : nullptr,
- f2 ? *f2 : nullptr);
+ EXPECT_EQ(f1 ? &f1->getFileEntry() : nullptr,
+ f2 ? &f2->getFileEntry() : nullptr);
// Check that getFileRef also does the right thing.
auto r1 = manager.getFileRef("abc/foo.cpp");
@@ -338,11 +343,11 @@ TEST_F(FileManagerTest, getFileReturnsSameFileEntryForAliasedVirtualFiles) {
statCache->InjectFile("abc/bar.cpp", 42);
manager.setStatCache(std::move(statCache));
- auto f1 = manager.getFile("abc/foo.cpp");
- auto f2 = manager.getFile("abc/bar.cpp");
+ auto f1 = manager.getOptionalFileRef("abc/foo.cpp");
+ auto f2 = manager.getOptionalFileRef("abc/bar.cpp");
- EXPECT_EQ(f1 ? *f1 : nullptr,
- f2 ? *f2 : nullptr);
+ EXPECT_EQ(f1 ? &f1->getFileEntry() : nullptr,
+ f2 ? &f2->getFileEntry() : nullptr);
}
TEST_F(FileManagerTest, getFileRefEquality) {
@@ -420,20 +425,19 @@ TEST_F(FileManagerTest, getVirtualFileWithDifferentName) {
manager.setStatCache(std::move(statCache));
// Inject the virtual file:
- const FileEntry *file1 = manager.getVirtualFile("c:\\tmp\\test", 123, 1);
- ASSERT_TRUE(file1 != nullptr);
- EXPECT_EQ(43U, file1->getUniqueID().getFile());
- EXPECT_EQ(123, file1->getSize());
+ FileEntryRef file1 = manager.getVirtualFileRef("c:\\tmp\\test", 123, 1);
+ EXPECT_EQ(43U, file1.getUniqueID().getFile());
+ EXPECT_EQ(123, file1.getSize());
// Lookup the virtual file with a different name:
- auto file2 = manager.getFile("c:/tmp/test", 100, 1);
+ auto file2 = manager.getOptionalFileRef("c:/tmp/test", 100, 1);
ASSERT_TRUE(file2);
// Check that it's the same UFE:
EXPECT_EQ(file1, *file2);
- EXPECT_EQ(43U, (*file2)->getUniqueID().getFile());
+ EXPECT_EQ(43U, file2->getUniqueID().getFile());
// Check that the contents of the UFE are not overwritten by the entry in the
// filesystem:
- EXPECT_EQ(123, (*file2)->getSize());
+ EXPECT_EQ(123, file2->getSize());
}
#endif // !_WIN32
@@ -487,12 +491,11 @@ TEST_F(FileManagerTest, getVirtualFileFillsRealPathName) {
Manager.setStatCache(std::move(statCache));
// Check for real path.
- const FileEntry *file = Manager.getVirtualFile("/tmp/test", 123, 1);
- ASSERT_TRUE(file != nullptr);
+ FileEntryRef file = Manager.getVirtualFileRef("/tmp/test", 123, 1);
SmallString<64> ExpectedResult = CustomWorkingDir;
llvm::sys::path::append(ExpectedResult, "tmp", "test");
- EXPECT_EQ(file->tryGetRealPathName(), ExpectedResult);
+ EXPECT_EQ(file.getFileEntry().tryGetRealPathName(), ExpectedResult);
}
TEST_F(FileManagerTest, getFileDontOpenRealPath) {
@@ -514,12 +517,12 @@ TEST_F(FileManagerTest, getFileDontOpenRealPath) {
Manager.setStatCache(std::move(statCache));
// Check for real path.
- auto file = Manager.getFile("/tmp/test", /*OpenFile=*/false);
+ auto file = Manager.getOptionalFileRef("/tmp/test", /*OpenFile=*/false);
ASSERT_TRUE(file);
SmallString<64> ExpectedResult = CustomWorkingDir;
llvm::sys::path::append(ExpectedResult, "tmp", "test");
- EXPECT_EQ((*file)->tryGetRealPathName(), ExpectedResult);
+ EXPECT_EQ(file->getFileEntry().tryGetRealPathName(), ExpectedResult);
}
TEST_F(FileManagerTest, getBypassFile) {
diff --git a/clang/unittests/Basic/SourceManagerTest.cpp b/clang/unittests/Basic/SourceManagerTest.cpp
index 0f2476b..2b3fce9 100644
--- a/clang/unittests/Basic/SourceManagerTest.cpp
+++ b/clang/unittests/Basic/SourceManagerTest.cpp
@@ -549,7 +549,7 @@ TEST_F(SourceManagerTest, getMacroArgExpandedLocation) {
// These are different than normal includes since predefines buffer doesn't
// have a valid insertion location.
PP.setPredefines("#include \"/implicit-header.h\"");
- FileMgr.getVirtualFile("/implicit-header.h", 0, 0);
+ FileMgr.getVirtualFileRef("/implicit-header.h", 0, 0);
PP.Initialize(*Target);
PP.EnterMainSourceFile();
diff --git a/clang/unittests/Frontend/CompilerInstanceTest.cpp b/clang/unittests/Frontend/CompilerInstanceTest.cpp
index 8bc705d..5cf548e9 100644
--- a/clang/unittests/Frontend/CompilerInstanceTest.cpp
+++ b/clang/unittests/Frontend/CompilerInstanceTest.cpp
@@ -71,7 +71,7 @@ TEST(CompilerInstance, DefaultVFSOverlayFromInvocation) {
// Check if the virtual file exists which means that our VFS is used by the
// CompilerInstance.
- ASSERT_TRUE(Instance.getFileManager().getFile("vfs-virtual.file"));
+ ASSERT_TRUE(Instance.getFileManager().getOptionalFileRef("vfs-virtual.file"));
}
TEST(CompilerInstance, AllowDiagnosticLogWithUnownedDiagnosticConsumer) {
generated by cgit v1.1 at 2025-08-03 22:07:47 +0000