--- old/src/hotspot/share/runtime/vmStructs.cpp	2018-01-16 19:52:49.243030667 +0900
+++ new/src/hotspot/share/runtime/vmStructs.cpp	2018-01-16 19:52:49.096028128 +0900
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -127,6 +127,7 @@
 #include "gc/parallel/psVirtualspace.hpp"
 #include "gc/parallel/psYoungGen.hpp"
 #include "gc/parallel/vmStructs_parallelgc.hpp"
+#include "gc/z/vmStructs_z.hpp"
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_JVMCI
@@ -1390,6 +1391,7 @@
   declare_integer_type(intptr_t)                                          \
   declare_unsigned_integer_type(uintx)                                    \
   declare_unsigned_integer_type(uintptr_t)                                \
+  declare_unsigned_integer_type(uint8_t)                                  \
   declare_unsigned_integer_type(uint32_t)                                 \
   declare_unsigned_integer_type(uint64_t)                                 \
                                                                           \
@@ -3023,6 +3025,9 @@
 
   VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                 GENERATE_STATIC_VM_STRUCT_ENTRY)
+
+  VM_STRUCTS_Z(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+               GENERATE_STATIC_VM_STRUCT_ENTRY)
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_TRACE
@@ -3090,6 +3095,9 @@
   VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY,
               GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
               GENERATE_INTEGER_VM_TYPE_ENTRY)
+
+  VM_TYPES_Z(GENERATE_VM_TYPE_ENTRY,
+             GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_TRACE
@@ -3149,6 +3157,9 @@
 
   VM_INT_CONSTANTS_G1(GENERATE_VM_INT_CONSTANT_ENTRY,
                       GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY)
+
+  VM_INT_CONSTANTS_Z(GENERATE_VM_INT_CONSTANT_ENTRY,
+                     GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY)
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_TRACE
@@ -3206,6 +3217,11 @@
                            GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
                            GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 
+#if INCLUDE_ALL_GCS
+  VM_LONG_CONSTANTS_Z(GENERATE_VM_INT_CONSTANT_ENTRY,
+                      GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY)
+#endif // INCLUDE_ALL_GCS
+
   GENERATE_VM_LONG_CONSTANT_LAST_ENTRY()
 };
 
@@ -3240,6 +3256,9 @@
   VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                 CHECK_STATIC_VM_STRUCT_ENTRY);
 
+  VM_STRUCTS_Z(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
+               CHECK_STATIC_VM_STRUCT_ENTRY);
+
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_TRACE
@@ -3290,6 +3309,8 @@
               CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
               CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
 
+  VM_TYPES_Z(CHECK_VM_TYPE_ENTRY,
+             CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_TRACE
@@ -3364,6 +3385,8 @@
                             ENSURE_FIELD_TYPE_PRESENT));
   debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT,
                            ENSURE_FIELD_TYPE_PRESENT));
+  debug_only(VM_STRUCTS_Z(ENSURE_FIELD_TYPE_PRESENT,
+                          ENSURE_FIELD_TYPE_PRESENT));
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_TRACE