Fri, 11 Mar 2011 22:34:57 -0800
7012648: move JSR 292 to package java.lang.invoke and adjust names
Summary: package and class renaming only; delete unused methods and classes
Reviewed-by: twisti
duke@435 | 1 | /* |
stefank@2534 | 2 | * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
trims@1907 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
trims@1907 | 20 | * or visit www.oracle.com if you need additional information or have any |
trims@1907 | 21 | * questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
stefank@2314 | 25 | #include "precompiled.hpp" |
stefank@2314 | 26 | #include "classfile/javaClasses.hpp" |
stefank@2314 | 27 | #include "classfile/systemDictionary.hpp" |
stefank@2314 | 28 | #include "gc_implementation/shared/markSweep.inline.hpp" |
stefank@2314 | 29 | #include "gc_interface/collectedHeap.inline.hpp" |
stefank@2314 | 30 | #include "oops/instanceKlass.hpp" |
stefank@2314 | 31 | #include "oops/objArrayKlassKlass.hpp" |
stefank@2314 | 32 | #include "oops/oop.inline.hpp" |
stefank@2314 | 33 | #include "oops/oop.inline2.hpp" |
duke@435 | 34 | |
duke@435 | 35 | klassOop objArrayKlassKlass::create_klass(TRAPS) { |
duke@435 | 36 | objArrayKlassKlass o; |
duke@435 | 37 | KlassHandle h_this_klass(THREAD, Universe::klassKlassObj()); |
duke@435 | 38 | KlassHandle k = base_create_klass(h_this_klass, header_size(), o.vtbl_value(), CHECK_0); |
duke@435 | 39 | assert(k()->size() == align_object_size(header_size()), "wrong size for object"); |
duke@435 | 40 | java_lang_Class::create_mirror(k, CHECK_0); // Allocate mirror |
duke@435 | 41 | return k(); |
duke@435 | 42 | } |
duke@435 | 43 | |
duke@435 | 44 | klassOop objArrayKlassKlass::allocate_system_objArray_klass(TRAPS) { |
duke@435 | 45 | // system_objArrays have no instance klass, so allocate with fake class, then reset to NULL |
duke@435 | 46 | KlassHandle kk(THREAD, Universe::intArrayKlassObj()); |
duke@435 | 47 | klassOop k = allocate_objArray_klass(1, kk, CHECK_0); |
duke@435 | 48 | objArrayKlass* tk = (objArrayKlass*) k->klass_part(); |
duke@435 | 49 | tk->set_element_klass(NULL); |
duke@435 | 50 | tk->set_bottom_klass(NULL); |
duke@435 | 51 | return k; |
duke@435 | 52 | } |
duke@435 | 53 | |
duke@435 | 54 | |
duke@435 | 55 | klassOop objArrayKlassKlass::allocate_objArray_klass(int n, KlassHandle element_klass, TRAPS) { |
duke@435 | 56 | objArrayKlassKlassHandle this_oop(THREAD, as_klassOop()); |
duke@435 | 57 | return allocate_objArray_klass_impl(this_oop, n, element_klass, THREAD); |
duke@435 | 58 | } |
duke@435 | 59 | |
duke@435 | 60 | klassOop objArrayKlassKlass::allocate_objArray_klass_impl(objArrayKlassKlassHandle this_oop, |
duke@435 | 61 | int n, KlassHandle element_klass, TRAPS) { |
duke@435 | 62 | |
duke@435 | 63 | // Eagerly allocate the direct array supertype. |
duke@435 | 64 | KlassHandle super_klass = KlassHandle(); |
duke@435 | 65 | if (!Universe::is_bootstrapping()) { |
duke@435 | 66 | KlassHandle element_super (THREAD, element_klass->super()); |
duke@435 | 67 | if (element_super.not_null()) { |
duke@435 | 68 | // The element type has a direct super. E.g., String[] has direct super of Object[]. |
duke@435 | 69 | super_klass = KlassHandle(THREAD, element_super->array_klass_or_null()); |
duke@435 | 70 | bool supers_exist = super_klass.not_null(); |
duke@435 | 71 | // Also, see if the element has secondary supertypes. |
duke@435 | 72 | // We need an array type for each. |
duke@435 | 73 | objArrayHandle element_supers = objArrayHandle(THREAD, |
duke@435 | 74 | element_klass->secondary_supers()); |
duke@435 | 75 | for( int i = element_supers->length()-1; i >= 0; i-- ) { |
duke@435 | 76 | klassOop elem_super = (klassOop) element_supers->obj_at(i); |
duke@435 | 77 | if (Klass::cast(elem_super)->array_klass_or_null() == NULL) { |
duke@435 | 78 | supers_exist = false; |
duke@435 | 79 | break; |
duke@435 | 80 | } |
duke@435 | 81 | } |
duke@435 | 82 | if (!supers_exist) { |
duke@435 | 83 | // Oops. Not allocated yet. Back out, allocate it, and retry. |
duke@435 | 84 | #ifndef PRODUCT |
duke@435 | 85 | if (WizardMode) { |
duke@435 | 86 | tty->print_cr("Must retry array klass creation for depth %d",n); |
duke@435 | 87 | } |
duke@435 | 88 | #endif |
duke@435 | 89 | KlassHandle ek; |
duke@435 | 90 | { |
duke@435 | 91 | MutexUnlocker mu(MultiArray_lock); |
duke@435 | 92 | MutexUnlocker mc(Compile_lock); // for vtables |
duke@435 | 93 | klassOop sk = element_super->array_klass(CHECK_0); |
duke@435 | 94 | super_klass = KlassHandle(THREAD, sk); |
duke@435 | 95 | for( int i = element_supers->length()-1; i >= 0; i-- ) { |
duke@435 | 96 | KlassHandle elem_super (THREAD, element_supers->obj_at(i)); |
duke@435 | 97 | elem_super->array_klass(CHECK_0); |
duke@435 | 98 | } |
duke@435 | 99 | // Now retry from the beginning |
duke@435 | 100 | klassOop klass_oop = element_klass->array_klass(n, CHECK_0); |
duke@435 | 101 | // Create a handle because the enclosing brace, when locking |
duke@435 | 102 | // can cause a gc. Better to have this function return a Handle. |
duke@435 | 103 | ek = KlassHandle(THREAD, klass_oop); |
duke@435 | 104 | } // re-lock |
duke@435 | 105 | return ek(); |
duke@435 | 106 | } |
duke@435 | 107 | } else { |
duke@435 | 108 | // The element type is already Object. Object[] has direct super of Object. |
never@1577 | 109 | super_klass = KlassHandle(THREAD, SystemDictionary::Object_klass()); |
duke@435 | 110 | } |
duke@435 | 111 | } |
duke@435 | 112 | |
coleenp@2497 | 113 | // Create type name for klass. |
coleenp@2497 | 114 | Symbol* name = NULL; |
coleenp@2497 | 115 | if (!element_klass->oop_is_instance() || |
coleenp@2497 | 116 | (name = instanceKlass::cast(element_klass())->array_name()) == NULL) { |
duke@435 | 117 | |
duke@435 | 118 | ResourceMark rm(THREAD); |
duke@435 | 119 | char *name_str = element_klass->name()->as_C_string(); |
duke@435 | 120 | int len = element_klass->name()->utf8_length(); |
duke@435 | 121 | char *new_str = NEW_RESOURCE_ARRAY(char, len + 4); |
duke@435 | 122 | int idx = 0; |
duke@435 | 123 | new_str[idx++] = '['; |
duke@435 | 124 | if (element_klass->oop_is_instance()) { // it could be an array or simple type |
duke@435 | 125 | new_str[idx++] = 'L'; |
duke@435 | 126 | } |
duke@435 | 127 | memcpy(&new_str[idx], name_str, len * sizeof(char)); |
duke@435 | 128 | idx += len; |
duke@435 | 129 | if (element_klass->oop_is_instance()) { |
duke@435 | 130 | new_str[idx++] = ';'; |
duke@435 | 131 | } |
duke@435 | 132 | new_str[idx++] = '\0'; |
coleenp@2497 | 133 | name = SymbolTable::new_symbol(new_str, CHECK_0); |
coleenp@2497 | 134 | if (element_klass->oop_is_instance()) { |
coleenp@2497 | 135 | instanceKlass* ik = instanceKlass::cast(element_klass()); |
coleenp@2497 | 136 | ik->set_array_name(name); |
coleenp@2497 | 137 | } |
duke@435 | 138 | } |
duke@435 | 139 | |
duke@435 | 140 | objArrayKlass o; |
duke@435 | 141 | arrayKlassHandle k = arrayKlass::base_create_array_klass(o.vtbl_value(), |
duke@435 | 142 | objArrayKlass::header_size(), |
duke@435 | 143 | this_oop, |
duke@435 | 144 | CHECK_0); |
duke@435 | 145 | |
duke@435 | 146 | // Initialize instance variables |
duke@435 | 147 | objArrayKlass* oak = objArrayKlass::cast(k()); |
duke@435 | 148 | oak->set_dimension(n); |
duke@435 | 149 | oak->set_element_klass(element_klass()); |
coleenp@2497 | 150 | oak->set_name(name); |
coleenp@2497 | 151 | // decrement refcount because object arrays are not explicitly freed. The |
coleenp@2497 | 152 | // instanceKlass array_name() keeps the name counted while the klass is |
coleenp@2497 | 153 | // loaded. |
coleenp@2497 | 154 | name->decrement_refcount(); |
duke@435 | 155 | |
duke@435 | 156 | klassOop bk; |
duke@435 | 157 | if (element_klass->oop_is_objArray()) { |
duke@435 | 158 | bk = objArrayKlass::cast(element_klass())->bottom_klass(); |
duke@435 | 159 | } else { |
duke@435 | 160 | bk = element_klass(); |
duke@435 | 161 | } |
duke@435 | 162 | assert(bk != NULL && (Klass::cast(bk)->oop_is_instance() || Klass::cast(bk)->oop_is_typeArray()), "invalid bottom klass"); |
duke@435 | 163 | oak->set_bottom_klass(bk); |
duke@435 | 164 | |
duke@435 | 165 | oak->set_layout_helper(array_layout_helper(T_OBJECT)); |
duke@435 | 166 | assert(oak->oop_is_javaArray(), "sanity"); |
duke@435 | 167 | assert(oak->oop_is_objArray(), "sanity"); |
duke@435 | 168 | |
duke@435 | 169 | // Call complete_create_array_klass after all instance variables has been initialized. |
duke@435 | 170 | arrayKlass::complete_create_array_klass(k, super_klass, CHECK_0); |
duke@435 | 171 | |
duke@435 | 172 | return k(); |
duke@435 | 173 | } |
duke@435 | 174 | |
duke@435 | 175 | |
duke@435 | 176 | void objArrayKlassKlass::oop_follow_contents(oop obj) { |
duke@435 | 177 | assert(obj->is_klass(), "must be klass"); |
duke@435 | 178 | assert(klassOop(obj)->klass_part()->oop_is_objArray_slow(), "must be obj array"); |
duke@435 | 179 | |
duke@435 | 180 | objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); |
duke@435 | 181 | MarkSweep::mark_and_push(oak->element_klass_addr()); |
duke@435 | 182 | MarkSweep::mark_and_push(oak->bottom_klass_addr()); |
duke@435 | 183 | |
duke@435 | 184 | arrayKlassKlass::oop_follow_contents(obj); |
duke@435 | 185 | } |
duke@435 | 186 | |
duke@435 | 187 | #ifndef SERIALGC |
duke@435 | 188 | void objArrayKlassKlass::oop_follow_contents(ParCompactionManager* cm, |
duke@435 | 189 | oop obj) { |
duke@435 | 190 | assert(obj->is_klass(), "must be klass"); |
duke@435 | 191 | assert(klassOop(obj)->klass_part()->oop_is_objArray_slow(), "must be obj array"); |
duke@435 | 192 | |
duke@435 | 193 | objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); |
duke@435 | 194 | PSParallelCompact::mark_and_push(cm, oak->element_klass_addr()); |
duke@435 | 195 | PSParallelCompact::mark_and_push(cm, oak->bottom_klass_addr()); |
duke@435 | 196 | |
duke@435 | 197 | arrayKlassKlass::oop_follow_contents(cm, obj); |
duke@435 | 198 | } |
duke@435 | 199 | #endif // SERIALGC |
duke@435 | 200 | |
duke@435 | 201 | |
duke@435 | 202 | int objArrayKlassKlass::oop_adjust_pointers(oop obj) { |
duke@435 | 203 | assert(obj->is_klass(), "must be klass"); |
duke@435 | 204 | assert(klassOop(obj)->klass_part()->oop_is_objArray_slow(), "must be obj array"); |
duke@435 | 205 | |
duke@435 | 206 | objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); |
duke@435 | 207 | MarkSweep::adjust_pointer(oak->element_klass_addr()); |
duke@435 | 208 | MarkSweep::adjust_pointer(oak->bottom_klass_addr()); |
duke@435 | 209 | |
duke@435 | 210 | return arrayKlassKlass::oop_adjust_pointers(obj); |
duke@435 | 211 | } |
duke@435 | 212 | |
duke@435 | 213 | |
duke@435 | 214 | |
duke@435 | 215 | int objArrayKlassKlass::oop_oop_iterate(oop obj, OopClosure* blk) { |
duke@435 | 216 | assert(obj->is_klass(), "must be klass"); |
duke@435 | 217 | assert(klassOop(obj)->klass_part()->oop_is_objArray_slow(), "must be obj array"); |
duke@435 | 218 | |
duke@435 | 219 | objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); |
duke@435 | 220 | blk->do_oop(oak->element_klass_addr()); |
duke@435 | 221 | blk->do_oop(oak->bottom_klass_addr()); |
duke@435 | 222 | |
duke@435 | 223 | return arrayKlassKlass::oop_oop_iterate(obj, blk); |
duke@435 | 224 | } |
duke@435 | 225 | |
duke@435 | 226 | |
duke@435 | 227 | int |
duke@435 | 228 | objArrayKlassKlass::oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr) { |
duke@435 | 229 | assert(obj->is_klass(), "must be klass"); |
duke@435 | 230 | assert(klassOop(obj)->klass_part()->oop_is_objArray_slow(), "must be obj array"); |
duke@435 | 231 | |
duke@435 | 232 | objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); |
duke@435 | 233 | oop* addr; |
duke@435 | 234 | addr = oak->element_klass_addr(); |
duke@435 | 235 | if (mr.contains(addr)) blk->do_oop(addr); |
duke@435 | 236 | addr = oak->bottom_klass_addr(); |
duke@435 | 237 | if (mr.contains(addr)) blk->do_oop(addr); |
duke@435 | 238 | |
duke@435 | 239 | return arrayKlassKlass::oop_oop_iterate(obj, blk); |
duke@435 | 240 | } |
duke@435 | 241 | |
duke@435 | 242 | #ifndef SERIALGC |
duke@435 | 243 | void objArrayKlassKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { |
duke@435 | 244 | assert(obj->blueprint()->oop_is_objArrayKlass(),"must be an obj array klass"); |
duke@435 | 245 | } |
duke@435 | 246 | |
duke@435 | 247 | int objArrayKlassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { |
duke@435 | 248 | assert(obj->is_klass(), "must be klass"); |
duke@435 | 249 | assert(klassOop(obj)->klass_part()->oop_is_objArray_slow(), "must be obj array"); |
duke@435 | 250 | |
duke@435 | 251 | objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); |
duke@435 | 252 | PSParallelCompact::adjust_pointer(oak->element_klass_addr()); |
duke@435 | 253 | PSParallelCompact::adjust_pointer(oak->bottom_klass_addr()); |
duke@435 | 254 | |
duke@435 | 255 | return arrayKlassKlass::oop_update_pointers(cm, obj); |
duke@435 | 256 | } |
duke@435 | 257 | #endif // SERIALGC |
duke@435 | 258 | |
duke@435 | 259 | #ifndef PRODUCT |
duke@435 | 260 | |
duke@435 | 261 | // Printing |
duke@435 | 262 | |
duke@435 | 263 | void objArrayKlassKlass::oop_print_on(oop obj, outputStream* st) { |
duke@435 | 264 | assert(obj->is_klass(), "must be klass"); |
duke@435 | 265 | objArrayKlass* oak = (objArrayKlass*) klassOop(obj)->klass_part(); |
duke@435 | 266 | klassKlass::oop_print_on(obj, st); |
duke@435 | 267 | st->print(" - instance klass: "); |
duke@435 | 268 | oak->element_klass()->print_value_on(st); |
duke@435 | 269 | st->cr(); |
duke@435 | 270 | } |
duke@435 | 271 | |
jrose@1590 | 272 | #endif //PRODUCT |
duke@435 | 273 | |
duke@435 | 274 | void objArrayKlassKlass::oop_print_value_on(oop obj, outputStream* st) { |
duke@435 | 275 | assert(obj->is_klass(), "must be klass"); |
duke@435 | 276 | objArrayKlass* oak = (objArrayKlass*) klassOop(obj)->klass_part(); |
duke@435 | 277 | |
duke@435 | 278 | oak->element_klass()->print_value_on(st); |
duke@435 | 279 | st->print("[]"); |
duke@435 | 280 | } |
duke@435 | 281 | |
duke@435 | 282 | const char* objArrayKlassKlass::internal_name() const { |
duke@435 | 283 | return "{object array class}"; |
duke@435 | 284 | } |
duke@435 | 285 | |
duke@435 | 286 | |
duke@435 | 287 | // Verification |
duke@435 | 288 | |
duke@435 | 289 | void objArrayKlassKlass::oop_verify_on(oop obj, outputStream* st) { |
duke@435 | 290 | klassKlass::oop_verify_on(obj, st); |
duke@435 | 291 | objArrayKlass* oak = objArrayKlass::cast((klassOop)obj); |
duke@435 | 292 | guarantee(oak->element_klass()->is_perm(), "should be in permspace"); |
duke@435 | 293 | guarantee(oak->element_klass()->is_klass(), "should be klass"); |
duke@435 | 294 | guarantee(oak->bottom_klass()->is_perm(), "should be in permspace"); |
duke@435 | 295 | guarantee(oak->bottom_klass()->is_klass(), "should be klass"); |
duke@435 | 296 | Klass* bk = Klass::cast(oak->bottom_klass()); |
duke@435 | 297 | guarantee(bk->oop_is_instance() || bk->oop_is_typeArray(), "invalid bottom klass"); |
duke@435 | 298 | } |