Skip to content

Commit ed4f0cb

Browse files
committed
[VFS] Use generic_category for errors generated from the VFS
Errors are generally checked in clients by comparing to the portable error condition in `std::errc`, which will have the `generic_category` (eg. `std::errc::no_such_file_or_directory`). While in practice these are usually equivalent for the standard errno's, they are not in *all* implementations. One such example is CentOS 7. Differential Revision: https://reviews.llvm.org/D120299
1 parent 2df019a commit ed4f0cb

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

llvm/lib/Support/VirtualFileSystem.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,7 @@ class CombiningDirIterImpl : public llvm::vfs::detail::DirIterImpl {
485485
}
486486

487487
if (IsFirstTime && CurrentDirIter == directory_iterator())
488-
return std::error_code(static_cast<int>(errc::no_such_file_or_directory),
489-
std::system_category());
488+
return errc::no_such_file_or_directory;
490489
return {};
491490
}
492491

@@ -1285,8 +1284,7 @@ directory_iterator RedirectingFileSystem::dir_begin(const Twine &Dir,
12851284
}
12861285

12871286
if (!S->isDirectory()) {
1288-
EC = std::error_code(static_cast<int>(errc::not_a_directory),
1289-
std::system_category());
1287+
EC = errc::not_a_directory;
12901288
return {};
12911289
}
12921290

0 commit comments

Comments
 (0)