8348169: Destruct values on free in Treap

Reviewed-by: cnorrbin, gziemski

Author: jdksjolen

src/hotspot/share/nmt/nmtTreap.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/powerOfTwo.hpp"
+#include <type_traits>
 
 // A Treap is a self-balanced binary tree where each node is equipped with a
 // priority. It adds the invariant that the priority of a parent P is strictly larger
@@ -228,7 +229,9 @@ class Treap {
   : _allocator(),
     _root(nullptr),
     _prng_seed(_initial_seed),
-    _node_count(0) {}
+    _node_count(0) {
+    static_assert(std::is_trivially_destructible<K>::value, "must be");
+  }
 
   ~Treap() {
     this->remove_all();
@@ -266,6 +269,7 @@ class Treap {
     if (second_split.right != nullptr) {
       // The key k existed, we delete it.
       _node_count--;
+      second_split.right->_value.~V();
       _allocator.free(second_split.right);
     }
     // Merge together everything
@@ -283,6 +287,7 @@ class Treap {
       if (head == nullptr) continue;
       to_delete.push(head->_left);
       to_delete.push(head->_right);
+      head->_value.~V();
       _allocator.free(head);
     }
     _root = nullptr;

test/hotspot/gtest/nmt/test_nmt_treap.cpp

@@ -325,5 +325,28 @@ TEST_VM_F(NMTTreapTest, VerifyItThroughStressTest) {
     verify_it(treap);
   }
 }
+struct NTD {
+  static bool has_run_destructor;
+  ~NTD() {
+    has_run_destructor = true;
+  }
+};
+
+bool NTD::has_run_destructor = false;
+
+TEST_VM_F(NMTTreapTest, ValueDestructorsAreRun) {
+  TreapCHeap<int, NTD, Cmp> treap;
+  NTD ntd;
+  treap.upsert(0, ntd);
+  treap.remove(0);
+  EXPECT_TRUE(NTD::has_run_destructor);
+  NTD::has_run_destructor = false;
+  {
+    TreapCHeap<int, NTD, Cmp> treap;
+    NTD ntd;
+    treap.upsert(0, ntd);
+  }
+  EXPECT_TRUE(NTD::has_run_destructor);
+}
 
 #endif // ASSERT