comparison src/share/vm/oops/arrayKlass.cpp @ 10408:836a62f43af9

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 6bd680e9ea35
children e0c9a1d29eb4
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
92 // since a GC can happen. At this point all instance variables of the ArrayKlass must be setup. 92 // since a GC can happen. At this point all instance variables of the ArrayKlass must be setup.
93 void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS) { 93 void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS) {
94 ResourceMark rm(THREAD); 94 ResourceMark rm(THREAD);
95 k->initialize_supers(super_klass(), CHECK); 95 k->initialize_supers(super_klass(), CHECK);
96 k->vtable()->initialize_vtable(false, CHECK); 96 k->vtable()->initialize_vtable(false, CHECK);
97 java_lang_Class::create_mirror(k, CHECK); 97 java_lang_Class::create_mirror(k, Handle(NULL), CHECK);
98 } 98 }
99 99
100 GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) { 100 GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) {
101 // interfaces = { cloneable_klass, serializable_klass }; 101 // interfaces = { cloneable_klass, serializable_klass };
102 assert(num_extra_slots == 0, "sanity of primitive array type"); 102 assert(num_extra_slots == 0, "sanity of primitive array type");