--- /dev/null	2018-04-03 12:55:20.301839954 +0200
+++ new/src/hotspot/share/gc/z/zNMethodTable.hpp	2018-06-06 00:42:06.298238374 +0200
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 2018, 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_ZNMETHODTABLE_HPP
+#define SHARE_GC_Z_ZNMETHODTABLE_HPP
+
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zNMethodTableEntry.hpp"
+#include "memory/allocation.hpp"
+
+class ZNMethodTable : public AllStatic {
+private:
+  static ZNMethodTableEntry* _table;
+  static size_t              _size;
+  static size_t              _nregistered;
+  static size_t              _nunregistered;
+  static volatile size_t     _claimed ATTRIBUTE_ALIGNED(ZCacheLineSize);
+
+  static ZNMethodTableEntry create_entry(nmethod* nm);
+  static void destroy_entry(ZNMethodTableEntry entry);
+
+  static nmethod* method(ZNMethodTableEntry entry);
+
+  static size_t first_index(const nmethod* nm, size_t size);
+  static size_t next_index(size_t prev_index, size_t size);
+
+  static bool register_entry(ZNMethodTableEntry* table, size_t size, ZNMethodTableEntry entry);
+  static bool unregister_entry(ZNMethodTableEntry* table, size_t size, const nmethod* nm);
+
+  static void rebuild(size_t new_size);
+  static void rebuild_if_needed();
+
+  static void log_register(const nmethod* nm, ZNMethodTableEntry entry);
+  static void log_unregister(const nmethod* nm);
+
+  static void entry_oops_do(ZNMethodTableEntry entry, OopClosure* cl);
+
+public:
+  static size_t registered_nmethods();
+  static size_t unregistered_nmethods();
+
+  static void register_nmethod(nmethod* nm);
+  static void unregister_nmethod(nmethod* nm);
+
+  static void gc_prologue();
+  static void gc_epilogue();
+
+  static void oops_do(OopClosure* cl);
+};
+
+#endif // SHARE_GC_Z_ZNMETHODTABLE_HPP