--- a/src/hotspot/share/runtime/vmStructs.cpp Mon Apr 23 11:37:46 2018 -0700
+++ b/src/hotspot/share/runtime/vmStructs.cpp Mon Apr 23 14:51:16 2018 -0500
@@ -82,7 +82,6 @@
#include "prims/jvmtiAgentThread.hpp"
#include "runtime/arguments.hpp"
#include "runtime/deoptimization.hpp"
-#include "runtime/flags/jvmFlag.hpp"
#include "runtime/globals.hpp"
#include "runtime/java.hpp"
#include "runtime/javaCalls.hpp"
@@ -718,7 +717,7 @@
nonstatic_field(nmethod, _osr_link, nmethod*) \
nonstatic_field(nmethod, _scavenge_root_link, nmethod*) \
nonstatic_field(nmethod, _scavenge_root_state, jbyte) \
- nonstatic_field(nmethod, _state, volatile signed char) \
+ nonstatic_field(nmethod, _state, volatile signed char) \
nonstatic_field(nmethod, _exception_offset, int) \
nonstatic_field(nmethod, _orig_pc_offset, int) \
nonstatic_field(nmethod, _stub_offset, int) \
@@ -1060,12 +1059,12 @@
/* -XX flags */ \
/*********************/ \
\
- nonstatic_field(JVMFlag, _type, const char*) \
- nonstatic_field(JVMFlag, _name, const char*) \
- unchecked_nonstatic_field(JVMFlag, _addr, sizeof(void*)) /* NOTE: no type */ \
- nonstatic_field(JVMFlag, _flags, JVMFlag::Flags) \
- static_field(JVMFlag, flags, JVMFlag*) \
- static_field(JVMFlag, numFlags, size_t) \
+ nonstatic_field(Flag, _type, const char*) \
+ nonstatic_field(Flag, _name, const char*) \
+ unchecked_nonstatic_field(Flag, _addr, sizeof(void*)) /* NOTE: no type */ \
+ nonstatic_field(Flag, _flags, Flag::Flags) \
+ static_field(Flag, flags, Flag*) \
+ static_field(Flag, numFlags, size_t) \
\
/*************************/ \
/* JDK / VM version info */ \
@@ -1432,18 +1431,18 @@
declare_toplevel_type(SharedRuntime) \
\
declare_toplevel_type(CodeBlob) \
- declare_type(RuntimeBlob, CodeBlob) \
- declare_type(BufferBlob, RuntimeBlob) \
+ declare_type(RuntimeBlob, CodeBlob) \
+ declare_type(BufferBlob, RuntimeBlob) \
declare_type(AdapterBlob, BufferBlob) \
declare_type(MethodHandlesAdapterBlob, BufferBlob) \
declare_type(CompiledMethod, CodeBlob) \
declare_type(nmethod, CompiledMethod) \
- declare_type(RuntimeStub, RuntimeBlob) \
- declare_type(SingletonBlob, RuntimeBlob) \
+ declare_type(RuntimeStub, RuntimeBlob) \
+ declare_type(SingletonBlob, RuntimeBlob) \
declare_type(SafepointBlob, SingletonBlob) \
declare_type(DeoptimizationBlob, SingletonBlob) \
declare_c2_type(ExceptionBlob, SingletonBlob) \
- declare_c2_type(UncommonTrapBlob, RuntimeBlob) \
+ declare_c2_type(UncommonTrapBlob, RuntimeBlob) \
\
/***************************************/ \
/* PcDesc and other compiled code info */ \
@@ -1897,8 +1896,8 @@
/* -XX flags */ \
/********************/ \
\
- declare_toplevel_type(JVMFlag) \
- declare_toplevel_type(JVMFlag*) \
+ declare_toplevel_type(Flag) \
+ declare_toplevel_type(Flag*) \
\
/********************/ \
/* JVMTI */ \
@@ -1938,7 +1937,7 @@
declare_integer_type(ThreadState) \
declare_integer_type(Location::Type) \
declare_integer_type(Location::Where) \
- declare_integer_type(JVMFlag::Flags) \
+ declare_integer_type(Flag::Flags) \
COMPILER2_PRESENT(declare_integer_type(OptoReg::Name)) \
\
declare_toplevel_type(CHeapObj<mtInternal>) \