--- old/src/hotspot/share/gc/z/zBarrierSet.cpp	2019-02-25 16:57:11.447758909 -0500
+++ new/src/hotspot/share/gc/z/zBarrierSet.cpp	2019-02-25 16:57:11.059738451 -0500
@@ -86,12 +86,12 @@
   ZThreadLocalData::destroy(thread);
 }
 
-void ZBarrierSet::on_thread_attach(JavaThread* thread) {
+void ZBarrierSet::on_thread_attach(Thread* thread) {
   // Set thread local address bad mask
   ZThreadLocalData::set_address_bad_mask(thread, ZAddressBadMask);
 }
 
-void ZBarrierSet::on_thread_detach(JavaThread* thread) {
+void ZBarrierSet::on_thread_detach(Thread* thread) {
   // Flush and free any remaining mark stacks
   ZHeap::heap()->mark_flush_and_free(thread);
 }