diff -r e8900e5763ff -r b0b89d83bcf5 hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp
--- a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp	Tue Dec 08 14:26:17 2015 +0000
+++ b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp	Mon Dec 14 17:02:02 2015 -1000
@@ -25,113 +25,36 @@
 #ifndef SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
 #define SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
 
-#include "compiler/abstractCompiler.hpp"
-#include "jvmci/jvmciCodeInstaller.hpp"
-#include "jvmci/jvmciCompilerToVM.hpp"
-#include "jvmci/jvmciEnv.hpp"
-#include "jvmci/jvmciRuntime.hpp"
+#include "runtime/vmStructs.hpp"
 
-#define VM_STRUCTS_JVMCI(nonstatic_field, static_field)                               \
-  nonstatic_field(JavaThread,    _pending_deoptimization,               int)          \
-  nonstatic_field(JavaThread,    _pending_failed_speculation,           oop)          \
-  nonstatic_field(JavaThread,    _pending_transfer_to_interpreter,      bool)         \
-  nonstatic_field(JavaThread,    _jvmci_counters,                       jlong*)       \
-  nonstatic_field(MethodData,    _jvmci_ir_size,                        int)          \
-  nonstatic_field(JVMCIEnv,      _task,                                 CompileTask*) \
-  nonstatic_field(JVMCIEnv,      _jvmti_can_hotswap_or_post_breakpoint, bool)         \
-  nonstatic_field(DeoptimizationBlob, _uncommon_trap_offset,            int)          \
-  \
-  static_field(CompilerToVM, _supports_inline_contig_alloc, bool) \
-  static_field(CompilerToVM, _heap_end_addr, HeapWord**) \
-  static_field(CompilerToVM, _heap_top_addr, HeapWord**)
+class JVMCIVMStructs {
+public:
+  /**
+   * The last entry has a NULL fieldName.
+   */
+  static VMStructEntry localHotSpotVMStructs[];
 
-#define VM_TYPES_JVMCI(declare_type, declare_toplevel_type)                   \
-  declare_toplevel_type(CompilerToVM)                                         \
-  declare_toplevel_type(JVMCIEnv)                                             \
+  /**
+   * The last entry has a NULL typeName.
+   */
+  static VMTypeEntry localHotSpotVMTypes[];
 
-#define VM_INT_CONSTANTS_JVMCI(declare_constant, declare_preprocessor_constant)                   \
-  declare_constant(Deoptimization::Reason_unreached0)                                             \
-  declare_constant(Deoptimization::Reason_type_checked_inlining)                                  \
-  declare_constant(Deoptimization::Reason_optimized_type_check)                                   \
-  declare_constant(Deoptimization::Reason_aliasing)                                               \
-  declare_constant(Deoptimization::Reason_transfer_to_interpreter)                                \
-  declare_constant(Deoptimization::Reason_not_compiled_exception_handler)                         \
-  declare_constant(Deoptimization::Reason_unresolved)                                             \
-  declare_constant(Deoptimization::Reason_jsr_mismatch)                                           \
-  declare_constant(JVMCIEnv::ok)                                                                  \
-  declare_constant(JVMCIEnv::dependencies_failed)                                                 \
-  declare_constant(JVMCIEnv::dependencies_invalid)                                                \
-  declare_constant(JVMCIEnv::cache_full)                                                          \
-  declare_constant(JVMCIEnv::code_too_large)                                                      \
-                                                                                                  \
-  declare_preprocessor_constant("JVM_ACC_SYNTHETIC", JVM_ACC_SYNTHETIC)                           \
-  declare_preprocessor_constant("JVM_RECOGNIZED_FIELD_MODIFIERS", JVM_RECOGNIZED_FIELD_MODIFIERS) \
-                                                                                                  \
-  declare_constant(CompilerToVM::KLASS_TAG)                                                       \
-  declare_constant(CompilerToVM::SYMBOL_TAG)                                                      \
-                                                                                                  \
-  declare_constant(BitData::exception_seen_flag)                                                  \
-  declare_constant(BitData::null_seen_flag)                                                       \
-  declare_constant(CounterData::count_off)                                                        \
-  declare_constant(JumpData::taken_off_set)                                                       \
-  declare_constant(JumpData::displacement_off_set)                                                \
-  declare_constant(ReceiverTypeData::nonprofiled_count_off_set)                                   \
-  declare_constant(ReceiverTypeData::receiver_type_row_cell_count)                                \
-  declare_constant(ReceiverTypeData::receiver0_offset)                                            \
-  declare_constant(ReceiverTypeData::count0_offset)                                               \
-  declare_constant(BranchData::not_taken_off_set)                                                 \
-  declare_constant(ArrayData::array_len_off_set)                                                  \
-  declare_constant(ArrayData::array_start_off_set)                                                \
-  declare_constant(MultiBranchData::per_case_cell_count)                                          \
-                                                                                                  \
-  declare_constant(CodeInstaller::VERIFIED_ENTRY)                                                 \
-  declare_constant(CodeInstaller::UNVERIFIED_ENTRY)                                               \
-  declare_constant(CodeInstaller::OSR_ENTRY)                                                      \
-  declare_constant(CodeInstaller::EXCEPTION_HANDLER_ENTRY)                                        \
-  declare_constant(CodeInstaller::DEOPT_HANDLER_ENTRY)                                            \
-  declare_constant(CodeInstaller::INVOKEINTERFACE)                                                \
-  declare_constant(CodeInstaller::INVOKEVIRTUAL)                                                  \
-  declare_constant(CodeInstaller::INVOKESTATIC)                                                   \
-  declare_constant(CodeInstaller::INVOKESPECIAL)                                                  \
-  declare_constant(CodeInstaller::INLINE_INVOKE)                                                  \
-  declare_constant(CodeInstaller::POLL_NEAR)                                                      \
-  declare_constant(CodeInstaller::POLL_RETURN_NEAR)                                               \
-  declare_constant(CodeInstaller::POLL_FAR)                                                       \
-  declare_constant(CodeInstaller::POLL_RETURN_FAR)                                                \
-  declare_constant(CodeInstaller::CARD_TABLE_SHIFT)                                               \
-  declare_constant(CodeInstaller::CARD_TABLE_ADDRESS)                                             \
-  declare_constant(CodeInstaller::HEAP_TOP_ADDRESS)                                               \
-  declare_constant(CodeInstaller::HEAP_END_ADDRESS)                                               \
-  declare_constant(CodeInstaller::NARROW_KLASS_BASE_ADDRESS)                                      \
-  declare_constant(CodeInstaller::CRC_TABLE_ADDRESS)                                              \
-  declare_constant(CodeInstaller::INVOKE_INVALID)                                                 \
-                                                                                                  \
-  declare_constant(Method::invalid_vtable_index)                                                  \
+  /**
+   * Table of integer constants.
+   * The last entry has a NULL typeName.
+   */
+  static VMIntConstantEntry localHotSpotVMIntConstants[];
 
-#define VM_ADDRESSES_JVMCI(declare_address, declare_preprocessor_address, declare_function)      \
-  declare_function(JVMCIRuntime::new_instance) \
-  declare_function(JVMCIRuntime::new_array) \
-  declare_function(JVMCIRuntime::new_multi_array) \
-  declare_function(JVMCIRuntime::dynamic_new_array) \
-  declare_function(JVMCIRuntime::dynamic_new_instance) \
-  \
-  declare_function(JVMCIRuntime::thread_is_interrupted) \
-  declare_function(JVMCIRuntime::vm_message) \
-  declare_function(JVMCIRuntime::identity_hash_code) \
-  declare_function(JVMCIRuntime::exception_handler_for_pc) \
-  declare_function(JVMCIRuntime::monitorenter) \
-  declare_function(JVMCIRuntime::monitorexit) \
-  declare_function(JVMCIRuntime::create_null_exception) \
-  declare_function(JVMCIRuntime::create_out_of_bounds_exception) \
-  declare_function(JVMCIRuntime::log_primitive) \
-  declare_function(JVMCIRuntime::log_object) \
-  declare_function(JVMCIRuntime::log_printf) \
-  declare_function(JVMCIRuntime::vm_error) \
-  declare_function(JVMCIRuntime::load_and_clear_exception) \
-  declare_function(JVMCIRuntime::write_barrier_pre) \
-  declare_function(JVMCIRuntime::write_barrier_post) \
-  declare_function(JVMCIRuntime::validate_object) \
-  \
-  declare_function(JVMCIRuntime::test_deoptimize_call_int)
+  /**
+   * Table of long constants.
+   * The last entry has a NULL typeName.
+   */
+  static VMLongConstantEntry localHotSpotVMLongConstants[];
+
+  /**
+   * Table of addresses.
+   */
+  static VMAddressEntry localHotSpotVMAddresses[];
+};
 
 #endif // SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP