--- old/src/hotspot/share/gc/g1/g1BarrierSet.hpp	2019-02-25 16:56:50.438651243 -0500
+++ new/src/hotspot/share/gc/g1/g1BarrierSet.hpp	2019-02-25 16:56:50.054630996 -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();