vmStruct fix

iwanowww · iwanowww · commit 9100ef190bef · 2025-05-07T14:47:50.000-07:00
diff --git a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
@@ -35,8 +35,7 @@
               static_field(VM_Version,      _rop_protection, bool)      \
               static_field(VM_Version,      _pac_mask,       uintptr_t)
 
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
-  declare_toplevel_type(VM_Version)
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
 #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
diff --git a/src/hotspot/cpu/x86/vmStructs_x86.hpp b/src/hotspot/cpu/x86/vmStructs_x86.hpp
@@ -29,15 +29,20 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)            \
-  volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
+  volatile_nonstatic_field(JavaFrameAnchor,         _last_Java_fp,                  intptr_t*)               \
+              static_field(VM_Version,              _features,                      VM_Version::VM_Features) \
+           nonstatic_field(VM_Version::VM_Features, _features_bitmap[0],            uint64_t)                \
+              static_field(VM_Version::VM_Features, _features_bitmap_size_in_bytes, int)
 
 #define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
+  declare_toplevel_type(VM_Version::VM_Features)
 
 #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant) \
-  LP64_ONLY(declare_constant(frame::arg_reg_save_area_bytes))       \
-  declare_constant(frame::interpreter_frame_sender_sp_offset)       \
-  declare_constant(frame::interpreter_frame_last_sp_offset)
+  declare_constant(frame::arg_reg_save_area_bytes)            \
+  declare_constant(frame::interpreter_frame_sender_sp_offset) \
+  declare_constant(frame::interpreter_frame_last_sp_offset)   \
+  declare_constant(frame::entry_frame_call_wrapper_offset)))
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
@@ -708,10 +708,6 @@
      static_field(Abstract_VM_Version,         _vm_security_version,                          int)                                   \
      static_field(Abstract_VM_Version,         _vm_build_number,                              int)                                   \
                                                                                                                                      \
-     NOT_ZERO(X86_ONLY(   static_field(VM_Version,              _features,                      VM_Version::VM_Features)))           \
-     NOT_ZERO(X86_ONLY(nonstatic_field(VM_Version::VM_Features, _features_bitmap[0],            uint64_t)))                          \
-     NOT_ZERO(X86_ONLY(   static_field(VM_Version::VM_Features, _features_bitmap_size_in_bytes, int)))                               \
-                                                                                                                                     \
   /*************************/                                                                                                        \
   /* JVMTI */                                                                                                                        \
   /*************************/                                                                                                        \
@@ -1168,8 +1164,7 @@
   /********************/                                                  \
                                                                           \
   declare_toplevel_type(Abstract_VM_Version)                              \
-  NOT_ZERO(declare_toplevel_type(VM_Version))                             \
-  NOT_ZERO(X86_ONLY(declare_toplevel_type(VM_Version::VM_Features)))      \
+  declare_toplevel_type(VM_Version)                                       \
                                                                           \
   /*************/                                                         \
   /* Arguments */                                                         \
@@ -1722,7 +1717,6 @@
   /**********************/                                                \
   NOT_ZERO(PPC64_ONLY(declare_constant(frame::entry_frame_locals_size)))  \
                                                                           \
-  NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset)))      \
   declare_constant(frame::pc_return_offset)                               \
                                                                           \
   /*************/                                                         \

Original file line number	Diff line number	Diff line change
`@@ -708,10 +708,6 @@`
`708`	`708`	`static_field(Abstract_VM_Version, _vm_security_version, int) \`
`709`	`709`	`static_field(Abstract_VM_Version, _vm_build_number, int) \`
`710`	`710`	`\`
`711`		`- NOT_ZERO(X86_ONLY( static_field(VM_Version, _features, VM_Version::VM_Features))) \`
`712`		`- NOT_ZERO(X86_ONLY(nonstatic_field(VM_Version::VM_Features, _features_bitmap[0], uint64_t))) \`
`713`		`- NOT_ZERO(X86_ONLY( static_field(VM_Version::VM_Features, _features_bitmap_size_in_bytes, int))) \`
`714`		`- \`
`715`	`711`	`/*************************/ \`
`716`	`712`	`/* JVMTI */ \`
`717`	`713`	`/*************************/ \`
`@@ -1168,8 +1164,7 @@`
`1168`	`1164`	`/********************/ \`
`1169`	`1165`	`\`
`1170`	`1166`	`declare_toplevel_type(Abstract_VM_Version) \`
`1171`		`- NOT_ZERO(declare_toplevel_type(VM_Version)) \`
`1172`		`- NOT_ZERO(X86_ONLY(declare_toplevel_type(VM_Version::VM_Features))) \`
	`1167`	`+ declare_toplevel_type(VM_Version) \`
`1173`	`1168`	`\`
`1174`	`1169`	`/*************/ \`
`1175`	`1170`	`/* Arguments */ \`
`@@ -1722,7 +1717,6 @@`
`1722`	`1717`	`/**********************/ \`
`1723`	`1718`	`NOT_ZERO(PPC64_ONLY(declare_constant(frame::entry_frame_locals_size))) \`
`1724`	`1719`	`\`
`1725`		`- NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset))) \`
`1726`	`1720`	`declare_constant(frame::pc_return_offset) \`
`1727`	`1721`	`\`
`1728`	`1722`	`/*************/ \`