--- a/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp	Mon Oct 21 09:58:07 2019 +0200
+++ b/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp	Mon Oct 21 09:58:32 2019 +0200
@@ -22,7 +22,7 @@
  */
 
 #include "gc/z/zErrno.hpp"
-#include "gc/z/zCPU.hpp"
+#include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zNUMA.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"

--- a/src/hotspot/share/gc/z/zCPU.cpp	Mon Oct 21 09:58:07 2019 +0200
+++ b/src/hotspot/share/gc/z/zCPU.cpp	Mon Oct 21 09:58:32 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,15 +22,15 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/z/zCPU.hpp"
+#include "gc/z/zCPU.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/padded.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/debug.hpp"
 
-#define ZCPU_UNKNOWN_AFFINITY (Thread*)-1;
-#define ZCPU_UNKNOWN_SELF     (Thread*)-2;
+#define ZCPU_UNKNOWN_AFFINITY ((Thread*)-1)
+#define ZCPU_UNKNOWN_SELF     ((Thread*)-2)
 
 PaddedEnd<ZCPU::ZCPUAffinity>* ZCPU::_affinity = NULL;
 THREAD_LOCAL Thread*           ZCPU::_self     = ZCPU_UNKNOWN_SELF;
@@ -51,20 +51,13 @@
                      os::initial_active_processor_count());
 }
 
-uint32_t ZCPU::count() {
-  return os::processor_count();
-}
-
-uint32_t ZCPU::id() {
-  assert(_affinity != NULL, "Not initialized");
-
-  // Fast path
-  if (_affinity[_cpu]._thread == _self) {
-    return _cpu;
+uint32_t ZCPU::id_slow() {
+  // Set current thread
+  if (_self == ZCPU_UNKNOWN_SELF) {
+    _self = Thread::current();
   }
 
-  // Slow path
-  _self = Thread::current();
+  // Set current CPU
   _cpu = os::processor_id();
 
   // Update affinity table

--- a/src/hotspot/share/gc/z/zCPU.hpp	Mon Oct 21 09:58:07 2019 +0200
+++ b/src/hotspot/share/gc/z/zCPU.hpp	Mon Oct 21 09:58:32 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
@@ -40,6 +40,8 @@
   static THREAD_LOCAL Thread*     _self;
   static THREAD_LOCAL uint32_t    _cpu;
 
+  static uint32_t id_slow();
+
 public:
   static void initialize();
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/z/zCPU.inline.hpp	Mon Oct 21 09:58:32 2019 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 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_ZCPU_INLINE_HPP
+#define SHARE_GC_Z_ZCPU_INLINE_HPP
+
+#include "gc/z/zCPU.hpp"
+#include "runtime/os.hpp"
+#include "utilities/debug.hpp"
+
+inline uint32_t ZCPU::count() {
+  return os::processor_count();
+}
+
+inline uint32_t ZCPU::id() {
+  assert(_affinity != NULL, "Not initialized");
+
+  // Fast path
+  if (_affinity[_cpu]._thread == _self) {
+    return _cpu;
+  }
+
+  // Slow path
+  return id_slow();
+}
+
+#endif // SHARE_GC_Z_ZCPU_INLINE_HPP

--- a/src/hotspot/share/gc/z/zStat.cpp	Mon Oct 21 09:58:07 2019 +0200
+++ b/src/hotspot/share/gc/z/zStat.cpp	Mon Oct 21 09:58:32 2019 +0200
@@ -23,7 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/z/zCollectedHeap.hpp"
-#include "gc/z/zCPU.hpp"
+#include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zHeap.inline.hpp"
 #include "gc/z/zLargePages.inline.hpp"

--- a/src/hotspot/share/gc/z/zValue.inline.hpp	Mon Oct 21 09:58:07 2019 +0200
+++ b/src/hotspot/share/gc/z/zValue.inline.hpp	Mon Oct 21 09:58:32 2019 +0200
@@ -24,7 +24,7 @@
 #ifndef SHARE_GC_Z_ZVALUE_INLINE_HPP
 #define SHARE_GC_Z_ZVALUE_INLINE_HPP
 
-#include "gc/z/zCPU.hpp"
+#include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zNUMA.hpp"
 #include "gc/z/zThread.inline.hpp"