Skip to content

DenseMapInfo: support std::optional<T> #147851

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 8 commits into from
Jul 10, 2025
Merged

DenseMapInfo: support std::optional<T> #147851

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c93c4c4
[ADT] Implement DenseMapInfo of std::optional<T>
elijahkin Jul 9, 2025
2557b8f
Merge branch 'llvm:main' into patch-1
elijahkin Jul 9, 2025
f7a244c
Registering std::optional<uint32_t> for testing
elijahkin Jul 9, 2025
c8b3e81
Avoiding else after return
elijahkin Jul 9, 2025
fb6a46e
Including <optional> in DenseMapInfo
elijahkin Jul 10, 2025
bf9ece3
Remove newline after template
elijahkin Jul 10, 2025
ddae4e7
Avoid make_optional
elijahkin Jul 10, 2025
6d62db8
Adding getTestKey and getTestValue for std::optional<T>
elijahkin Jul 10, 2025
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
27 changes: 27 additions & 0 deletions llvm/include/llvm/ADT/DenseMapInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <cassert>
#include <cstddef>
#include <cstdint>
#include <optional>
#include <tuple>
#include <type_traits>
#include <utility>
Expand Down Expand Up @@ -320,6 +321,32 @@ struct DenseMapInfo<Enum, std::enable_if_t<std::is_enum_v<Enum>>> {

static bool isEqual(const Enum &LHS, const Enum &RHS) { return LHS == RHS; }
};

template <typename T> struct DenseMapInfo<std::optional<T>> {
using Optional = std::optional<T>;
using Info = DenseMapInfo<T>;

static inline Optional getEmptyKey() {
return std::make_optional(Info::getEmptyKey());
}

static inline Optional getTombstoneKey() {
return std::make_optional(Info::getTombstoneKey());
}

static unsigned getHashValue(const Optional &OptionalVal) {
return detail::combineHashValue(
OptionalVal.has_value(),
Info::getHashValue(OptionalVal.value_or(Info::getEmptyKey())));
}

static bool isEqual(const Optional &LHS, const Optional &RHS) {
if (LHS && RHS) {
return Info::isEqual(LHS.value(), RHS.value());
}
return !LHS && !RHS;
}
};
} // end namespace llvm

#endif // LLVM_ADT_DENSEMAPINFO_H
5 changes: 4 additions & 1 deletion llvm/unittests/ADT/DenseMapTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include <map>
#include <optional>
#include <set>
#include <utility>
#include <variant>
Expand Down Expand Up @@ -117,11 +118,13 @@ typedef ::testing::Types<DenseMap<uint32_t, uint32_t>,
DenseMap<uint32_t *, uint32_t *>,
DenseMap<CtorTester, CtorTester, CtorTesterMapInfo>,
DenseMap<EnumClass, uint32_t>,
DenseMap<std::optional<uint32_t>, uint32_t>,
SmallDenseMap<uint32_t, uint32_t>,
SmallDenseMap<uint32_t *, uint32_t *>,
SmallDenseMap<CtorTester, CtorTester, 4,
CtorTesterMapInfo>,
SmallDenseMap<EnumClass, uint32_t>
SmallDenseMap<EnumClass, uint32_t>,
SmallDenseMap<std::optional<uint32_t>, uint32_t>
> DenseMapTestTypes;
// clang-format on

Expand Down
Loading