Mercurial > hg > graal-jvmci-8
comparison src/share/vm/oops/arrayKlass.cpp @ 20383:14b8221771dc
Merge
author | tschatzl |
---|---|
date | Wed, 03 Sep 2014 09:25:44 +0200 |
parents | 6e0cb14ce59b |
children | 47e3110c47e8 8cb56c8cb30d |
comparison
equal
deleted
inserted
replaced
20382:b1266b08b994 | 20383:14b8221771dc |
---|---|
184 Klass::remove_unshareable_info(); | 184 Klass::remove_unshareable_info(); |
185 // Clear the java mirror | 185 // Clear the java mirror |
186 set_component_mirror(NULL); | 186 set_component_mirror(NULL); |
187 } | 187 } |
188 | 188 |
189 void ArrayKlass::restore_unshareable_info(TRAPS) { | 189 void ArrayKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) { |
190 Klass::restore_unshareable_info(CHECK); | 190 assert(loader_data == ClassLoaderData::the_null_class_loader_data(), "array classes belong to null loader"); |
191 Klass::restore_unshareable_info(loader_data, protection_domain, CHECK); | |
191 // Klass recreates the component mirror also | 192 // Klass recreates the component mirror also |
192 } | 193 } |
193 | 194 |
194 // Printing | 195 // Printing |
195 | 196 |