RFR: 8367536: Change RBTree to use C++17 features [v4]

Johan Sjölen jsjolen at openjdk.org
Thu Sep 18 18:02:03 UTC 2025


On Thu, 18 Sep 2025 13:35:31 GMT, Casper Norrbin <cnorrbin at openjdk.org> wrote:

>> Hi everyone,
>> 
>> C++17 lets us tidy up som of the ugly templating done in the red-black tree. We can replace the `std::false_type`/`std::true_type` tricks used to discover comparator and verifier signatures with the new `std::is_invocable(_r_v)`, and most of the overload/SFINAE noise can disappear thanks to `if constexpr`.
>> 
>> We can now write one-liners such as:
>> ```c++
>> static constexpr bool HasKeyComparator = std::is_invocable_r_v<RBTreeOrdering, decltype(&CMP::cmp), K, K>;
>> 
>> 
>> and then select the right branch with
>> ```c++
>> if constexpr (HasKeyComparator<CMP>) { }
>> 
>> inside a single function instead of having several `ENABLE_IF` overloads.
>> 
>> This results in fewer lines, clearer intent, and more readable errors, while keeping behaviour identical.
>> 
>> Testing:
>> - Oracle tiers 1-3
>
> Casper Norrbin has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Added clarifying note + change name to 'HasNodeVerifierImpl'

src/hotspot/share/utilities/rbTree.hpp line 205:

> 203:       std::is_invocable_r_v<RBTreeOrdering, decltype(&COMPARATOR::cmp), K, const NodeType*>;
> 204: 
> 205:   // Due to a bug in older GCC versions with static templeted constexpr data members (see GCC PR 71954),

templeted -> templated

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/27260#discussion_r2360546002


More information about the hotspot-dev mailing list