Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion llvm/include/llvm/ADT/STLForwardCompat.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ struct detector<std::void_t<Op<Args...>>, Op, Args...> {
template <template <class...> class Op, class... Args>
using is_detected = typename detail::detector<void, Op, Args...>::value_t;

struct identity_cxx20 // NOLINT(readability-identifier-naming)
struct identity // NOLINT(readability-identifier-naming)
{
using is_transparent = void;

Expand Down
2 changes: 1 addition & 1 deletion llvm/include/llvm/ADT/SparseMultiSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ namespace llvm {
/// @tparam SparseT An unsigned integer type. See above.
///
template <typename ValueT, typename KeyT = unsigned,
typename KeyFunctorT = identity_cxx20, typename SparseT = uint8_t>
typename KeyFunctorT = identity, typename SparseT = uint8_t>
class SparseMultiSet {
static_assert(std::is_unsigned_v<SparseT>,
"SparseT must be an unsigned integer type");
Expand Down
2 changes: 1 addition & 1 deletion llvm/include/llvm/ADT/SparseSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ struct SparseSetValFunctor<KeyT, KeyT, KeyFunctorT> {
/// @tparam SparseT An unsigned integer type. See above.
///
template <typename ValueT, typename KeyT = unsigned,
typename KeyFunctorT = identity_cxx20, typename SparseT = uint8_t>
typename KeyFunctorT = identity, typename SparseT = uint8_t>
class SparseSet {
static_assert(std::is_unsigned_v<SparseT>,
"SparseT must be an unsigned integer type");
Expand Down
2 changes: 1 addition & 1 deletion llvm/include/llvm/CodeGen/ScheduleDAGInstrs.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ namespace llvm {
/// allocated once for the pass. It can be cleared in constant time and reused
/// without any frees.
using RegUnit2SUnitsMap =
SparseMultiSet<PhysRegSUOper, unsigned, identity_cxx20, uint16_t>;
SparseMultiSet<PhysRegSUOper, unsigned, identity, uint16_t>;

/// Track local uses of virtual registers. These uses are gathered by the DAG
/// builder and may be consulted by the scheduler to avoid iterating an entire
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using ExecutorAddrDiff = uint64_t;
class ExecutorAddr {
public:
/// A wrap/unwrap function that leaves pointers unmodified.
using rawPtr = llvm::identity_cxx20;
using rawPtr = llvm::identity;

#if __has_feature(ptrauth_calls)
template <typename T> class PtrauthSignDefault {
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/CodeGen/RegAllocFast.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ class RegAllocFastImpl {
unsigned getSparseSetIndex() const { return VirtReg.virtRegIndex(); }
};

using LiveRegMap = SparseSet<LiveReg, unsigned, identity_cxx20, uint16_t>;
using LiveRegMap = SparseSet<LiveReg, unsigned, identity, uint16_t>;
/// This map contains entries for each virtual register that is currently
/// available in a physical register.
LiveRegMap LiveVirtRegs;
Expand Down
2 changes: 1 addition & 1 deletion llvm/unittests/ADT/STLForwardCompatTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ TEST(TransformTest, ToUnderlying) {
}

TEST(STLForwardCompatTest, IdentityCxx20) {
llvm::identity_cxx20 identity;
llvm::identity identity;

// Test with an lvalue.
int X = 42;
Expand Down