archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8005592: ClassLoaderDataGraph::_unloading incorrectly defined as nonstatic in vmStructs

Browse source 
Added assertion to catch problem earlier and removed the unused field

Reviewed-by: dholmes, acorn
This commit is contained in:
Mikael Vidstedt 2013-01-14 11:00:56 -08:00
parent 6972d9ff95
commit b4546eb428
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/runtime/vmStructs.cpp
View file

@ -717,7 +717,6 @@ typedef BinaryTreeDictionary<Metablock, FreeList> MetablockTreeDictionary;
nonstatic_field(ClassLoaderData, _next, ClassLoaderData*) \ nonstatic_field(ClassLoaderData, _next, ClassLoaderData*) \
\ \
static_field(ClassLoaderDataGraph, _head, ClassLoaderData*) \ static_field(ClassLoaderDataGraph, _head, ClassLoaderData*) \
nonstatic_field(ClassLoaderDataGraph, _unloading, ClassLoaderData*) \
\ \
/*******************/ \ /*******************/ \
/* GrowableArrays */ \ /* GrowableArrays */ \
@ -2575,7 +2574,8 @@ typedef BinaryTreeDictionary<Metablock, FreeList> MetablockTreeDictionary;
// This macro checks the type of a VMStructEntry by comparing pointer types // This macro checks the type of a VMStructEntry by comparing pointer types
#define CHECK_NONSTATIC_VM_STRUCT_ENTRY(typeName, fieldName, type) \ #define CHECK_NONSTATIC_VM_STRUCT_ENTRY(typeName, fieldName, type) \
{typeName *dummyObj = NULL; type* dummy = &dummyObj->fieldName; } {typeName *dummyObj = NULL; type* dummy = &dummyObj->fieldName; \
assert(offset_of(typeName, fieldName) < sizeof(typeName), "Illegal nonstatic struct entry, field offset too large"); }
// This macro checks the type of a volatile VMStructEntry by comparing pointer types // This macro checks the type of a volatile VMStructEntry by comparing pointer types
#define CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY(typeName, fieldName, type) \ #define CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY(typeName, fieldName, type) \