Mercurial > hg > truffle
diff src/share/vm/runtime/vmStructs.cpp @ 4738:da4dd142ea01
Merge
author | bobv |
---|---|
date | Tue, 29 Nov 2011 14:44:44 -0500 |
parents | 75c0a73eee98 |
children | 52b5d32fbfaf |
line wrap: on
line diff
--- a/src/share/vm/runtime/vmStructs.cpp Mon Nov 21 10:22:04 2011 -0500 +++ b/src/share/vm/runtime/vmStructs.cpp Tue Nov 29 14:44:44 2011 -0500 @@ -307,7 +307,7 @@ nonstatic_field(instanceKlass, _static_field_size, int) \ nonstatic_field(instanceKlass, _static_oop_field_count, int) \ nonstatic_field(instanceKlass, _nonstatic_oop_map_size, int) \ - nonstatic_field(instanceKlass, _is_marked_dependent, bool) \ + nonstatic_field(instanceKlass, _misc_flags, u1) \ nonstatic_field(instanceKlass, _minor_version, u2) \ nonstatic_field(instanceKlass, _major_version, u2) \ nonstatic_field(instanceKlass, _init_state, instanceKlass::ClassState) \ @@ -1362,6 +1362,7 @@ /* The compiler thinks this is a different type than */ \ /* unsigned short on Win32 */ \ declare_unsigned_integer_type(u2) \ + declare_unsigned_integer_type(u1) \ declare_unsigned_integer_type(unsigned) \ \ /*****************************/ \ @@ -2385,6 +2386,7 @@ declare_constant(instanceKlass::being_initialized) \ declare_constant(instanceKlass::fully_initialized) \ declare_constant(instanceKlass::initialization_error) \ + declare_constant(instanceKlass::IS_MARKED_DEPENDENT) \ \ /*********************************/ \ /* Symbol* - symbol max length */ \