Mercurial > hg > truffle
diff src/share/vm/ci/ciInstanceKlass.cpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Mon, 27 Feb 2012 13:10:13 +0100 |
| parents | 716a2c5c0656 52b5d32fbfaf |
| children | 957c266d8bc5 |
line wrap: on
line diff
--- a/src/share/vm/ci/ciInstanceKlass.cpp Fri Feb 24 18:30:42 2012 -0800 +++ b/src/share/vm/ci/ciInstanceKlass.cpp Mon Feb 27 13:10:13 2012 +0100 @@ -54,7 +54,7 @@ _flags = ciFlags(access_flags); _has_finalizer = access_flags.has_finalizer(); _has_subklass = ik->subklass() != NULL; - _init_state = (instanceKlass::ClassState)ik->get_init_state(); + _init_state = ik->init_state(); _nonstatic_field_size = ik->nonstatic_field_size(); _has_nonstatic_fields = ik->has_nonstatic_fields(); _nonstatic_fields = NULL; // initialized lazily by compute_nonstatic_fields: @@ -118,7 +118,7 @@ void ciInstanceKlass::compute_shared_init_state() { GUARDED_VM_ENTRY( instanceKlass* ik = get_instanceKlass(); - _init_state = (instanceKlass::ClassState)ik->get_init_state(); + _init_state = ik->init_state(); ) }