Skip to content

[ADT] Make non-const functions forward to const versions (NFC) #161323

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
Sep 30, 2025
+6 −15
Merged

[ADT] Make non-const functions forward to const versions (NFC) #161323

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
21 changes: 6 additions & 15 deletions llvm/include/llvm/Support/TrailingObjects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,8 @@ class TrailingObjects
/// (which must be one of those specified in the class template). The
/// array may have zero or more elements in it.
template <typename T> T *getTrailingObjects() {
verifyTrailingObjectsAssertions<true>();
// Forwards to an impl function with overloads, since member
// function templates can't be specialized.
return this->getTrailingObjectsImpl(
static_cast<BaseTy *>(this), TrailingObjectsBase::OverloadToken<T>());
return const_cast<T *>(
static_cast<const TrailingObjects *>(this)->getTrailingObjects<T>());
}

// getTrailingObjects() specialization for a single trailing type.
Expand All @@ -306,13 +303,8 @@ class TrailingObjects
}

FirstTrailingType *getTrailingObjects() {
static_assert(sizeof...(TrailingTys) == 1,
"Can use non-templated getTrailingObjects() only when there "
"is a single trailing type");
verifyTrailingObjectsAssertions<false>();
return this->getTrailingObjectsImpl(
static_cast<BaseTy *>(this),
TrailingObjectsBase::OverloadToken<FirstTrailingType>());
return const_cast<FirstTrailingType *>(
static_cast<const TrailingObjects *>(this)->getTrailingObjects());
}

// Functions that return the trailing objects as ArrayRefs.
Expand Down Expand Up @@ -342,9 +334,8 @@ class TrailingObjects
}

template <typename T> T *getTrailingObjectsNonStrict() {
verifyTrailingObjectsAssertions<false>();
return this->getTrailingObjectsImpl(
static_cast<BaseTy *>(this), TrailingObjectsBase::OverloadToken<T>());
return const_cast<T *>(static_cast<const TrailingObjects *>(this)
->getTrailingObjectsNonStrict<T>());
}

template <typename T>
Expand Down