comparison src/share/vm/oops/arrayKlass.cpp @ 20536:73d61cd3f8e9

Merge
author asaha
date Wed, 08 Oct 2014 14:13:23 -0700
parents f0bedf980c65 7d68a5b1069d
children 7848fc12602b
comparison
equal deleted inserted replaced
20535:8956e19bdffb 20536:73d61cd3f8e9
98 // since a GC can happen. At this point all instance variables of the ArrayKlass must be setup. 98 // since a GC can happen. At this point all instance variables of the ArrayKlass must be setup.
99 void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS) { 99 void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS) {
100 ResourceMark rm(THREAD); 100 ResourceMark rm(THREAD);
101 k->initialize_supers(super_klass(), CHECK); 101 k->initialize_supers(super_klass(), CHECK);
102 k->vtable()->initialize_vtable(false, CHECK); 102 k->vtable()->initialize_vtable(false, CHECK);
103 java_lang_Class::create_mirror(k, Handle(NULL), Handle(NULL), CHECK); 103 java_lang_Class::create_mirror(k, Handle(THREAD, k->class_loader()), Handle(NULL), CHECK);
104 } 104 }
105 105
106 GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) { 106 GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) {
107 // interfaces = { cloneable_klass, serializable_klass }; 107 // interfaces = { cloneable_klass, serializable_klass };
108 assert(num_extra_slots == 0, "sanity of primitive array type"); 108 assert(num_extra_slots == 0, "sanity of primitive array type");