Skip to content
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

[Diagnostics] Return rvalue reference from temporary argument #127400

Merged
merged 4 commits into from
Mar 13, 2025
+27 −58
Merged

[Diagnostics] Return rvalue reference from temporary argument #127400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b0573b
Return rvalue reference from temporary argument
hahnjo Feb 16, 2025
824936c
Remove unneeded cast
hahnjo Mar 11, 2025
0a80551
Unify duplicated template functions
hahnjo Mar 12, 2025
60c7cae
Use is_base_of_v
hahnjo Mar 12, 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
102 changes: 28 additions & 74 deletions llvm/include/llvm/IR/DiagnosticInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,93 +613,47 @@ class DiagnosticInfoOptimizationBase : public DiagnosticInfoWithLocationBase {
/// common base class. This allows returning the result of the insertion
/// directly by value, e.g. return OptimizationRemarkAnalysis(...) << "blah".
template <class RemarkT>
RemarkT &
operator<<(RemarkT &R,
std::enable_if_t<
std::is_base_of<DiagnosticInfoOptimizationBase, RemarkT>::value,
StringRef>
S) {
decltype(auto) operator<<(
RemarkT &&R,
std::enable_if_t<std::is_base_of<DiagnosticInfoOptimizationBase,
std::remove_reference_t<RemarkT>>::value,
StringRef>
S) {
R.insert(S);
return R;
return std::forward<RemarkT>(R);
}

/// Also allow r-value for the remark to allow insertion into a
/// temporarily-constructed remark.
template <class RemarkT>
RemarkT &&
operator<<(RemarkT &&R,
std::enable_if_t<
std::is_base_of<DiagnosticInfoOptimizationBase, RemarkT>::value,
StringRef>
S) {
R.insert(S);
return std::move(R);
}

template <class RemarkT>
RemarkT &
operator<<(RemarkT &R,
std::enable_if_t<
std::is_base_of<DiagnosticInfoOptimizationBase, RemarkT>::value,
DiagnosticInfoOptimizationBase::Argument>
A) {
R.insert(A);
return R;
}

template <class RemarkT>
RemarkT &&
operator<<(RemarkT &&R,
std::enable_if_t<
std::is_base_of<DiagnosticInfoOptimizationBase, RemarkT>::value,
DiagnosticInfoOptimizationBase::Argument>
A) {
decltype(auto) operator<<(
RemarkT &&R,
std::enable_if_t<std::is_base_of<DiagnosticInfoOptimizationBase,
std::remove_reference_t<RemarkT>>::value,
DiagnosticInfoOptimizationBase::Argument>
A) {
R.insert(A);
return std::move(R);
return std::forward<RemarkT>(R);
}

template <class RemarkT>
RemarkT &
operator<<(RemarkT &R,
std::enable_if_t<
std::is_base_of<DiagnosticInfoOptimizationBase, RemarkT>::value,
DiagnosticInfoOptimizationBase::setIsVerbose>
V) {
decltype(auto) operator<<(
RemarkT &&R,
std::enable_if_t<std::is_base_of<DiagnosticInfoOptimizationBase,
std::remove_reference_t<RemarkT>>::value,
DiagnosticInfoOptimizationBase::setIsVerbose>
V) {
R.insert(V);
return R;
}

template <class RemarkT>
RemarkT &&
operator<<(RemarkT &&R,
std::enable_if_t<
std::is_base_of<DiagnosticInfoOptimizationBase, RemarkT>::value,
DiagnosticInfoOptimizationBase::setIsVerbose>
V) {
R.insert(V);
return std::move(R);
}

template <class RemarkT>
RemarkT &
operator<<(RemarkT &R,
std::enable_if_t<
std::is_base_of<DiagnosticInfoOptimizationBase, RemarkT>::value,
DiagnosticInfoOptimizationBase::setExtraArgs>
EA) {
R.insert(EA);
return R;
return std::forward<RemarkT>(R);
}

template <class RemarkT>
RemarkT &&
operator<<(RemarkT &&R,
std::enable_if_t<
std::is_base_of<DiagnosticInfoOptimizationBase, RemarkT>::value,
DiagnosticInfoOptimizationBase::setExtraArgs>
EA) {
decltype(auto) operator<<(
RemarkT &&R,
std::enable_if_t<std::is_base_of<DiagnosticInfoOptimizationBase,
std::remove_reference_t<RemarkT>>::value,
DiagnosticInfoOptimizationBase::setExtraArgs>
EA) {
R.insert(EA);
return std::move(R);
return std::forward<RemarkT>(R);
}

/// Common features for diagnostics dealing with optimization remarks
Expand Down
11 changes: 3 additions & 8 deletions llvm/lib/Analysis/InlineAdvisor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,8 @@ static raw_ostream &operator<<(raw_ostream &R, const ore::NV &Arg) {
return R << Arg.Val;
}

template <class RemarkT> RemarkT &operator<<(RemarkT &R, const InlineCost &IC) {
template <class RemarkT>
decltype(auto) operator<<(RemarkT &&R, const InlineCost &IC) {
using namespace ore;
if (IC.isAlways()) {
R << "(cost=always)";
Expand All @@ -349,13 +350,7 @@ template <class RemarkT> RemarkT &operator<<(RemarkT &R, const InlineCost &IC) {
}
if (const char *Reason = IC.getReason())
R << ": " << ore::NV("Reason", Reason);
return R;
}

template <class RemarkT>
RemarkT &&operator<<(RemarkT &&R, const InlineCost &IC) {
static_cast<RemarkT &>(R) << IC;
return std::move(R);
return std::forward<RemarkT>(R);
}
} // namespace llvm

Expand Down
Loading