Mercurial > hg > truffle
comparison src/share/vm/oops/arrayKlass.cpp @ 20514:a66c95853c53
Merge
author | coleenp |
---|---|
date | Thu, 02 Oct 2014 23:10:39 +0000 |
parents | 7d68a5b1069d |
children | 73d61cd3f8e9 |
comparison
equal
deleted
inserted
replaced
20511:ff0986dac06d | 20514:a66c95853c53 |
---|---|
91 // since a GC can happen. At this point all instance variables of the ArrayKlass must be setup. | 91 // since a GC can happen. At this point all instance variables of the ArrayKlass must be setup. |
92 void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS) { | 92 void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS) { |
93 ResourceMark rm(THREAD); | 93 ResourceMark rm(THREAD); |
94 k->initialize_supers(super_klass(), CHECK); | 94 k->initialize_supers(super_klass(), CHECK); |
95 k->vtable()->initialize_vtable(false, CHECK); | 95 k->vtable()->initialize_vtable(false, CHECK); |
96 java_lang_Class::create_mirror(k, Handle(NULL), Handle(NULL), CHECK); | 96 java_lang_Class::create_mirror(k, Handle(THREAD, k->class_loader()), Handle(NULL), CHECK); |
97 } | 97 } |
98 | 98 |
99 GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) { | 99 GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) { |
100 // interfaces = { cloneable_klass, serializable_klass }; | 100 // interfaces = { cloneable_klass, serializable_klass }; |
101 assert(num_extra_slots == 0, "sanity of primitive array type"); | 101 assert(num_extra_slots == 0, "sanity of primitive array type"); |