diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h index 380f05f1e2962c456ed440db42a9bf45791e8ff8..df92598f51a17054a92f61debbfcdb2fd45e2ccd 100644 --- a/libstdc++-v3/include/bits/ranges_algo.h +++ b/libstdc++-v3/include/bits/ranges_algo.h @@ -2988,9 +2988,13 @@ namespace ranges std::__invoke(__proj, __hi), std::__invoke(__proj, __lo)))); auto&& __proj_val = std::__invoke(__proj, __val); - if (std::__invoke(__comp, __proj_val, std::__invoke(__proj, __lo))) + if (std::__invoke(__comp, + std::forward<decltype(__proj_val)>(__proj_val), + std::__invoke(__proj, __lo))) return __lo; - else if (std::__invoke(__comp, std::__invoke(__proj, __hi), __proj_val)) + else if (std::__invoke(__comp, + std::__invoke(__proj, __hi), + std::forward<decltype(__proj_val)>(__proj_val))) return __hi; else return __val; diff --git a/libstdc++-v3/testsuite/25_algorithms/clamp/118185.cc b/libstdc++-v3/testsuite/25_algorithms/clamp/118185.cc new file mode 100644 index 0000000000000000000000000000000000000000..e9cf896d35569b7dd56a862e451d3e98f8554e41 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/clamp/118185.cc @@ -0,0 +1,41 @@ +// { dg-do compile { target c++20 } } + +#include <algorithm> +#include <concepts> + +struct Comp +{ + constexpr bool operator()(const int&& x, const int&& y) { return x < y; } +}; + +struct Proj +{ + constexpr const int&& operator()(const int& x) const { return std::move(x); } +}; + +static_assert(std::indirect_strict_weak_order<Comp, std::projected<const int*, Proj>>); + +static_assert(std::ranges::clamp(+1, 0, 2, Comp{}, Proj{}) == 1); +static_assert(std::ranges::clamp(-1, 0, 2, Comp{}, Proj{}) == 0); +static_assert(std::ranges::clamp(10, 0, 2, Comp{}, Proj{}) == 2); + + +// Testcase from PR118185 + +struct Comp2 +{ + constexpr bool operator()(const int&& x, const int&& y) const { return x < y; } + constexpr bool operator()(const int&& x, int& y) const { return x < y; } + constexpr bool operator()(int& x, const int&& y) const { return x < y; } + constexpr bool operator()(int& x, int& y) const { return x < y; } + constexpr bool operator()(std::same_as<const int&> auto && x, std::same_as<const int&> auto && y) const + { + return x < y; + } +}; + +static_assert(std::indirect_strict_weak_order<Comp2, std::projected<const int*, Proj>>); + +static_assert(std::ranges::clamp(+1, 0, 2, Comp2{}, Proj{}) == 1); +static_assert(std::ranges::clamp(-1, 0, 2, Comp2{}, Proj{}) == 0); +static_assert(std::ranges::clamp(10, 0, 2, Comp2{}, Proj{}) == 2);