From 945aaf893219f9ead94fd8aae4994f7b520f64bf Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Thu, 4 Sep 2025 19:00:39 +0000
Subject: [PATCH] 8366897: RBTreeTest.IntrusiveCustomVerifyTest and
 RBTreeTest.CustomVerify tests fail on non-debug builds

Reviewed-by: ayang
---
 src/hotspot/share/utilities/rbTree.inline.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/utilities/rbTree.inline.hpp b/src/hotspot/share/utilities/rbTree.inline.hpp
index 16150e41be8..f28923eb867 100644
--- a/src/hotspot/share/utilities/rbTree.inline.hpp
+++ b/src/hotspot/share/utilities/rbTree.inline.hpp
@@ -127,7 +127,8 @@ template <typename NodeType, typename NODE_VERIFIER, typename USER_VERIFIER>
 inline void IntrusiveRBNode::verify(
     size_t& num_nodes, size_t& black_nodes_until_leaf, size_t& shortest_leaf_path, size_t& longest_leaf_path,
     size_t& tree_depth, bool expect_visited, NODE_VERIFIER verifier, const USER_VERIFIER& extra_verifier) const {
-  assert(extra_verifier(static_cast<const NodeType*>(this)), "user provided verifier failed");
+  bool extra_verifier_result = extra_verifier(static_cast<const NodeType*>(this));
+  assert(extra_verifier_result, "user provided verifier failed");
   assert(expect_visited != _visited, "node already visited");
   DEBUG_ONLY(_visited = !_visited);