Skip to content

[Basic] clean up MapEntryOptionalStorage and its derived classes (NFC) #164189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

[Basic] clean up MapEntryOptionalStorage and its derived classes (NFC) #164189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions clang/include/clang/Basic/DirectoryEntry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ namespace FileMgr {
/// the private optional_none_tag to keep it to the size of a single pointer.
template <class RefTy> class MapEntryOptionalStorage {
using optional_none_tag = typename RefTy::optional_none_tag;
RefTy MaybeRef;
RefTy MaybeRef = optional_none_tag();

public:
MapEntryOptionalStorage() : MaybeRef(optional_none_tag()) {}
MapEntryOptionalStorage() = default;

template <class... ArgTypes>
explicit MapEntryOptionalStorage(std::in_place_t, ArgTypes &&...Args)
Expand Down Expand Up @@ -168,11 +168,7 @@ class OptionalStorage<clang::DirectoryEntryRef>
clang::FileMgr::MapEntryOptionalStorage<clang::DirectoryEntryRef>;

public:
OptionalStorage() = default;

template <class... ArgTypes>
explicit OptionalStorage(std::in_place_t, ArgTypes &&...Args)
: StorageImpl(std::in_place_t{}, std::forward<ArgTypes>(Args)...) {}
using StorageImpl::StorageImpl;

OptionalStorage &operator=(clang::DirectoryEntryRef Ref) {
StorageImpl::operator=(Ref);
Expand Down
6 changes: 1 addition & 5 deletions clang/include/clang/Basic/FileEntry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,7 @@ class OptionalStorage<clang::FileEntryRef>
clang::FileMgr::MapEntryOptionalStorage<clang::FileEntryRef>;

public:
OptionalStorage() = default;

template <class... ArgTypes>
explicit OptionalStorage(std::in_place_t, ArgTypes &&...Args)
: StorageImpl(std::in_place_t{}, std::forward<ArgTypes>(Args)...) {}
using StorageImpl::StorageImpl;

OptionalStorage &operator=(clang::FileEntryRef Ref) {
StorageImpl::operator=(Ref);
Expand Down