src/hotspot/share/runtime/thread.cpp

@@ -1992,11 +1992,11 @@
 
   if (JvmtiEnv::environments_might_exist()) {
     JvmtiExport::cleanup_thread(this);
   }
 
-  BarrierSet::barrier_set()->on_thread_destroy(this);
+  BarrierSet::barrier_set()->on_thread_detach(this);
 
   log_info(os, thread)("JavaThread %s (tid: " UINTX_FORMAT ").",
     exit_type == JavaThread::normal_exit ? "exiting" : "detaching",
     os::current_thread_id());
 

@@ -2041,11 +2041,11 @@
 
   if (UseTLAB) {
     tlab().make_parsable(true);  // retire TLAB, if any
   }
 
-  BarrierSet::barrier_set()->on_thread_destroy(this);
+  BarrierSet::barrier_set()->on_thread_detach(this);
 
   Threads::remove(this);
   this->smr_delete();
 }
 

@@ -4300,11 +4300,11 @@
 
 void Threads::add(JavaThread* p, bool force_daemon) {
   // The threads lock must be owned at this point
   assert_locked_or_safepoint(Threads_lock);
 
-  BarrierSet::barrier_set()->on_thread_create(p);
+  BarrierSet::barrier_set()->on_thread_attach(p);
 
   p->set_next(_thread_list);
   _thread_list = p;
 
   // Once a JavaThread is added to the Threads list, smr_delete() has