--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp	Tue Mar 05 14:07:30 2019 -0800
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp	Tue Mar 05 19:54:33 2019 -0500
@@ -77,8 +77,8 @@
 
   virtual void on_thread_create(Thread* thread);
   virtual void on_thread_destroy(Thread* thread);
-  virtual void on_thread_attach(JavaThread* thread);
-  virtual void on_thread_detach(JavaThread* thread);
+  virtual void on_thread_attach(Thread* thread);
+  virtual void on_thread_detach(Thread* thread);
 
   BufferNode::Allocator& satb_mark_queue_buffer_allocator();
   BufferNode::Allocator& dirty_card_queue_buffer_allocator();