--- a/src/hotspot/share/gc/z/zHeap.cpp	Mon Oct 21 09:56:43 2019 +0200
+++ b/src/hotspot/share/gc/z/zHeap.cpp	Mon Oct 21 09:56:58 2019 +0200
@@ -34,7 +34,7 @@
 #include "gc/z/zRelocationSetSelector.hpp"
 #include "gc/z/zResurrection.hpp"
 #include "gc/z/zStat.hpp"
-#include "gc/z/zThread.hpp"
+#include "gc/z/zThread.inline.hpp"
 #include "gc/z/zVerify.hpp"
 #include "gc/z/zWorkers.inline.hpp"
 #include "logging/log.hpp"

--- a/src/hotspot/share/gc/z/zLiveMap.cpp	Mon Oct 21 09:56:43 2019 +0200
+++ b/src/hotspot/share/gc/z/zLiveMap.cpp	Mon Oct 21 09:56:58 2019 +0200
@@ -25,7 +25,7 @@
 #include "gc/z/zHeap.inline.hpp"
 #include "gc/z/zLiveMap.inline.hpp"
 #include "gc/z/zStat.hpp"
-#include "gc/z/zThread.hpp"
+#include "gc/z/zThread.inline.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"

--- a/src/hotspot/share/gc/z/zMark.cpp	Mon Oct 21 09:56:43 2019 +0200
+++ b/src/hotspot/share/gc/z/zMark.cpp	Mon Oct 21 09:56:58 2019 +0200
@@ -34,7 +34,7 @@
 #include "gc/z/zRootsIterator.hpp"
 #include "gc/z/zStat.hpp"
 #include "gc/z/zTask.hpp"
-#include "gc/z/zThread.hpp"
+#include "gc/z/zThread.inline.hpp"
 #include "gc/z/zThreadLocalAllocBuffer.hpp"
 #include "gc/z/zUtils.inline.hpp"
 #include "gc/z/zWorkers.inline.hpp"

--- a/src/hotspot/share/gc/z/zObjectAllocator.cpp	Mon Oct 21 09:56:43 2019 +0200
+++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp	Mon Oct 21 09:56:58 2019 +0200
@@ -28,7 +28,7 @@
 #include "gc/z/zObjectAllocator.hpp"
 #include "gc/z/zPage.inline.hpp"
 #include "gc/z/zStat.hpp"
-#include "gc/z/zThread.hpp"
+#include "gc/z/zThread.inline.hpp"
 #include "gc/z/zUtils.inline.hpp"
 #include "gc/z/zValue.inline.hpp"
 #include "logging/log.hpp"

--- a/src/hotspot/share/gc/z/zRelocate.cpp	Mon Oct 21 09:56:43 2019 +0200
+++ b/src/hotspot/share/gc/z/zRelocate.cpp	Mon Oct 21 09:56:58 2019 +0200
@@ -33,7 +33,7 @@
 #include "gc/z/zRootsIterator.hpp"
 #include "gc/z/zStat.hpp"
 #include "gc/z/zTask.hpp"
-#include "gc/z/zThread.hpp"
+#include "gc/z/zThread.inline.hpp"
 #include "gc/z/zThreadLocalAllocBuffer.hpp"
 #include "gc/z/zWorkers.hpp"
 #include "logging/log.hpp"

--- a/src/hotspot/share/gc/z/zThread.cpp	Mon Oct 21 09:56:43 2019 +0200
+++ b/src/hotspot/share/gc/z/zThread.cpp	Mon Oct 21 09:56:58 2019 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -22,7 +22,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/z/zThread.hpp"
+#include "gc/z/zThread.inline.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/debug.hpp"
 

--- a/src/hotspot/share/gc/z/zThread.hpp	Mon Oct 21 09:56:43 2019 +0200
+++ b/src/hotspot/share/gc/z/zThread.hpp	Mon Oct 21 09:56:58 2019 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -26,7 +26,6 @@
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/debug.hpp"
 
 class ZThread : public AllStatic {
   friend class ZTask;
@@ -43,12 +42,7 @@
   static THREAD_LOCAL uint      _worker_id;
 
   static void initialize();
-
-  static void ensure_initialized() {
-    if (!_initialized) {
-      initialize();
-    }
-  }
+  static void ensure_initialized();
 
   static void set_worker();
   static void set_runtime_worker();
@@ -59,36 +53,12 @@
 
 public:
   static const char* name();
-
-  static uintptr_t id() {
-    ensure_initialized();
-    return _id;
-  }
-
-  static bool is_vm() {
-    ensure_initialized();
-    return _is_vm;
-  }
-
-  static bool is_java() {
-    ensure_initialized();
-    return _is_java;
-  }
-
-  static bool is_worker() {
-    ensure_initialized();
-    return _is_worker;
-  }
-
-  static bool is_runtime_worker() {
-    ensure_initialized();
-    return _is_runtime_worker;
-  }
-
-  static uint worker_id() {
-    assert(has_worker_id(), "Worker id not initialized");
-    return _worker_id;
-  }
+  static uintptr_t id();
+  static bool is_vm();
+  static bool is_java();
+  static bool is_worker();
+  static bool is_runtime_worker();
+  static uint worker_id();
 };
 
 #endif // SHARE_GC_Z_ZTHREAD_HPP

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/z/zThread.inline.hpp	Mon Oct 21 09:56:58 2019 +0200
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015, 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#ifndef SHARE_GC_Z_ZTHREAD_INLINE_HPP
+#define SHARE_GC_Z_ZTHREAD_INLINE_HPP
+
+#include "gc/z/zThread.hpp"
+#include "utilities/debug.hpp"
+
+inline void ZThread::ensure_initialized() {
+  if (!_initialized) {
+    initialize();
+  }
+}
+
+inline uintptr_t ZThread::id() {
+  ensure_initialized();
+  return _id;
+}
+
+inline bool ZThread::is_vm() {
+  ensure_initialized();
+  return _is_vm;
+}
+
+inline bool ZThread::is_java() {
+  ensure_initialized();
+  return _is_java;
+}
+
+inline bool ZThread::is_worker() {
+  ensure_initialized();
+  return _is_worker;
+}
+
+inline bool ZThread::is_runtime_worker() {
+  ensure_initialized();
+  return _is_runtime_worker;
+}
+
+inline uint ZThread::worker_id() {
+  assert(has_worker_id(), "Worker id not initialized");
+  return _worker_id;
+}
+
+#endif // SHARE_GC_Z_ZTHREAD_INLINE_HPP

--- a/src/hotspot/share/gc/z/zValue.inline.hpp	Mon Oct 21 09:56:43 2019 +0200
+++ b/src/hotspot/share/gc/z/zValue.inline.hpp	Mon Oct 21 09:56:58 2019 +0200
@@ -27,7 +27,7 @@
 #include "gc/z/zCPU.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zNUMA.hpp"
-#include "gc/z/zThread.hpp"
+#include "gc/z/zThread.inline.hpp"
 #include "gc/z/zUtils.hpp"
 #include "gc/z/zValue.hpp"
 #include "runtime/globals.hpp"