comparison 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
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
52 52
53 AccessFlags access_flags = ik->access_flags(); 53 AccessFlags access_flags = ik->access_flags();
54 _flags = ciFlags(access_flags); 54 _flags = ciFlags(access_flags);
55 _has_finalizer = access_flags.has_finalizer(); 55 _has_finalizer = access_flags.has_finalizer();
56 _has_subklass = ik->subklass() != NULL; 56 _has_subklass = ik->subklass() != NULL;
57 _init_state = (instanceKlass::ClassState)ik->get_init_state(); 57 _init_state = ik->init_state();
58 _nonstatic_field_size = ik->nonstatic_field_size(); 58 _nonstatic_field_size = ik->nonstatic_field_size();
59 _has_nonstatic_fields = ik->has_nonstatic_fields(); 59 _has_nonstatic_fields = ik->has_nonstatic_fields();
60 _nonstatic_fields = NULL; // initialized lazily by compute_nonstatic_fields: 60 _nonstatic_fields = NULL; // initialized lazily by compute_nonstatic_fields:
61 61
62 _nof_implementors = ik->nof_implementors(); 62 _nof_implementors = ik->nof_implementors();
116 // ------------------------------------------------------------------ 116 // ------------------------------------------------------------------
117 // ciInstanceKlass::compute_shared_is_initialized 117 // ciInstanceKlass::compute_shared_is_initialized
118 void ciInstanceKlass::compute_shared_init_state() { 118 void ciInstanceKlass::compute_shared_init_state() {
119 GUARDED_VM_ENTRY( 119 GUARDED_VM_ENTRY(
120 instanceKlass* ik = get_instanceKlass(); 120 instanceKlass* ik = get_instanceKlass();
121 _init_state = (instanceKlass::ClassState)ik->get_init_state(); 121 _init_state = ik->init_state();
122 ) 122 )
123 } 123 }
124 124
125 // ------------------------------------------------------------------ 125 // ------------------------------------------------------------------
126 // ciInstanceKlass::compute_shared_has_subklass 126 // ciInstanceKlass::compute_shared_has_subklass