--- /dev/null	2020-01-17 11:46:19.065201212 +0100
+++ new/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp	2020-01-17 17:10:55.209127994 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
+#define SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
+
+#include "gc/shenandoah/shenandoahHeap.hpp"
+#include "gc/shenandoah/shenandoahHeapRegion.hpp"
+#include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
+
+#define VM_STRUCTS_SHENANDOAH(nonstatic_field, volatile_nonstatic_field, static_field)  \
+  static_field(ShenandoahHeapRegion, RegionSizeBytes,        size_t)                    \
+  nonstatic_field(ShenandoahHeap, _num_regions,              size_t)                    \
+  volatile_nonstatic_field(ShenandoahHeap, _used,            size_t)                    \
+  volatile_nonstatic_field(ShenandoahHeap, _committed,       size_t)                    \
+
+#define VM_INT_CONSTANTS_SHENANDOAH(declare_constant, declare_constant_with_value)
+
+#define VM_TYPES_SHENANDOAH(declare_type,                                     \
+                            declare_toplevel_type,                            \
+                            declare_integer_type)                             \
+  declare_type(ShenandoahHeap, CollectedHeap)                                 \
+  declare_type(ShenandoahHeapRegion, ContiguousSpace)                         \
+  declare_toplevel_type(ShenandoahHeap*)                                      \
+  declare_toplevel_type(ShenandoahHeapRegion*)                                \
+
+#endif // SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP