comparison src/share/vm/ci/ciInstanceKlass.cpp @ 13086:096c224171c4

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 20 Nov 2013 00:10:38 +0100
parents cefad50507d8 4d3575d37a07
children 52b4284cb496
comparison
equal deleted inserted replaced
12782:92b7ec34ddfa 13086:096c224171c4
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 = ik->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 _has_default_methods = ik->has_default_methods();
60 _nonstatic_fields = NULL; // initialized lazily by compute_nonstatic_fields: 61 _nonstatic_fields = NULL; // initialized lazily by compute_nonstatic_fields:
61 62
62 _implementor = NULL; // we will fill these lazily 63 _implementor = NULL; // we will fill these lazily
63 64
64 Thread *thread = Thread::current(); 65 Thread *thread = Thread::current();
669 } 670 }
670 }; 671 };
671 672
672 673
673 void ciInstanceKlass::dump_replay_data(outputStream* out) { 674 void ciInstanceKlass::dump_replay_data(outputStream* out) {
674 ASSERT_IN_VM;
675 ResourceMark rm; 675 ResourceMark rm;
676 676
677 InstanceKlass* ik = get_instanceKlass(); 677 InstanceKlass* ik = get_instanceKlass();
678 ConstantPool* cp = ik->constants(); 678 ConstantPool* cp = ik->constants();
679 679