Tue, 11 May 2010 14:35:43 -0700
6931180: Migration to recent versions of MS Platform SDK
6951582: Build problems on win64
Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010
Reviewed-by: ohair, art, ccheung, dcubed
duke@435 | 1 | /* |
xdono@1014 | 2 | * Copyright 2003-2009 Sun Microsystems, Inc. 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 | * |
duke@435 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@435 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@435 | 21 | * have any questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
duke@435 | 25 | # include "incls/_precompiled.incl" |
duke@435 | 26 | # include "incls/_jvmtiRedefineClasses.cpp.incl" |
duke@435 | 27 | |
duke@435 | 28 | |
duke@435 | 29 | objArrayOop VM_RedefineClasses::_old_methods = NULL; |
duke@435 | 30 | objArrayOop VM_RedefineClasses::_new_methods = NULL; |
duke@435 | 31 | methodOop* VM_RedefineClasses::_matching_old_methods = NULL; |
duke@435 | 32 | methodOop* VM_RedefineClasses::_matching_new_methods = NULL; |
duke@435 | 33 | methodOop* VM_RedefineClasses::_deleted_methods = NULL; |
duke@435 | 34 | methodOop* VM_RedefineClasses::_added_methods = NULL; |
duke@435 | 35 | int VM_RedefineClasses::_matching_methods_length = 0; |
duke@435 | 36 | int VM_RedefineClasses::_deleted_methods_length = 0; |
duke@435 | 37 | int VM_RedefineClasses::_added_methods_length = 0; |
duke@435 | 38 | klassOop VM_RedefineClasses::_the_class_oop = NULL; |
duke@435 | 39 | |
duke@435 | 40 | |
duke@435 | 41 | VM_RedefineClasses::VM_RedefineClasses(jint class_count, |
duke@435 | 42 | const jvmtiClassDefinition *class_defs, |
duke@435 | 43 | JvmtiClassLoadKind class_load_kind) { |
duke@435 | 44 | _class_count = class_count; |
duke@435 | 45 | _class_defs = class_defs; |
duke@435 | 46 | _class_load_kind = class_load_kind; |
duke@435 | 47 | _res = JVMTI_ERROR_NONE; |
duke@435 | 48 | } |
duke@435 | 49 | |
duke@435 | 50 | bool VM_RedefineClasses::doit_prologue() { |
duke@435 | 51 | if (_class_count == 0) { |
duke@435 | 52 | _res = JVMTI_ERROR_NONE; |
duke@435 | 53 | return false; |
duke@435 | 54 | } |
duke@435 | 55 | if (_class_defs == NULL) { |
duke@435 | 56 | _res = JVMTI_ERROR_NULL_POINTER; |
duke@435 | 57 | return false; |
duke@435 | 58 | } |
duke@435 | 59 | for (int i = 0; i < _class_count; i++) { |
duke@435 | 60 | if (_class_defs[i].klass == NULL) { |
duke@435 | 61 | _res = JVMTI_ERROR_INVALID_CLASS; |
duke@435 | 62 | return false; |
duke@435 | 63 | } |
duke@435 | 64 | if (_class_defs[i].class_byte_count == 0) { |
duke@435 | 65 | _res = JVMTI_ERROR_INVALID_CLASS_FORMAT; |
duke@435 | 66 | return false; |
duke@435 | 67 | } |
duke@435 | 68 | if (_class_defs[i].class_bytes == NULL) { |
duke@435 | 69 | _res = JVMTI_ERROR_NULL_POINTER; |
duke@435 | 70 | return false; |
duke@435 | 71 | } |
duke@435 | 72 | } |
duke@435 | 73 | |
duke@435 | 74 | // Start timer after all the sanity checks; not quite accurate, but |
duke@435 | 75 | // better than adding a bunch of stop() calls. |
duke@435 | 76 | RC_TIMER_START(_timer_vm_op_prologue); |
duke@435 | 77 | |
duke@435 | 78 | // We first load new class versions in the prologue, because somewhere down the |
duke@435 | 79 | // call chain it is required that the current thread is a Java thread. |
duke@435 | 80 | _res = load_new_class_versions(Thread::current()); |
duke@435 | 81 | if (_res != JVMTI_ERROR_NONE) { |
duke@435 | 82 | // Free os::malloc allocated memory in load_new_class_version. |
duke@435 | 83 | os::free(_scratch_classes); |
duke@435 | 84 | RC_TIMER_STOP(_timer_vm_op_prologue); |
duke@435 | 85 | return false; |
duke@435 | 86 | } |
duke@435 | 87 | |
duke@435 | 88 | RC_TIMER_STOP(_timer_vm_op_prologue); |
duke@435 | 89 | return true; |
duke@435 | 90 | } |
duke@435 | 91 | |
duke@435 | 92 | void VM_RedefineClasses::doit() { |
duke@435 | 93 | Thread *thread = Thread::current(); |
duke@435 | 94 | |
duke@435 | 95 | if (UseSharedSpaces) { |
duke@435 | 96 | // Sharing is enabled so we remap the shared readonly space to |
duke@435 | 97 | // shared readwrite, private just in case we need to redefine |
duke@435 | 98 | // a shared class. We do the remap during the doit() phase of |
duke@435 | 99 | // the safepoint to be safer. |
duke@435 | 100 | if (!CompactingPermGenGen::remap_shared_readonly_as_readwrite()) { |
duke@435 | 101 | RC_TRACE_WITH_THREAD(0x00000001, thread, |
duke@435 | 102 | ("failed to remap shared readonly space to readwrite, private")); |
duke@435 | 103 | _res = JVMTI_ERROR_INTERNAL; |
duke@435 | 104 | return; |
duke@435 | 105 | } |
duke@435 | 106 | } |
duke@435 | 107 | |
duke@435 | 108 | for (int i = 0; i < _class_count; i++) { |
duke@435 | 109 | redefine_single_class(_class_defs[i].klass, _scratch_classes[i], thread); |
duke@435 | 110 | } |
duke@435 | 111 | // Disable any dependent concurrent compilations |
duke@435 | 112 | SystemDictionary::notice_modification(); |
duke@435 | 113 | |
duke@435 | 114 | // Set flag indicating that some invariants are no longer true. |
duke@435 | 115 | // See jvmtiExport.hpp for detailed explanation. |
duke@435 | 116 | JvmtiExport::set_has_redefined_a_class(); |
duke@435 | 117 | |
duke@435 | 118 | #ifdef ASSERT |
duke@435 | 119 | SystemDictionary::classes_do(check_class, thread); |
duke@435 | 120 | #endif |
duke@435 | 121 | } |
duke@435 | 122 | |
duke@435 | 123 | void VM_RedefineClasses::doit_epilogue() { |
duke@435 | 124 | // Free os::malloc allocated memory. |
duke@435 | 125 | // The memory allocated in redefine will be free'ed in next VM operation. |
duke@435 | 126 | os::free(_scratch_classes); |
duke@435 | 127 | |
duke@435 | 128 | if (RC_TRACE_ENABLED(0x00000004)) { |
duke@435 | 129 | // Used to have separate timers for "doit" and "all", but the timer |
duke@435 | 130 | // overhead skewed the measurements. |
duke@435 | 131 | jlong doit_time = _timer_rsc_phase1.milliseconds() + |
duke@435 | 132 | _timer_rsc_phase2.milliseconds(); |
duke@435 | 133 | jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time; |
duke@435 | 134 | |
duke@435 | 135 | RC_TRACE(0x00000004, ("vm_op: all=" UINT64_FORMAT |
duke@435 | 136 | " prologue=" UINT64_FORMAT " doit=" UINT64_FORMAT, all_time, |
duke@435 | 137 | _timer_vm_op_prologue.milliseconds(), doit_time)); |
duke@435 | 138 | RC_TRACE(0x00000004, |
duke@435 | 139 | ("redefine_single_class: phase1=" UINT64_FORMAT " phase2=" UINT64_FORMAT, |
duke@435 | 140 | _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds())); |
duke@435 | 141 | } |
duke@435 | 142 | } |
duke@435 | 143 | |
duke@435 | 144 | bool VM_RedefineClasses::is_modifiable_class(oop klass_mirror) { |
duke@435 | 145 | // classes for primitives cannot be redefined |
duke@435 | 146 | if (java_lang_Class::is_primitive(klass_mirror)) { |
duke@435 | 147 | return false; |
duke@435 | 148 | } |
duke@435 | 149 | klassOop the_class_oop = java_lang_Class::as_klassOop(klass_mirror); |
duke@435 | 150 | // classes for arrays cannot be redefined |
duke@435 | 151 | if (the_class_oop == NULL || !Klass::cast(the_class_oop)->oop_is_instance()) { |
duke@435 | 152 | return false; |
duke@435 | 153 | } |
duke@435 | 154 | return true; |
duke@435 | 155 | } |
duke@435 | 156 | |
duke@435 | 157 | // Append the current entry at scratch_i in scratch_cp to *merge_cp_p |
duke@435 | 158 | // where the end of *merge_cp_p is specified by *merge_cp_length_p. For |
duke@435 | 159 | // direct CP entries, there is just the current entry to append. For |
duke@435 | 160 | // indirect and double-indirect CP entries, there are zero or more |
duke@435 | 161 | // referenced CP entries along with the current entry to append. |
duke@435 | 162 | // Indirect and double-indirect CP entries are handled by recursive |
duke@435 | 163 | // calls to append_entry() as needed. The referenced CP entries are |
duke@435 | 164 | // always appended to *merge_cp_p before the referee CP entry. These |
duke@435 | 165 | // referenced CP entries may already exist in *merge_cp_p in which case |
duke@435 | 166 | // there is nothing extra to append and only the current entry is |
duke@435 | 167 | // appended. |
duke@435 | 168 | void VM_RedefineClasses::append_entry(constantPoolHandle scratch_cp, |
duke@435 | 169 | int scratch_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, |
duke@435 | 170 | TRAPS) { |
duke@435 | 171 | |
duke@435 | 172 | // append is different depending on entry tag type |
duke@435 | 173 | switch (scratch_cp->tag_at(scratch_i).value()) { |
duke@435 | 174 | |
duke@435 | 175 | // The old verifier is implemented outside the VM. It loads classes, |
duke@435 | 176 | // but does not resolve constant pool entries directly so we never |
duke@435 | 177 | // see Class entries here with the old verifier. Similarly the old |
duke@435 | 178 | // verifier does not like Class entries in the input constant pool. |
duke@435 | 179 | // The split-verifier is implemented in the VM so it can optionally |
duke@435 | 180 | // and directly resolve constant pool entries to load classes. The |
duke@435 | 181 | // split-verifier can accept either Class entries or UnresolvedClass |
duke@435 | 182 | // entries in the input constant pool. We revert the appended copy |
duke@435 | 183 | // back to UnresolvedClass so that either verifier will be happy |
duke@435 | 184 | // with the constant pool entry. |
duke@435 | 185 | case JVM_CONSTANT_Class: |
duke@435 | 186 | { |
duke@435 | 187 | // revert the copy to JVM_CONSTANT_UnresolvedClass |
duke@435 | 188 | (*merge_cp_p)->unresolved_klass_at_put(*merge_cp_length_p, |
duke@435 | 189 | scratch_cp->klass_name_at(scratch_i)); |
duke@435 | 190 | |
duke@435 | 191 | if (scratch_i != *merge_cp_length_p) { |
duke@435 | 192 | // The new entry in *merge_cp_p is at a different index than |
duke@435 | 193 | // the new entry in scratch_cp so we need to map the index values. |
duke@435 | 194 | map_index(scratch_cp, scratch_i, *merge_cp_length_p); |
duke@435 | 195 | } |
duke@435 | 196 | (*merge_cp_length_p)++; |
duke@435 | 197 | } break; |
duke@435 | 198 | |
duke@435 | 199 | // these are direct CP entries so they can be directly appended, |
duke@435 | 200 | // but double and long take two constant pool entries |
duke@435 | 201 | case JVM_CONSTANT_Double: // fall through |
duke@435 | 202 | case JVM_CONSTANT_Long: |
duke@435 | 203 | { |
duke@435 | 204 | scratch_cp->copy_entry_to(scratch_i, *merge_cp_p, *merge_cp_length_p, |
duke@435 | 205 | THREAD); |
duke@435 | 206 | |
duke@435 | 207 | if (scratch_i != *merge_cp_length_p) { |
duke@435 | 208 | // The new entry in *merge_cp_p is at a different index than |
duke@435 | 209 | // the new entry in scratch_cp so we need to map the index values. |
duke@435 | 210 | map_index(scratch_cp, scratch_i, *merge_cp_length_p); |
duke@435 | 211 | } |
duke@435 | 212 | (*merge_cp_length_p) += 2; |
duke@435 | 213 | } break; |
duke@435 | 214 | |
duke@435 | 215 | // these are direct CP entries so they can be directly appended |
duke@435 | 216 | case JVM_CONSTANT_Float: // fall through |
duke@435 | 217 | case JVM_CONSTANT_Integer: // fall through |
duke@435 | 218 | case JVM_CONSTANT_Utf8: // fall through |
duke@435 | 219 | |
duke@435 | 220 | // This was an indirect CP entry, but it has been changed into |
duke@435 | 221 | // an interned string so this entry can be directly appended. |
duke@435 | 222 | case JVM_CONSTANT_String: // fall through |
duke@435 | 223 | |
duke@435 | 224 | // These were indirect CP entries, but they have been changed into |
duke@435 | 225 | // symbolOops so these entries can be directly appended. |
duke@435 | 226 | case JVM_CONSTANT_UnresolvedClass: // fall through |
duke@435 | 227 | case JVM_CONSTANT_UnresolvedString: |
duke@435 | 228 | { |
duke@435 | 229 | scratch_cp->copy_entry_to(scratch_i, *merge_cp_p, *merge_cp_length_p, |
duke@435 | 230 | THREAD); |
duke@435 | 231 | |
duke@435 | 232 | if (scratch_i != *merge_cp_length_p) { |
duke@435 | 233 | // The new entry in *merge_cp_p is at a different index than |
duke@435 | 234 | // the new entry in scratch_cp so we need to map the index values. |
duke@435 | 235 | map_index(scratch_cp, scratch_i, *merge_cp_length_p); |
duke@435 | 236 | } |
duke@435 | 237 | (*merge_cp_length_p)++; |
duke@435 | 238 | } break; |
duke@435 | 239 | |
duke@435 | 240 | // this is an indirect CP entry so it needs special handling |
duke@435 | 241 | case JVM_CONSTANT_NameAndType: |
duke@435 | 242 | { |
duke@435 | 243 | int name_ref_i = scratch_cp->name_ref_index_at(scratch_i); |
duke@435 | 244 | int new_name_ref_i = 0; |
duke@435 | 245 | bool match = (name_ref_i < *merge_cp_length_p) && |
duke@435 | 246 | scratch_cp->compare_entry_to(name_ref_i, *merge_cp_p, name_ref_i, |
duke@435 | 247 | THREAD); |
duke@435 | 248 | if (!match) { |
duke@435 | 249 | // forward reference in *merge_cp_p or not a direct match |
duke@435 | 250 | |
duke@435 | 251 | int found_i = scratch_cp->find_matching_entry(name_ref_i, *merge_cp_p, |
duke@435 | 252 | THREAD); |
duke@435 | 253 | if (found_i != 0) { |
duke@435 | 254 | guarantee(found_i != name_ref_i, |
duke@435 | 255 | "compare_entry_to() and find_matching_entry() do not agree"); |
duke@435 | 256 | |
duke@435 | 257 | // Found a matching entry somewhere else in *merge_cp_p so |
duke@435 | 258 | // just need a mapping entry. |
duke@435 | 259 | new_name_ref_i = found_i; |
duke@435 | 260 | map_index(scratch_cp, name_ref_i, found_i); |
duke@435 | 261 | } else { |
duke@435 | 262 | // no match found so we have to append this entry to *merge_cp_p |
duke@435 | 263 | append_entry(scratch_cp, name_ref_i, merge_cp_p, merge_cp_length_p, |
duke@435 | 264 | THREAD); |
duke@435 | 265 | // The above call to append_entry() can only append one entry |
duke@435 | 266 | // so the post call query of *merge_cp_length_p is only for |
duke@435 | 267 | // the sake of consistency. |
duke@435 | 268 | new_name_ref_i = *merge_cp_length_p - 1; |
duke@435 | 269 | } |
duke@435 | 270 | } |
duke@435 | 271 | |
duke@435 | 272 | int signature_ref_i = scratch_cp->signature_ref_index_at(scratch_i); |
duke@435 | 273 | int new_signature_ref_i = 0; |
duke@435 | 274 | match = (signature_ref_i < *merge_cp_length_p) && |
duke@435 | 275 | scratch_cp->compare_entry_to(signature_ref_i, *merge_cp_p, |
duke@435 | 276 | signature_ref_i, THREAD); |
duke@435 | 277 | if (!match) { |
duke@435 | 278 | // forward reference in *merge_cp_p or not a direct match |
duke@435 | 279 | |
duke@435 | 280 | int found_i = scratch_cp->find_matching_entry(signature_ref_i, |
duke@435 | 281 | *merge_cp_p, THREAD); |
duke@435 | 282 | if (found_i != 0) { |
duke@435 | 283 | guarantee(found_i != signature_ref_i, |
duke@435 | 284 | "compare_entry_to() and find_matching_entry() do not agree"); |
duke@435 | 285 | |
duke@435 | 286 | // Found a matching entry somewhere else in *merge_cp_p so |
duke@435 | 287 | // just need a mapping entry. |
duke@435 | 288 | new_signature_ref_i = found_i; |
duke@435 | 289 | map_index(scratch_cp, signature_ref_i, found_i); |
duke@435 | 290 | } else { |
duke@435 | 291 | // no match found so we have to append this entry to *merge_cp_p |
duke@435 | 292 | append_entry(scratch_cp, signature_ref_i, merge_cp_p, |
duke@435 | 293 | merge_cp_length_p, THREAD); |
duke@435 | 294 | // The above call to append_entry() can only append one entry |
duke@435 | 295 | // so the post call query of *merge_cp_length_p is only for |
duke@435 | 296 | // the sake of consistency. |
duke@435 | 297 | new_signature_ref_i = *merge_cp_length_p - 1; |
duke@435 | 298 | } |
duke@435 | 299 | } |
duke@435 | 300 | |
duke@435 | 301 | // If the referenced entries already exist in *merge_cp_p, then |
duke@435 | 302 | // both new_name_ref_i and new_signature_ref_i will both be 0. |
duke@435 | 303 | // In that case, all we are appending is the current entry. |
duke@435 | 304 | if (new_name_ref_i == 0) { |
duke@435 | 305 | new_name_ref_i = name_ref_i; |
duke@435 | 306 | } else { |
duke@435 | 307 | RC_TRACE(0x00080000, |
duke@435 | 308 | ("NameAndType entry@%d name_ref_index change: %d to %d", |
duke@435 | 309 | *merge_cp_length_p, name_ref_i, new_name_ref_i)); |
duke@435 | 310 | } |
duke@435 | 311 | if (new_signature_ref_i == 0) { |
duke@435 | 312 | new_signature_ref_i = signature_ref_i; |
duke@435 | 313 | } else { |
duke@435 | 314 | RC_TRACE(0x00080000, |
duke@435 | 315 | ("NameAndType entry@%d signature_ref_index change: %d to %d", |
duke@435 | 316 | *merge_cp_length_p, signature_ref_i, new_signature_ref_i)); |
duke@435 | 317 | } |
duke@435 | 318 | |
duke@435 | 319 | (*merge_cp_p)->name_and_type_at_put(*merge_cp_length_p, |
duke@435 | 320 | new_name_ref_i, new_signature_ref_i); |
duke@435 | 321 | if (scratch_i != *merge_cp_length_p) { |
duke@435 | 322 | // The new entry in *merge_cp_p is at a different index than |
duke@435 | 323 | // the new entry in scratch_cp so we need to map the index values. |
duke@435 | 324 | map_index(scratch_cp, scratch_i, *merge_cp_length_p); |
duke@435 | 325 | } |
duke@435 | 326 | (*merge_cp_length_p)++; |
duke@435 | 327 | } break; |
duke@435 | 328 | |
duke@435 | 329 | // this is a double-indirect CP entry so it needs special handling |
duke@435 | 330 | case JVM_CONSTANT_Fieldref: // fall through |
duke@435 | 331 | case JVM_CONSTANT_InterfaceMethodref: // fall through |
duke@435 | 332 | case JVM_CONSTANT_Methodref: |
duke@435 | 333 | { |
duke@435 | 334 | int klass_ref_i = scratch_cp->uncached_klass_ref_index_at(scratch_i); |
duke@435 | 335 | int new_klass_ref_i = 0; |
duke@435 | 336 | bool match = (klass_ref_i < *merge_cp_length_p) && |
duke@435 | 337 | scratch_cp->compare_entry_to(klass_ref_i, *merge_cp_p, klass_ref_i, |
duke@435 | 338 | THREAD); |
duke@435 | 339 | if (!match) { |
duke@435 | 340 | // forward reference in *merge_cp_p or not a direct match |
duke@435 | 341 | |
duke@435 | 342 | int found_i = scratch_cp->find_matching_entry(klass_ref_i, *merge_cp_p, |
duke@435 | 343 | THREAD); |
duke@435 | 344 | if (found_i != 0) { |
duke@435 | 345 | guarantee(found_i != klass_ref_i, |
duke@435 | 346 | "compare_entry_to() and find_matching_entry() do not agree"); |
duke@435 | 347 | |
duke@435 | 348 | // Found a matching entry somewhere else in *merge_cp_p so |
duke@435 | 349 | // just need a mapping entry. |
duke@435 | 350 | new_klass_ref_i = found_i; |
duke@435 | 351 | map_index(scratch_cp, klass_ref_i, found_i); |
duke@435 | 352 | } else { |
duke@435 | 353 | // no match found so we have to append this entry to *merge_cp_p |
duke@435 | 354 | append_entry(scratch_cp, klass_ref_i, merge_cp_p, merge_cp_length_p, |
duke@435 | 355 | THREAD); |
duke@435 | 356 | // The above call to append_entry() can only append one entry |
duke@435 | 357 | // so the post call query of *merge_cp_length_p is only for |
duke@435 | 358 | // the sake of consistency. Without the optimization where we |
duke@435 | 359 | // use JVM_CONSTANT_UnresolvedClass, then up to two entries |
duke@435 | 360 | // could be appended. |
duke@435 | 361 | new_klass_ref_i = *merge_cp_length_p - 1; |
duke@435 | 362 | } |
duke@435 | 363 | } |
duke@435 | 364 | |
duke@435 | 365 | int name_and_type_ref_i = |
duke@435 | 366 | scratch_cp->uncached_name_and_type_ref_index_at(scratch_i); |
duke@435 | 367 | int new_name_and_type_ref_i = 0; |
duke@435 | 368 | match = (name_and_type_ref_i < *merge_cp_length_p) && |
duke@435 | 369 | scratch_cp->compare_entry_to(name_and_type_ref_i, *merge_cp_p, |
duke@435 | 370 | name_and_type_ref_i, THREAD); |
duke@435 | 371 | if (!match) { |
duke@435 | 372 | // forward reference in *merge_cp_p or not a direct match |
duke@435 | 373 | |
duke@435 | 374 | int found_i = scratch_cp->find_matching_entry(name_and_type_ref_i, |
duke@435 | 375 | *merge_cp_p, THREAD); |
duke@435 | 376 | if (found_i != 0) { |
duke@435 | 377 | guarantee(found_i != name_and_type_ref_i, |
duke@435 | 378 | "compare_entry_to() and find_matching_entry() do not agree"); |
duke@435 | 379 | |
duke@435 | 380 | // Found a matching entry somewhere else in *merge_cp_p so |
duke@435 | 381 | // just need a mapping entry. |
duke@435 | 382 | new_name_and_type_ref_i = found_i; |
duke@435 | 383 | map_index(scratch_cp, name_and_type_ref_i, found_i); |
duke@435 | 384 | } else { |
duke@435 | 385 | // no match found so we have to append this entry to *merge_cp_p |
duke@435 | 386 | append_entry(scratch_cp, name_and_type_ref_i, merge_cp_p, |
duke@435 | 387 | merge_cp_length_p, THREAD); |
duke@435 | 388 | // The above call to append_entry() can append more than |
duke@435 | 389 | // one entry so the post call query of *merge_cp_length_p |
duke@435 | 390 | // is required in order to get the right index for the |
duke@435 | 391 | // JVM_CONSTANT_NameAndType entry. |
duke@435 | 392 | new_name_and_type_ref_i = *merge_cp_length_p - 1; |
duke@435 | 393 | } |
duke@435 | 394 | } |
duke@435 | 395 | |
duke@435 | 396 | // If the referenced entries already exist in *merge_cp_p, then |
duke@435 | 397 | // both new_klass_ref_i and new_name_and_type_ref_i will both be |
duke@435 | 398 | // 0. In that case, all we are appending is the current entry. |
duke@435 | 399 | if (new_klass_ref_i == 0) { |
duke@435 | 400 | new_klass_ref_i = klass_ref_i; |
duke@435 | 401 | } |
duke@435 | 402 | if (new_name_and_type_ref_i == 0) { |
duke@435 | 403 | new_name_and_type_ref_i = name_and_type_ref_i; |
duke@435 | 404 | } |
duke@435 | 405 | |
duke@435 | 406 | const char *entry_name; |
duke@435 | 407 | switch (scratch_cp->tag_at(scratch_i).value()) { |
duke@435 | 408 | case JVM_CONSTANT_Fieldref: |
duke@435 | 409 | entry_name = "Fieldref"; |
duke@435 | 410 | (*merge_cp_p)->field_at_put(*merge_cp_length_p, new_klass_ref_i, |
duke@435 | 411 | new_name_and_type_ref_i); |
duke@435 | 412 | break; |
duke@435 | 413 | case JVM_CONSTANT_InterfaceMethodref: |
duke@435 | 414 | entry_name = "IFMethodref"; |
duke@435 | 415 | (*merge_cp_p)->interface_method_at_put(*merge_cp_length_p, |
duke@435 | 416 | new_klass_ref_i, new_name_and_type_ref_i); |
duke@435 | 417 | break; |
duke@435 | 418 | case JVM_CONSTANT_Methodref: |
duke@435 | 419 | entry_name = "Methodref"; |
duke@435 | 420 | (*merge_cp_p)->method_at_put(*merge_cp_length_p, new_klass_ref_i, |
duke@435 | 421 | new_name_and_type_ref_i); |
duke@435 | 422 | break; |
duke@435 | 423 | default: |
duke@435 | 424 | guarantee(false, "bad switch"); |
duke@435 | 425 | break; |
duke@435 | 426 | } |
duke@435 | 427 | |
duke@435 | 428 | if (klass_ref_i != new_klass_ref_i) { |
duke@435 | 429 | RC_TRACE(0x00080000, ("%s entry@%d class_index changed: %d to %d", |
duke@435 | 430 | entry_name, *merge_cp_length_p, klass_ref_i, new_klass_ref_i)); |
duke@435 | 431 | } |
duke@435 | 432 | if (name_and_type_ref_i != new_name_and_type_ref_i) { |
duke@435 | 433 | RC_TRACE(0x00080000, |
duke@435 | 434 | ("%s entry@%d name_and_type_index changed: %d to %d", |
duke@435 | 435 | entry_name, *merge_cp_length_p, name_and_type_ref_i, |
duke@435 | 436 | new_name_and_type_ref_i)); |
duke@435 | 437 | } |
duke@435 | 438 | |
duke@435 | 439 | if (scratch_i != *merge_cp_length_p) { |
duke@435 | 440 | // The new entry in *merge_cp_p is at a different index than |
duke@435 | 441 | // the new entry in scratch_cp so we need to map the index values. |
duke@435 | 442 | map_index(scratch_cp, scratch_i, *merge_cp_length_p); |
duke@435 | 443 | } |
duke@435 | 444 | (*merge_cp_length_p)++; |
duke@435 | 445 | } break; |
duke@435 | 446 | |
duke@435 | 447 | // At this stage, Class or UnresolvedClass could be here, but not |
duke@435 | 448 | // ClassIndex |
duke@435 | 449 | case JVM_CONSTANT_ClassIndex: // fall through |
duke@435 | 450 | |
duke@435 | 451 | // Invalid is used as the tag for the second constant pool entry |
duke@435 | 452 | // occupied by JVM_CONSTANT_Double or JVM_CONSTANT_Long. It should |
duke@435 | 453 | // not be seen by itself. |
duke@435 | 454 | case JVM_CONSTANT_Invalid: // fall through |
duke@435 | 455 | |
duke@435 | 456 | // At this stage, String or UnresolvedString could be here, but not |
duke@435 | 457 | // StringIndex |
duke@435 | 458 | case JVM_CONSTANT_StringIndex: // fall through |
duke@435 | 459 | |
duke@435 | 460 | // At this stage JVM_CONSTANT_UnresolvedClassInError should not be |
duke@435 | 461 | // here |
duke@435 | 462 | case JVM_CONSTANT_UnresolvedClassInError: // fall through |
duke@435 | 463 | |
duke@435 | 464 | default: |
duke@435 | 465 | { |
duke@435 | 466 | // leave a breadcrumb |
duke@435 | 467 | jbyte bad_value = scratch_cp->tag_at(scratch_i).value(); |
duke@435 | 468 | ShouldNotReachHere(); |
duke@435 | 469 | } break; |
duke@435 | 470 | } // end switch tag value |
duke@435 | 471 | } // end append_entry() |
duke@435 | 472 | |
duke@435 | 473 | |
duke@435 | 474 | void VM_RedefineClasses::swap_all_method_annotations(int i, int j, instanceKlassHandle scratch_class) { |
duke@435 | 475 | typeArrayOop save; |
duke@435 | 476 | |
duke@435 | 477 | save = scratch_class->get_method_annotations_of(i); |
duke@435 | 478 | scratch_class->set_method_annotations_of(i, scratch_class->get_method_annotations_of(j)); |
duke@435 | 479 | scratch_class->set_method_annotations_of(j, save); |
duke@435 | 480 | |
duke@435 | 481 | save = scratch_class->get_method_parameter_annotations_of(i); |
duke@435 | 482 | scratch_class->set_method_parameter_annotations_of(i, scratch_class->get_method_parameter_annotations_of(j)); |
duke@435 | 483 | scratch_class->set_method_parameter_annotations_of(j, save); |
duke@435 | 484 | |
duke@435 | 485 | save = scratch_class->get_method_default_annotations_of(i); |
duke@435 | 486 | scratch_class->set_method_default_annotations_of(i, scratch_class->get_method_default_annotations_of(j)); |
duke@435 | 487 | scratch_class->set_method_default_annotations_of(j, save); |
duke@435 | 488 | } |
duke@435 | 489 | |
duke@435 | 490 | |
duke@435 | 491 | jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions( |
duke@435 | 492 | instanceKlassHandle the_class, |
duke@435 | 493 | instanceKlassHandle scratch_class) { |
duke@435 | 494 | int i; |
duke@435 | 495 | |
duke@435 | 496 | // Check superclasses, or rather their names, since superclasses themselves can be |
duke@435 | 497 | // requested to replace. |
duke@435 | 498 | // Check for NULL superclass first since this might be java.lang.Object |
duke@435 | 499 | if (the_class->super() != scratch_class->super() && |
duke@435 | 500 | (the_class->super() == NULL || scratch_class->super() == NULL || |
duke@435 | 501 | Klass::cast(the_class->super())->name() != |
duke@435 | 502 | Klass::cast(scratch_class->super())->name())) { |
duke@435 | 503 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED; |
duke@435 | 504 | } |
duke@435 | 505 | |
duke@435 | 506 | // Check if the number, names and order of directly implemented interfaces are the same. |
duke@435 | 507 | // I think in principle we should just check if the sets of names of directly implemented |
duke@435 | 508 | // interfaces are the same, i.e. the order of declaration (which, however, if changed in the |
duke@435 | 509 | // .java file, also changes in .class file) should not matter. However, comparing sets is |
duke@435 | 510 | // technically a bit more difficult, and, more importantly, I am not sure at present that the |
duke@435 | 511 | // order of interfaces does not matter on the implementation level, i.e. that the VM does not |
duke@435 | 512 | // rely on it somewhere. |
duke@435 | 513 | objArrayOop k_interfaces = the_class->local_interfaces(); |
duke@435 | 514 | objArrayOop k_new_interfaces = scratch_class->local_interfaces(); |
duke@435 | 515 | int n_intfs = k_interfaces->length(); |
duke@435 | 516 | if (n_intfs != k_new_interfaces->length()) { |
duke@435 | 517 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED; |
duke@435 | 518 | } |
duke@435 | 519 | for (i = 0; i < n_intfs; i++) { |
duke@435 | 520 | if (Klass::cast((klassOop) k_interfaces->obj_at(i))->name() != |
duke@435 | 521 | Klass::cast((klassOop) k_new_interfaces->obj_at(i))->name()) { |
duke@435 | 522 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED; |
duke@435 | 523 | } |
duke@435 | 524 | } |
duke@435 | 525 | |
duke@435 | 526 | // Check whether class is in the error init state. |
duke@435 | 527 | if (the_class->is_in_error_state()) { |
duke@435 | 528 | // TBD #5057930: special error code is needed in 1.6 |
duke@435 | 529 | return JVMTI_ERROR_INVALID_CLASS; |
duke@435 | 530 | } |
duke@435 | 531 | |
duke@435 | 532 | // Check whether class modifiers are the same. |
duke@435 | 533 | jushort old_flags = (jushort) the_class->access_flags().get_flags(); |
duke@435 | 534 | jushort new_flags = (jushort) scratch_class->access_flags().get_flags(); |
duke@435 | 535 | if (old_flags != new_flags) { |
duke@435 | 536 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED; |
duke@435 | 537 | } |
duke@435 | 538 | |
duke@435 | 539 | // Check if the number, names, types and order of fields declared in these classes |
duke@435 | 540 | // are the same. |
duke@435 | 541 | typeArrayOop k_old_fields = the_class->fields(); |
duke@435 | 542 | typeArrayOop k_new_fields = scratch_class->fields(); |
duke@435 | 543 | int n_fields = k_old_fields->length(); |
duke@435 | 544 | if (n_fields != k_new_fields->length()) { |
duke@435 | 545 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; |
duke@435 | 546 | } |
duke@435 | 547 | |
duke@435 | 548 | for (i = 0; i < n_fields; i += instanceKlass::next_offset) { |
duke@435 | 549 | // access |
duke@435 | 550 | old_flags = k_old_fields->ushort_at(i + instanceKlass::access_flags_offset); |
duke@435 | 551 | new_flags = k_new_fields->ushort_at(i + instanceKlass::access_flags_offset); |
duke@435 | 552 | if ((old_flags ^ new_flags) & JVM_RECOGNIZED_FIELD_MODIFIERS) { |
duke@435 | 553 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; |
duke@435 | 554 | } |
duke@435 | 555 | // offset |
duke@435 | 556 | if (k_old_fields->short_at(i + instanceKlass::low_offset) != |
duke@435 | 557 | k_new_fields->short_at(i + instanceKlass::low_offset) || |
duke@435 | 558 | k_old_fields->short_at(i + instanceKlass::high_offset) != |
duke@435 | 559 | k_new_fields->short_at(i + instanceKlass::high_offset)) { |
duke@435 | 560 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; |
duke@435 | 561 | } |
duke@435 | 562 | // name and signature |
duke@435 | 563 | jshort name_index = k_old_fields->short_at(i + instanceKlass::name_index_offset); |
duke@435 | 564 | jshort sig_index = k_old_fields->short_at(i +instanceKlass::signature_index_offset); |
duke@435 | 565 | symbolOop name_sym1 = the_class->constants()->symbol_at(name_index); |
duke@435 | 566 | symbolOop sig_sym1 = the_class->constants()->symbol_at(sig_index); |
duke@435 | 567 | name_index = k_new_fields->short_at(i + instanceKlass::name_index_offset); |
duke@435 | 568 | sig_index = k_new_fields->short_at(i + instanceKlass::signature_index_offset); |
duke@435 | 569 | symbolOop name_sym2 = scratch_class->constants()->symbol_at(name_index); |
duke@435 | 570 | symbolOop sig_sym2 = scratch_class->constants()->symbol_at(sig_index); |
duke@435 | 571 | if (name_sym1 != name_sym2 || sig_sym1 != sig_sym2) { |
duke@435 | 572 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; |
duke@435 | 573 | } |
duke@435 | 574 | } |
duke@435 | 575 | |
duke@435 | 576 | // Do a parallel walk through the old and new methods. Detect |
duke@435 | 577 | // cases where they match (exist in both), have been added in |
duke@435 | 578 | // the new methods, or have been deleted (exist only in the |
duke@435 | 579 | // old methods). The class file parser places methods in order |
duke@435 | 580 | // by method name, but does not order overloaded methods by |
duke@435 | 581 | // signature. In order to determine what fate befell the methods, |
duke@435 | 582 | // this code places the overloaded new methods that have matching |
duke@435 | 583 | // old methods in the same order as the old methods and places |
duke@435 | 584 | // new overloaded methods at the end of overloaded methods of |
duke@435 | 585 | // that name. The code for this order normalization is adapted |
duke@435 | 586 | // from the algorithm used in instanceKlass::find_method(). |
duke@435 | 587 | // Since we are swapping out of order entries as we find them, |
duke@435 | 588 | // we only have to search forward through the overloaded methods. |
duke@435 | 589 | // Methods which are added and have the same name as an existing |
duke@435 | 590 | // method (but different signature) will be put at the end of |
duke@435 | 591 | // the methods with that name, and the name mismatch code will |
duke@435 | 592 | // handle them. |
duke@435 | 593 | objArrayHandle k_old_methods(the_class->methods()); |
duke@435 | 594 | objArrayHandle k_new_methods(scratch_class->methods()); |
duke@435 | 595 | int n_old_methods = k_old_methods->length(); |
duke@435 | 596 | int n_new_methods = k_new_methods->length(); |
duke@435 | 597 | |
duke@435 | 598 | int ni = 0; |
duke@435 | 599 | int oi = 0; |
duke@435 | 600 | while (true) { |
duke@435 | 601 | methodOop k_old_method; |
duke@435 | 602 | methodOop k_new_method; |
duke@435 | 603 | enum { matched, added, deleted, undetermined } method_was = undetermined; |
duke@435 | 604 | |
duke@435 | 605 | if (oi >= n_old_methods) { |
duke@435 | 606 | if (ni >= n_new_methods) { |
duke@435 | 607 | break; // we've looked at everything, done |
duke@435 | 608 | } |
duke@435 | 609 | // New method at the end |
duke@435 | 610 | k_new_method = (methodOop) k_new_methods->obj_at(ni); |
duke@435 | 611 | method_was = added; |
duke@435 | 612 | } else if (ni >= n_new_methods) { |
duke@435 | 613 | // Old method, at the end, is deleted |
duke@435 | 614 | k_old_method = (methodOop) k_old_methods->obj_at(oi); |
duke@435 | 615 | method_was = deleted; |
duke@435 | 616 | } else { |
duke@435 | 617 | // There are more methods in both the old and new lists |
duke@435 | 618 | k_old_method = (methodOop) k_old_methods->obj_at(oi); |
duke@435 | 619 | k_new_method = (methodOop) k_new_methods->obj_at(ni); |
duke@435 | 620 | if (k_old_method->name() != k_new_method->name()) { |
duke@435 | 621 | // Methods are sorted by method name, so a mismatch means added |
duke@435 | 622 | // or deleted |
duke@435 | 623 | if (k_old_method->name()->fast_compare(k_new_method->name()) > 0) { |
duke@435 | 624 | method_was = added; |
duke@435 | 625 | } else { |
duke@435 | 626 | method_was = deleted; |
duke@435 | 627 | } |
duke@435 | 628 | } else if (k_old_method->signature() == k_new_method->signature()) { |
duke@435 | 629 | // Both the name and signature match |
duke@435 | 630 | method_was = matched; |
duke@435 | 631 | } else { |
duke@435 | 632 | // The name matches, but the signature doesn't, which means we have to |
duke@435 | 633 | // search forward through the new overloaded methods. |
duke@435 | 634 | int nj; // outside the loop for post-loop check |
duke@435 | 635 | for (nj = ni + 1; nj < n_new_methods; nj++) { |
duke@435 | 636 | methodOop m = (methodOop)k_new_methods->obj_at(nj); |
duke@435 | 637 | if (k_old_method->name() != m->name()) { |
duke@435 | 638 | // reached another method name so no more overloaded methods |
duke@435 | 639 | method_was = deleted; |
duke@435 | 640 | break; |
duke@435 | 641 | } |
duke@435 | 642 | if (k_old_method->signature() == m->signature()) { |
duke@435 | 643 | // found a match so swap the methods |
duke@435 | 644 | k_new_methods->obj_at_put(ni, m); |
duke@435 | 645 | k_new_methods->obj_at_put(nj, k_new_method); |
duke@435 | 646 | k_new_method = m; |
duke@435 | 647 | method_was = matched; |
duke@435 | 648 | break; |
duke@435 | 649 | } |
duke@435 | 650 | } |
duke@435 | 651 | |
duke@435 | 652 | if (nj >= n_new_methods) { |
duke@435 | 653 | // reached the end without a match; so method was deleted |
duke@435 | 654 | method_was = deleted; |
duke@435 | 655 | } |
duke@435 | 656 | } |
duke@435 | 657 | } |
duke@435 | 658 | |
duke@435 | 659 | switch (method_was) { |
duke@435 | 660 | case matched: |
duke@435 | 661 | // methods match, be sure modifiers do too |
duke@435 | 662 | old_flags = (jushort) k_old_method->access_flags().get_flags(); |
duke@435 | 663 | new_flags = (jushort) k_new_method->access_flags().get_flags(); |
duke@435 | 664 | if ((old_flags ^ new_flags) & ~(JVM_ACC_NATIVE)) { |
duke@435 | 665 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED; |
duke@435 | 666 | } |
duke@435 | 667 | { |
duke@435 | 668 | u2 new_num = k_new_method->method_idnum(); |
duke@435 | 669 | u2 old_num = k_old_method->method_idnum(); |
duke@435 | 670 | if (new_num != old_num) { |
duke@435 | 671 | methodOop idnum_owner = scratch_class->method_with_idnum(old_num); |
duke@435 | 672 | if (idnum_owner != NULL) { |
duke@435 | 673 | // There is already a method assigned this idnum -- switch them |
duke@435 | 674 | idnum_owner->set_method_idnum(new_num); |
duke@435 | 675 | } |
duke@435 | 676 | k_new_method->set_method_idnum(old_num); |
duke@435 | 677 | swap_all_method_annotations(old_num, new_num, scratch_class); |
duke@435 | 678 | } |
duke@435 | 679 | } |
duke@435 | 680 | RC_TRACE(0x00008000, ("Method matched: new: %s [%d] == old: %s [%d]", |
duke@435 | 681 | k_new_method->name_and_sig_as_C_string(), ni, |
duke@435 | 682 | k_old_method->name_and_sig_as_C_string(), oi)); |
duke@435 | 683 | // advance to next pair of methods |
duke@435 | 684 | ++oi; |
duke@435 | 685 | ++ni; |
duke@435 | 686 | break; |
duke@435 | 687 | case added: |
duke@435 | 688 | // method added, see if it is OK |
duke@435 | 689 | new_flags = (jushort) k_new_method->access_flags().get_flags(); |
duke@435 | 690 | if ((new_flags & JVM_ACC_PRIVATE) == 0 |
duke@435 | 691 | // hack: private should be treated as final, but alas |
duke@435 | 692 | || (new_flags & (JVM_ACC_FINAL|JVM_ACC_STATIC)) == 0 |
duke@435 | 693 | ) { |
duke@435 | 694 | // new methods must be private |
duke@435 | 695 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_ADDED; |
duke@435 | 696 | } |
duke@435 | 697 | { |
duke@435 | 698 | u2 num = the_class->next_method_idnum(); |
duke@435 | 699 | if (num == constMethodOopDesc::UNSET_IDNUM) { |
duke@435 | 700 | // cannot add any more methods |
duke@435 | 701 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_ADDED; |
duke@435 | 702 | } |
duke@435 | 703 | u2 new_num = k_new_method->method_idnum(); |
duke@435 | 704 | methodOop idnum_owner = scratch_class->method_with_idnum(num); |
duke@435 | 705 | if (idnum_owner != NULL) { |
duke@435 | 706 | // There is already a method assigned this idnum -- switch them |
duke@435 | 707 | idnum_owner->set_method_idnum(new_num); |
duke@435 | 708 | } |
duke@435 | 709 | k_new_method->set_method_idnum(num); |
duke@435 | 710 | swap_all_method_annotations(new_num, num, scratch_class); |
duke@435 | 711 | } |
duke@435 | 712 | RC_TRACE(0x00008000, ("Method added: new: %s [%d]", |
duke@435 | 713 | k_new_method->name_and_sig_as_C_string(), ni)); |
duke@435 | 714 | ++ni; // advance to next new method |
duke@435 | 715 | break; |
duke@435 | 716 | case deleted: |
duke@435 | 717 | // method deleted, see if it is OK |
duke@435 | 718 | old_flags = (jushort) k_old_method->access_flags().get_flags(); |
duke@435 | 719 | if ((old_flags & JVM_ACC_PRIVATE) == 0 |
duke@435 | 720 | // hack: private should be treated as final, but alas |
duke@435 | 721 | || (old_flags & (JVM_ACC_FINAL|JVM_ACC_STATIC)) == 0 |
duke@435 | 722 | ) { |
duke@435 | 723 | // deleted methods must be private |
duke@435 | 724 | return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_DELETED; |
duke@435 | 725 | } |
duke@435 | 726 | RC_TRACE(0x00008000, ("Method deleted: old: %s [%d]", |
duke@435 | 727 | k_old_method->name_and_sig_as_C_string(), oi)); |
duke@435 | 728 | ++oi; // advance to next old method |
duke@435 | 729 | break; |
duke@435 | 730 | default: |
duke@435 | 731 | ShouldNotReachHere(); |
duke@435 | 732 | } |
duke@435 | 733 | } |
duke@435 | 734 | |
duke@435 | 735 | return JVMTI_ERROR_NONE; |
duke@435 | 736 | } |
duke@435 | 737 | |
duke@435 | 738 | |
duke@435 | 739 | // Find new constant pool index value for old constant pool index value |
duke@435 | 740 | // by seaching the index map. Returns zero (0) if there is no mapped |
duke@435 | 741 | // value for the old constant pool index. |
duke@435 | 742 | int VM_RedefineClasses::find_new_index(int old_index) { |
duke@435 | 743 | if (_index_map_count == 0) { |
duke@435 | 744 | // map is empty so nothing can be found |
duke@435 | 745 | return 0; |
duke@435 | 746 | } |
duke@435 | 747 | |
duke@435 | 748 | if (old_index < 1 || old_index >= _index_map_p->length()) { |
duke@435 | 749 | // The old_index is out of range so it is not mapped. This should |
duke@435 | 750 | // not happen in regular constant pool merging use, but it can |
duke@435 | 751 | // happen if a corrupt annotation is processed. |
duke@435 | 752 | return 0; |
duke@435 | 753 | } |
duke@435 | 754 | |
duke@435 | 755 | int value = _index_map_p->at(old_index); |
duke@435 | 756 | if (value == -1) { |
duke@435 | 757 | // the old_index is not mapped |
duke@435 | 758 | return 0; |
duke@435 | 759 | } |
duke@435 | 760 | |
duke@435 | 761 | return value; |
duke@435 | 762 | } // end find_new_index() |
duke@435 | 763 | |
duke@435 | 764 | |
duke@435 | 765 | // Returns true if the current mismatch is due to a resolved/unresolved |
duke@435 | 766 | // class pair. Otherwise, returns false. |
duke@435 | 767 | bool VM_RedefineClasses::is_unresolved_class_mismatch(constantPoolHandle cp1, |
duke@435 | 768 | int index1, constantPoolHandle cp2, int index2) { |
duke@435 | 769 | |
duke@435 | 770 | jbyte t1 = cp1->tag_at(index1).value(); |
duke@435 | 771 | if (t1 != JVM_CONSTANT_Class && t1 != JVM_CONSTANT_UnresolvedClass) { |
duke@435 | 772 | return false; // wrong entry type; not our special case |
duke@435 | 773 | } |
duke@435 | 774 | |
duke@435 | 775 | jbyte t2 = cp2->tag_at(index2).value(); |
duke@435 | 776 | if (t2 != JVM_CONSTANT_Class && t2 != JVM_CONSTANT_UnresolvedClass) { |
duke@435 | 777 | return false; // wrong entry type; not our special case |
duke@435 | 778 | } |
duke@435 | 779 | |
duke@435 | 780 | if (t1 == t2) { |
duke@435 | 781 | return false; // not a mismatch; not our special case |
duke@435 | 782 | } |
duke@435 | 783 | |
duke@435 | 784 | char *s1 = cp1->klass_name_at(index1)->as_C_string(); |
duke@435 | 785 | char *s2 = cp2->klass_name_at(index2)->as_C_string(); |
duke@435 | 786 | if (strcmp(s1, s2) != 0) { |
duke@435 | 787 | return false; // strings don't match; not our special case |
duke@435 | 788 | } |
duke@435 | 789 | |
duke@435 | 790 | return true; // made it through the gauntlet; this is our special case |
duke@435 | 791 | } // end is_unresolved_class_mismatch() |
duke@435 | 792 | |
duke@435 | 793 | |
duke@435 | 794 | // Returns true if the current mismatch is due to a resolved/unresolved |
duke@435 | 795 | // string pair. Otherwise, returns false. |
duke@435 | 796 | bool VM_RedefineClasses::is_unresolved_string_mismatch(constantPoolHandle cp1, |
duke@435 | 797 | int index1, constantPoolHandle cp2, int index2) { |
duke@435 | 798 | |
duke@435 | 799 | jbyte t1 = cp1->tag_at(index1).value(); |
duke@435 | 800 | if (t1 != JVM_CONSTANT_String && t1 != JVM_CONSTANT_UnresolvedString) { |
duke@435 | 801 | return false; // wrong entry type; not our special case |
duke@435 | 802 | } |
duke@435 | 803 | |
duke@435 | 804 | jbyte t2 = cp2->tag_at(index2).value(); |
duke@435 | 805 | if (t2 != JVM_CONSTANT_String && t2 != JVM_CONSTANT_UnresolvedString) { |
duke@435 | 806 | return false; // wrong entry type; not our special case |
duke@435 | 807 | } |
duke@435 | 808 | |
duke@435 | 809 | if (t1 == t2) { |
duke@435 | 810 | return false; // not a mismatch; not our special case |
duke@435 | 811 | } |
duke@435 | 812 | |
duke@435 | 813 | char *s1 = cp1->string_at_noresolve(index1); |
duke@435 | 814 | char *s2 = cp2->string_at_noresolve(index2); |
duke@435 | 815 | if (strcmp(s1, s2) != 0) { |
duke@435 | 816 | return false; // strings don't match; not our special case |
duke@435 | 817 | } |
duke@435 | 818 | |
duke@435 | 819 | return true; // made it through the gauntlet; this is our special case |
duke@435 | 820 | } // end is_unresolved_string_mismatch() |
duke@435 | 821 | |
duke@435 | 822 | |
duke@435 | 823 | jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) { |
duke@435 | 824 | // For consistency allocate memory using os::malloc wrapper. |
duke@435 | 825 | _scratch_classes = (instanceKlassHandle *) |
duke@435 | 826 | os::malloc(sizeof(instanceKlassHandle) * _class_count); |
duke@435 | 827 | if (_scratch_classes == NULL) { |
duke@435 | 828 | return JVMTI_ERROR_OUT_OF_MEMORY; |
duke@435 | 829 | } |
duke@435 | 830 | |
duke@435 | 831 | ResourceMark rm(THREAD); |
duke@435 | 832 | |
duke@435 | 833 | JvmtiThreadState *state = JvmtiThreadState::state_for(JavaThread::current()); |
dcubed@1044 | 834 | // state can only be NULL if the current thread is exiting which |
dcubed@1044 | 835 | // should not happen since we're trying to do a RedefineClasses |
dcubed@1044 | 836 | guarantee(state != NULL, "exiting thread calling load_new_class_versions"); |
duke@435 | 837 | for (int i = 0; i < _class_count; i++) { |
duke@435 | 838 | oop mirror = JNIHandles::resolve_non_null(_class_defs[i].klass); |
duke@435 | 839 | // classes for primitives cannot be redefined |
duke@435 | 840 | if (!is_modifiable_class(mirror)) { |
duke@435 | 841 | return JVMTI_ERROR_UNMODIFIABLE_CLASS; |
duke@435 | 842 | } |
duke@435 | 843 | klassOop the_class_oop = java_lang_Class::as_klassOop(mirror); |
duke@435 | 844 | instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop); |
duke@435 | 845 | symbolHandle the_class_sym = symbolHandle(THREAD, the_class->name()); |
duke@435 | 846 | |
duke@435 | 847 | // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
duke@435 | 848 | RC_TRACE_WITH_THREAD(0x00000001, THREAD, |
duke@435 | 849 | ("loading name=%s (avail_mem=" UINT64_FORMAT "K)", |
duke@435 | 850 | the_class->external_name(), os::available_memory() >> 10)); |
duke@435 | 851 | |
duke@435 | 852 | ClassFileStream st((u1*) _class_defs[i].class_bytes, |
duke@435 | 853 | _class_defs[i].class_byte_count, (char *)"__VM_RedefineClasses__"); |
duke@435 | 854 | |
duke@435 | 855 | // Parse the stream. |
duke@435 | 856 | Handle the_class_loader(THREAD, the_class->class_loader()); |
duke@435 | 857 | Handle protection_domain(THREAD, the_class->protection_domain()); |
duke@435 | 858 | // Set redefined class handle in JvmtiThreadState class. |
duke@435 | 859 | // This redefined class is sent to agent event handler for class file |
duke@435 | 860 | // load hook event. |
duke@435 | 861 | state->set_class_being_redefined(&the_class, _class_load_kind); |
duke@435 | 862 | |
duke@435 | 863 | klassOop k = SystemDictionary::parse_stream(the_class_sym, |
duke@435 | 864 | the_class_loader, |
duke@435 | 865 | protection_domain, |
duke@435 | 866 | &st, |
duke@435 | 867 | THREAD); |
duke@435 | 868 | // Clear class_being_redefined just to be sure. |
duke@435 | 869 | state->clear_class_being_redefined(); |
duke@435 | 870 | |
duke@435 | 871 | // TODO: if this is retransform, and nothing changed we can skip it |
duke@435 | 872 | |
duke@435 | 873 | instanceKlassHandle scratch_class (THREAD, k); |
duke@435 | 874 | |
duke@435 | 875 | if (HAS_PENDING_EXCEPTION) { |
duke@435 | 876 | symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); |
duke@435 | 877 | // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
duke@435 | 878 | RC_TRACE_WITH_THREAD(0x00000002, THREAD, ("parse_stream exception: '%s'", |
duke@435 | 879 | ex_name->as_C_string())); |
duke@435 | 880 | CLEAR_PENDING_EXCEPTION; |
duke@435 | 881 | |
duke@435 | 882 | if (ex_name == vmSymbols::java_lang_UnsupportedClassVersionError()) { |
duke@435 | 883 | return JVMTI_ERROR_UNSUPPORTED_VERSION; |
duke@435 | 884 | } else if (ex_name == vmSymbols::java_lang_ClassFormatError()) { |
duke@435 | 885 | return JVMTI_ERROR_INVALID_CLASS_FORMAT; |
duke@435 | 886 | } else if (ex_name == vmSymbols::java_lang_ClassCircularityError()) { |
duke@435 | 887 | return JVMTI_ERROR_CIRCULAR_CLASS_DEFINITION; |
duke@435 | 888 | } else if (ex_name == vmSymbols::java_lang_NoClassDefFoundError()) { |
duke@435 | 889 | // The message will be "XXX (wrong name: YYY)" |
duke@435 | 890 | return JVMTI_ERROR_NAMES_DONT_MATCH; |
duke@435 | 891 | } else if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) { |
duke@435 | 892 | return JVMTI_ERROR_OUT_OF_MEMORY; |
duke@435 | 893 | } else { // Just in case more exceptions can be thrown.. |
duke@435 | 894 | return JVMTI_ERROR_FAILS_VERIFICATION; |
duke@435 | 895 | } |
duke@435 | 896 | } |
duke@435 | 897 | |
duke@435 | 898 | // Ensure class is linked before redefine |
duke@435 | 899 | if (!the_class->is_linked()) { |
duke@435 | 900 | the_class->link_class(THREAD); |
duke@435 | 901 | if (HAS_PENDING_EXCEPTION) { |
duke@435 | 902 | symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); |
duke@435 | 903 | // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
duke@435 | 904 | RC_TRACE_WITH_THREAD(0x00000002, THREAD, ("link_class exception: '%s'", |
duke@435 | 905 | ex_name->as_C_string())); |
duke@435 | 906 | CLEAR_PENDING_EXCEPTION; |
duke@435 | 907 | if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) { |
duke@435 | 908 | return JVMTI_ERROR_OUT_OF_MEMORY; |
duke@435 | 909 | } else { |
duke@435 | 910 | return JVMTI_ERROR_INTERNAL; |
duke@435 | 911 | } |
duke@435 | 912 | } |
duke@435 | 913 | } |
duke@435 | 914 | |
duke@435 | 915 | // Do the validity checks in compare_and_normalize_class_versions() |
duke@435 | 916 | // before verifying the byte codes. By doing these checks first, we |
duke@435 | 917 | // limit the number of functions that require redirection from |
duke@435 | 918 | // the_class to scratch_class. In particular, we don't have to |
duke@435 | 919 | // modify JNI GetSuperclass() and thus won't change its performance. |
duke@435 | 920 | jvmtiError res = compare_and_normalize_class_versions(the_class, |
duke@435 | 921 | scratch_class); |
duke@435 | 922 | if (res != JVMTI_ERROR_NONE) { |
duke@435 | 923 | return res; |
duke@435 | 924 | } |
duke@435 | 925 | |
duke@435 | 926 | // verify what the caller passed us |
duke@435 | 927 | { |
duke@435 | 928 | // The bug 6214132 caused the verification to fail. |
duke@435 | 929 | // Information about the_class and scratch_class is temporarily |
duke@435 | 930 | // recorded into jvmtiThreadState. This data is used to redirect |
duke@435 | 931 | // the_class to scratch_class in the JVM_* functions called by the |
duke@435 | 932 | // verifier. Please, refer to jvmtiThreadState.hpp for the detailed |
duke@435 | 933 | // description. |
duke@435 | 934 | RedefineVerifyMark rvm(&the_class, &scratch_class, state); |
duke@435 | 935 | Verifier::verify( |
acorn@1408 | 936 | scratch_class, Verifier::ThrowException, true, THREAD); |
duke@435 | 937 | } |
duke@435 | 938 | |
duke@435 | 939 | if (HAS_PENDING_EXCEPTION) { |
duke@435 | 940 | symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); |
duke@435 | 941 | // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
duke@435 | 942 | RC_TRACE_WITH_THREAD(0x00000002, THREAD, |
duke@435 | 943 | ("verify_byte_codes exception: '%s'", ex_name->as_C_string())); |
duke@435 | 944 | CLEAR_PENDING_EXCEPTION; |
duke@435 | 945 | if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) { |
duke@435 | 946 | return JVMTI_ERROR_OUT_OF_MEMORY; |
duke@435 | 947 | } else { |
duke@435 | 948 | // tell the caller the bytecodes are bad |
duke@435 | 949 | return JVMTI_ERROR_FAILS_VERIFICATION; |
duke@435 | 950 | } |
duke@435 | 951 | } |
duke@435 | 952 | |
duke@435 | 953 | res = merge_cp_and_rewrite(the_class, scratch_class, THREAD); |
duke@435 | 954 | if (res != JVMTI_ERROR_NONE) { |
duke@435 | 955 | return res; |
duke@435 | 956 | } |
duke@435 | 957 | |
duke@435 | 958 | if (VerifyMergedCPBytecodes) { |
duke@435 | 959 | // verify what we have done during constant pool merging |
duke@435 | 960 | { |
duke@435 | 961 | RedefineVerifyMark rvm(&the_class, &scratch_class, state); |
acorn@1408 | 962 | Verifier::verify(scratch_class, Verifier::ThrowException, true, THREAD); |
duke@435 | 963 | } |
duke@435 | 964 | |
duke@435 | 965 | if (HAS_PENDING_EXCEPTION) { |
duke@435 | 966 | symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); |
duke@435 | 967 | // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
duke@435 | 968 | RC_TRACE_WITH_THREAD(0x00000002, THREAD, |
duke@435 | 969 | ("verify_byte_codes post merge-CP exception: '%s'", |
duke@435 | 970 | ex_name->as_C_string())); |
duke@435 | 971 | CLEAR_PENDING_EXCEPTION; |
duke@435 | 972 | if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) { |
duke@435 | 973 | return JVMTI_ERROR_OUT_OF_MEMORY; |
duke@435 | 974 | } else { |
duke@435 | 975 | // tell the caller that constant pool merging screwed up |
duke@435 | 976 | return JVMTI_ERROR_INTERNAL; |
duke@435 | 977 | } |
duke@435 | 978 | } |
duke@435 | 979 | } |
duke@435 | 980 | |
duke@435 | 981 | Rewriter::rewrite(scratch_class, THREAD); |
duke@435 | 982 | if (HAS_PENDING_EXCEPTION) { |
duke@435 | 983 | symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); |
duke@435 | 984 | CLEAR_PENDING_EXCEPTION; |
duke@435 | 985 | if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) { |
duke@435 | 986 | return JVMTI_ERROR_OUT_OF_MEMORY; |
duke@435 | 987 | } else { |
duke@435 | 988 | return JVMTI_ERROR_INTERNAL; |
duke@435 | 989 | } |
duke@435 | 990 | } |
duke@435 | 991 | |
duke@435 | 992 | _scratch_classes[i] = scratch_class; |
duke@435 | 993 | |
duke@435 | 994 | // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
duke@435 | 995 | RC_TRACE_WITH_THREAD(0x00000001, THREAD, |
duke@435 | 996 | ("loaded name=%s (avail_mem=" UINT64_FORMAT "K)", |
duke@435 | 997 | the_class->external_name(), os::available_memory() >> 10)); |
duke@435 | 998 | } |
duke@435 | 999 | |
duke@435 | 1000 | return JVMTI_ERROR_NONE; |
duke@435 | 1001 | } |
duke@435 | 1002 | |
duke@435 | 1003 | |
duke@435 | 1004 | // Map old_index to new_index as needed. scratch_cp is only needed |
duke@435 | 1005 | // for RC_TRACE() calls. |
duke@435 | 1006 | void VM_RedefineClasses::map_index(constantPoolHandle scratch_cp, |
duke@435 | 1007 | int old_index, int new_index) { |
duke@435 | 1008 | if (find_new_index(old_index) != 0) { |
duke@435 | 1009 | // old_index is already mapped |
duke@435 | 1010 | return; |
duke@435 | 1011 | } |
duke@435 | 1012 | |
duke@435 | 1013 | if (old_index == new_index) { |
duke@435 | 1014 | // no mapping is needed |
duke@435 | 1015 | return; |
duke@435 | 1016 | } |
duke@435 | 1017 | |
duke@435 | 1018 | _index_map_p->at_put(old_index, new_index); |
duke@435 | 1019 | _index_map_count++; |
duke@435 | 1020 | |
duke@435 | 1021 | RC_TRACE(0x00040000, ("mapped tag %d at index %d to %d", |
duke@435 | 1022 | scratch_cp->tag_at(old_index).value(), old_index, new_index)); |
duke@435 | 1023 | } // end map_index() |
duke@435 | 1024 | |
duke@435 | 1025 | |
duke@435 | 1026 | // Merge old_cp and scratch_cp and return the results of the merge via |
duke@435 | 1027 | // merge_cp_p. The number of entries in *merge_cp_p is returned via |
duke@435 | 1028 | // merge_cp_length_p. The entries in old_cp occupy the same locations |
duke@435 | 1029 | // in *merge_cp_p. Also creates a map of indices from entries in |
duke@435 | 1030 | // scratch_cp to the corresponding entry in *merge_cp_p. Index map |
duke@435 | 1031 | // entries are only created for entries in scratch_cp that occupy a |
duke@435 | 1032 | // different location in *merged_cp_p. |
duke@435 | 1033 | bool VM_RedefineClasses::merge_constant_pools(constantPoolHandle old_cp, |
duke@435 | 1034 | constantPoolHandle scratch_cp, constantPoolHandle *merge_cp_p, |
duke@435 | 1035 | int *merge_cp_length_p, TRAPS) { |
duke@435 | 1036 | |
duke@435 | 1037 | if (merge_cp_p == NULL) { |
duke@435 | 1038 | assert(false, "caller must provide scatch constantPool"); |
duke@435 | 1039 | return false; // robustness |
duke@435 | 1040 | } |
duke@435 | 1041 | if (merge_cp_length_p == NULL) { |
duke@435 | 1042 | assert(false, "caller must provide scatch CP length"); |
duke@435 | 1043 | return false; // robustness |
duke@435 | 1044 | } |
duke@435 | 1045 | // Worst case we need old_cp->length() + scratch_cp()->length(), |
duke@435 | 1046 | // but the caller might be smart so make sure we have at least |
duke@435 | 1047 | // the minimum. |
duke@435 | 1048 | if ((*merge_cp_p)->length() < old_cp->length()) { |
duke@435 | 1049 | assert(false, "merge area too small"); |
duke@435 | 1050 | return false; // robustness |
duke@435 | 1051 | } |
duke@435 | 1052 | |
duke@435 | 1053 | RC_TRACE_WITH_THREAD(0x00010000, THREAD, |
duke@435 | 1054 | ("old_cp_len=%d, scratch_cp_len=%d", old_cp->length(), |
duke@435 | 1055 | scratch_cp->length())); |
duke@435 | 1056 | |
duke@435 | 1057 | { |
duke@435 | 1058 | // Pass 0: |
duke@435 | 1059 | // The old_cp is copied to *merge_cp_p; this means that any code |
duke@435 | 1060 | // using old_cp does not have to change. This work looks like a |
duke@435 | 1061 | // perfect fit for constantPoolOop::copy_cp_to(), but we need to |
duke@435 | 1062 | // handle one special case: |
duke@435 | 1063 | // - revert JVM_CONSTANT_Class to JVM_CONSTANT_UnresolvedClass |
duke@435 | 1064 | // This will make verification happy. |
duke@435 | 1065 | |
duke@435 | 1066 | int old_i; // index into old_cp |
duke@435 | 1067 | |
duke@435 | 1068 | // index zero (0) is not used in constantPools |
duke@435 | 1069 | for (old_i = 1; old_i < old_cp->length(); old_i++) { |
duke@435 | 1070 | // leave debugging crumb |
duke@435 | 1071 | jbyte old_tag = old_cp->tag_at(old_i).value(); |
duke@435 | 1072 | switch (old_tag) { |
duke@435 | 1073 | case JVM_CONSTANT_Class: |
duke@435 | 1074 | // revert the copy to JVM_CONSTANT_UnresolvedClass |
duke@435 | 1075 | (*merge_cp_p)->unresolved_klass_at_put(old_i, |
duke@435 | 1076 | old_cp->klass_name_at(old_i)); |
duke@435 | 1077 | break; |
duke@435 | 1078 | |
duke@435 | 1079 | case JVM_CONSTANT_Double: |
duke@435 | 1080 | case JVM_CONSTANT_Long: |
duke@435 | 1081 | // just copy the entry to *merge_cp_p, but double and long take |
duke@435 | 1082 | // two constant pool entries |
duke@435 | 1083 | old_cp->copy_entry_to(old_i, *merge_cp_p, old_i, CHECK_0); |
duke@435 | 1084 | old_i++; |
duke@435 | 1085 | break; |
duke@435 | 1086 | |
duke@435 | 1087 | default: |
duke@435 | 1088 | // just copy the entry to *merge_cp_p |
duke@435 | 1089 | old_cp->copy_entry_to(old_i, *merge_cp_p, old_i, CHECK_0); |
duke@435 | 1090 | break; |
duke@435 | 1091 | } |
duke@435 | 1092 | } // end for each old_cp entry |
duke@435 | 1093 | |
duke@435 | 1094 | // We don't need to sanity check that *merge_cp_length_p is within |
duke@435 | 1095 | // *merge_cp_p bounds since we have the minimum on-entry check above. |
duke@435 | 1096 | (*merge_cp_length_p) = old_i; |
duke@435 | 1097 | } |
duke@435 | 1098 | |
duke@435 | 1099 | // merge_cp_len should be the same as old_cp->length() at this point |
duke@435 | 1100 | // so this trace message is really a "warm-and-breathing" message. |
duke@435 | 1101 | RC_TRACE_WITH_THREAD(0x00020000, THREAD, |
duke@435 | 1102 | ("after pass 0: merge_cp_len=%d", *merge_cp_length_p)); |
duke@435 | 1103 | |
duke@435 | 1104 | int scratch_i; // index into scratch_cp |
duke@435 | 1105 | { |
duke@435 | 1106 | // Pass 1a: |
duke@435 | 1107 | // Compare scratch_cp entries to the old_cp entries that we have |
duke@435 | 1108 | // already copied to *merge_cp_p. In this pass, we are eliminating |
duke@435 | 1109 | // exact duplicates (matching entry at same index) so we only |
duke@435 | 1110 | // compare entries in the common indice range. |
duke@435 | 1111 | int increment = 1; |
duke@435 | 1112 | int pass1a_length = MIN2(old_cp->length(), scratch_cp->length()); |
duke@435 | 1113 | for (scratch_i = 1; scratch_i < pass1a_length; scratch_i += increment) { |
duke@435 | 1114 | switch (scratch_cp->tag_at(scratch_i).value()) { |
duke@435 | 1115 | case JVM_CONSTANT_Double: |
duke@435 | 1116 | case JVM_CONSTANT_Long: |
duke@435 | 1117 | // double and long take two constant pool entries |
duke@435 | 1118 | increment = 2; |
duke@435 | 1119 | break; |
duke@435 | 1120 | |
duke@435 | 1121 | default: |
duke@435 | 1122 | increment = 1; |
duke@435 | 1123 | break; |
duke@435 | 1124 | } |
duke@435 | 1125 | |
duke@435 | 1126 | bool match = scratch_cp->compare_entry_to(scratch_i, *merge_cp_p, |
duke@435 | 1127 | scratch_i, CHECK_0); |
duke@435 | 1128 | if (match) { |
duke@435 | 1129 | // found a match at the same index so nothing more to do |
duke@435 | 1130 | continue; |
duke@435 | 1131 | } else if (is_unresolved_class_mismatch(scratch_cp, scratch_i, |
duke@435 | 1132 | *merge_cp_p, scratch_i)) { |
duke@435 | 1133 | // The mismatch in compare_entry_to() above is because of a |
duke@435 | 1134 | // resolved versus unresolved class entry at the same index |
duke@435 | 1135 | // with the same string value. Since Pass 0 reverted any |
duke@435 | 1136 | // class entries to unresolved class entries in *merge_cp_p, |
duke@435 | 1137 | // we go with the unresolved class entry. |
duke@435 | 1138 | continue; |
duke@435 | 1139 | } else if (is_unresolved_string_mismatch(scratch_cp, scratch_i, |
duke@435 | 1140 | *merge_cp_p, scratch_i)) { |
duke@435 | 1141 | // The mismatch in compare_entry_to() above is because of a |
duke@435 | 1142 | // resolved versus unresolved string entry at the same index |
duke@435 | 1143 | // with the same string value. We can live with whichever |
duke@435 | 1144 | // happens to be at scratch_i in *merge_cp_p. |
duke@435 | 1145 | continue; |
duke@435 | 1146 | } |
duke@435 | 1147 | |
duke@435 | 1148 | int found_i = scratch_cp->find_matching_entry(scratch_i, *merge_cp_p, |
duke@435 | 1149 | CHECK_0); |
duke@435 | 1150 | if (found_i != 0) { |
duke@435 | 1151 | guarantee(found_i != scratch_i, |
duke@435 | 1152 | "compare_entry_to() and find_matching_entry() do not agree"); |
duke@435 | 1153 | |
duke@435 | 1154 | // Found a matching entry somewhere else in *merge_cp_p so |
duke@435 | 1155 | // just need a mapping entry. |
duke@435 | 1156 | map_index(scratch_cp, scratch_i, found_i); |
duke@435 | 1157 | continue; |
duke@435 | 1158 | } |
duke@435 | 1159 | |
duke@435 | 1160 | // The find_matching_entry() call above could fail to find a match |
duke@435 | 1161 | // due to a resolved versus unresolved class or string entry situation |
duke@435 | 1162 | // like we solved above with the is_unresolved_*_mismatch() calls. |
duke@435 | 1163 | // However, we would have to call is_unresolved_*_mismatch() over |
duke@435 | 1164 | // all of *merge_cp_p (potentially) and that doesn't seem to be |
duke@435 | 1165 | // worth the time. |
duke@435 | 1166 | |
duke@435 | 1167 | // No match found so we have to append this entry and any unique |
duke@435 | 1168 | // referenced entries to *merge_cp_p. |
duke@435 | 1169 | append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p, |
duke@435 | 1170 | CHECK_0); |
duke@435 | 1171 | } |
duke@435 | 1172 | } |
duke@435 | 1173 | |
duke@435 | 1174 | RC_TRACE_WITH_THREAD(0x00020000, THREAD, |
duke@435 | 1175 | ("after pass 1a: merge_cp_len=%d, scratch_i=%d, index_map_len=%d", |
duke@435 | 1176 | *merge_cp_length_p, scratch_i, _index_map_count)); |
duke@435 | 1177 | |
duke@435 | 1178 | if (scratch_i < scratch_cp->length()) { |
duke@435 | 1179 | // Pass 1b: |
duke@435 | 1180 | // old_cp is smaller than scratch_cp so there are entries in |
duke@435 | 1181 | // scratch_cp that we have not yet processed. We take care of |
duke@435 | 1182 | // those now. |
duke@435 | 1183 | int increment = 1; |
duke@435 | 1184 | for (; scratch_i < scratch_cp->length(); scratch_i += increment) { |
duke@435 | 1185 | switch (scratch_cp->tag_at(scratch_i).value()) { |
duke@435 | 1186 | case JVM_CONSTANT_Double: |
duke@435 | 1187 | case JVM_CONSTANT_Long: |
duke@435 | 1188 | // double and long take two constant pool entries |
duke@435 | 1189 | increment = 2; |
duke@435 | 1190 | break; |
duke@435 | 1191 | |
duke@435 | 1192 | default: |
duke@435 | 1193 | increment = 1; |
duke@435 | 1194 | break; |
duke@435 | 1195 | } |
duke@435 | 1196 | |
duke@435 | 1197 | int found_i = |
duke@435 | 1198 | scratch_cp->find_matching_entry(scratch_i, *merge_cp_p, CHECK_0); |
duke@435 | 1199 | if (found_i != 0) { |
duke@435 | 1200 | // Found a matching entry somewhere else in *merge_cp_p so |
duke@435 | 1201 | // just need a mapping entry. |
duke@435 | 1202 | map_index(scratch_cp, scratch_i, found_i); |
duke@435 | 1203 | continue; |
duke@435 | 1204 | } |
duke@435 | 1205 | |
duke@435 | 1206 | // No match found so we have to append this entry and any unique |
duke@435 | 1207 | // referenced entries to *merge_cp_p. |
duke@435 | 1208 | append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p, |
duke@435 | 1209 | CHECK_0); |
duke@435 | 1210 | } |
duke@435 | 1211 | |
duke@435 | 1212 | RC_TRACE_WITH_THREAD(0x00020000, THREAD, |
duke@435 | 1213 | ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d", |
duke@435 | 1214 | *merge_cp_length_p, scratch_i, _index_map_count)); |
duke@435 | 1215 | } |
duke@435 | 1216 | |
duke@435 | 1217 | return true; |
duke@435 | 1218 | } // end merge_constant_pools() |
duke@435 | 1219 | |
duke@435 | 1220 | |
duke@435 | 1221 | // Merge constant pools between the_class and scratch_class and |
duke@435 | 1222 | // potentially rewrite bytecodes in scratch_class to use the merged |
duke@435 | 1223 | // constant pool. |
duke@435 | 1224 | jvmtiError VM_RedefineClasses::merge_cp_and_rewrite( |
duke@435 | 1225 | instanceKlassHandle the_class, instanceKlassHandle scratch_class, |
duke@435 | 1226 | TRAPS) { |
duke@435 | 1227 | // worst case merged constant pool length is old and new combined |
duke@435 | 1228 | int merge_cp_length = the_class->constants()->length() |
duke@435 | 1229 | + scratch_class->constants()->length(); |
duke@435 | 1230 | |
duke@435 | 1231 | constantPoolHandle old_cp(THREAD, the_class->constants()); |
duke@435 | 1232 | constantPoolHandle scratch_cp(THREAD, scratch_class->constants()); |
duke@435 | 1233 | |
duke@435 | 1234 | // Constant pools are not easily reused so we allocate a new one |
duke@435 | 1235 | // each time. |
jmasa@953 | 1236 | // merge_cp is created unsafe for concurrent GC processing. It |
jmasa@953 | 1237 | // should be marked safe before discarding it because, even if |
jmasa@953 | 1238 | // garbage. If it crosses a card boundary, it may be scanned |
jmasa@953 | 1239 | // in order to find the start of the first complete object on the card. |
duke@435 | 1240 | constantPoolHandle merge_cp(THREAD, |
jmasa@953 | 1241 | oopFactory::new_constantPool(merge_cp_length, |
jmasa@953 | 1242 | methodOopDesc::IsUnsafeConc, |
jmasa@953 | 1243 | THREAD)); |
duke@435 | 1244 | int orig_length = old_cp->orig_length(); |
duke@435 | 1245 | if (orig_length == 0) { |
duke@435 | 1246 | // This old_cp is an actual original constant pool. We save |
duke@435 | 1247 | // the original length in the merged constant pool so that |
duke@435 | 1248 | // merge_constant_pools() can be more efficient. If a constant |
duke@435 | 1249 | // pool has a non-zero orig_length() value, then that constant |
duke@435 | 1250 | // pool was created by a merge operation in RedefineClasses. |
duke@435 | 1251 | merge_cp->set_orig_length(old_cp->length()); |
duke@435 | 1252 | } else { |
duke@435 | 1253 | // This old_cp is a merged constant pool from a previous |
duke@435 | 1254 | // RedefineClasses() calls so just copy the orig_length() |
duke@435 | 1255 | // value. |
duke@435 | 1256 | merge_cp->set_orig_length(old_cp->orig_length()); |
duke@435 | 1257 | } |
duke@435 | 1258 | |
duke@435 | 1259 | ResourceMark rm(THREAD); |
duke@435 | 1260 | _index_map_count = 0; |
duke@435 | 1261 | _index_map_p = new intArray(scratch_cp->length(), -1); |
duke@435 | 1262 | |
duke@435 | 1263 | bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp, |
duke@435 | 1264 | &merge_cp_length, THREAD); |
duke@435 | 1265 | if (!result) { |
duke@435 | 1266 | // The merge can fail due to memory allocation failure or due |
duke@435 | 1267 | // to robustness checks. |
duke@435 | 1268 | return JVMTI_ERROR_INTERNAL; |
duke@435 | 1269 | } |
duke@435 | 1270 | |
duke@435 | 1271 | RC_TRACE_WITH_THREAD(0x00010000, THREAD, |
duke@435 | 1272 | ("merge_cp_len=%d, index_map_len=%d", merge_cp_length, _index_map_count)); |
duke@435 | 1273 | |
duke@435 | 1274 | if (_index_map_count == 0) { |
duke@435 | 1275 | // there is nothing to map between the new and merged constant pools |
duke@435 | 1276 | |
duke@435 | 1277 | if (old_cp->length() == scratch_cp->length()) { |
duke@435 | 1278 | // The old and new constant pools are the same length and the |
duke@435 | 1279 | // index map is empty. This means that the three constant pools |
duke@435 | 1280 | // are equivalent (but not the same). Unfortunately, the new |
duke@435 | 1281 | // constant pool has not gone through link resolution nor have |
duke@435 | 1282 | // the new class bytecodes gone through constant pool cache |
duke@435 | 1283 | // rewriting so we can't use the old constant pool with the new |
duke@435 | 1284 | // class. |
duke@435 | 1285 | |
jmasa@953 | 1286 | merge_cp()->set_is_conc_safe(true); |
duke@435 | 1287 | merge_cp = constantPoolHandle(); // toss the merged constant pool |
duke@435 | 1288 | } else if (old_cp->length() < scratch_cp->length()) { |
duke@435 | 1289 | // The old constant pool has fewer entries than the new constant |
duke@435 | 1290 | // pool and the index map is empty. This means the new constant |
duke@435 | 1291 | // pool is a superset of the old constant pool. However, the old |
duke@435 | 1292 | // class bytecodes have already gone through constant pool cache |
duke@435 | 1293 | // rewriting so we can't use the new constant pool with the old |
duke@435 | 1294 | // class. |
duke@435 | 1295 | |
jmasa@953 | 1296 | merge_cp()->set_is_conc_safe(true); |
duke@435 | 1297 | merge_cp = constantPoolHandle(); // toss the merged constant pool |
duke@435 | 1298 | } else { |
duke@435 | 1299 | // The old constant pool has more entries than the new constant |
duke@435 | 1300 | // pool and the index map is empty. This means that both the old |
duke@435 | 1301 | // and merged constant pools are supersets of the new constant |
duke@435 | 1302 | // pool. |
duke@435 | 1303 | |
duke@435 | 1304 | // Replace the new constant pool with a shrunken copy of the |
duke@435 | 1305 | // merged constant pool; the previous new constant pool will |
duke@435 | 1306 | // get GCed. |
duke@435 | 1307 | set_new_constant_pool(scratch_class, merge_cp, merge_cp_length, true, |
duke@435 | 1308 | THREAD); |
duke@435 | 1309 | // drop local ref to the merged constant pool |
jmasa@953 | 1310 | merge_cp()->set_is_conc_safe(true); |
duke@435 | 1311 | merge_cp = constantPoolHandle(); |
duke@435 | 1312 | } |
duke@435 | 1313 | } else { |
duke@435 | 1314 | if (RC_TRACE_ENABLED(0x00040000)) { |
duke@435 | 1315 | // don't want to loop unless we are tracing |
duke@435 | 1316 | int count = 0; |
duke@435 | 1317 | for (int i = 1; i < _index_map_p->length(); i++) { |
duke@435 | 1318 | int value = _index_map_p->at(i); |
duke@435 | 1319 | |
duke@435 | 1320 | if (value != -1) { |
duke@435 | 1321 | RC_TRACE_WITH_THREAD(0x00040000, THREAD, |
duke@435 | 1322 | ("index_map[%d]: old=%d new=%d", count, i, value)); |
duke@435 | 1323 | count++; |
duke@435 | 1324 | } |
duke@435 | 1325 | } |
duke@435 | 1326 | } |
duke@435 | 1327 | |
duke@435 | 1328 | // We have entries mapped between the new and merged constant pools |
duke@435 | 1329 | // so we have to rewrite some constant pool references. |
duke@435 | 1330 | if (!rewrite_cp_refs(scratch_class, THREAD)) { |
duke@435 | 1331 | return JVMTI_ERROR_INTERNAL; |
duke@435 | 1332 | } |
duke@435 | 1333 | |
duke@435 | 1334 | // Replace the new constant pool with a shrunken copy of the |
duke@435 | 1335 | // merged constant pool so now the rewritten bytecodes have |
duke@435 | 1336 | // valid references; the previous new constant pool will get |
duke@435 | 1337 | // GCed. |
duke@435 | 1338 | set_new_constant_pool(scratch_class, merge_cp, merge_cp_length, true, |
duke@435 | 1339 | THREAD); |
jmasa@953 | 1340 | merge_cp()->set_is_conc_safe(true); |
duke@435 | 1341 | } |
jmasa@953 | 1342 | assert(old_cp()->is_conc_safe(), "Just checking"); |
jmasa@953 | 1343 | assert(scratch_cp()->is_conc_safe(), "Just checking"); |
duke@435 | 1344 | |
duke@435 | 1345 | return JVMTI_ERROR_NONE; |
duke@435 | 1346 | } // end merge_cp_and_rewrite() |
duke@435 | 1347 | |
duke@435 | 1348 | |
duke@435 | 1349 | // Rewrite constant pool references in klass scratch_class. |
duke@435 | 1350 | bool VM_RedefineClasses::rewrite_cp_refs(instanceKlassHandle scratch_class, |
duke@435 | 1351 | TRAPS) { |
duke@435 | 1352 | |
duke@435 | 1353 | // rewrite constant pool references in the methods: |
duke@435 | 1354 | if (!rewrite_cp_refs_in_methods(scratch_class, THREAD)) { |
twisti@1040 | 1355 | // propagate failure back to caller |
duke@435 | 1356 | return false; |
duke@435 | 1357 | } |
duke@435 | 1358 | |
duke@435 | 1359 | // rewrite constant pool references in the class_annotations: |
duke@435 | 1360 | if (!rewrite_cp_refs_in_class_annotations(scratch_class, THREAD)) { |
twisti@1040 | 1361 | // propagate failure back to caller |
duke@435 | 1362 | return false; |
duke@435 | 1363 | } |
duke@435 | 1364 | |
duke@435 | 1365 | // rewrite constant pool references in the fields_annotations: |
duke@435 | 1366 | if (!rewrite_cp_refs_in_fields_annotations(scratch_class, THREAD)) { |
twisti@1040 | 1367 | // propagate failure back to caller |
duke@435 | 1368 | return false; |
duke@435 | 1369 | } |
duke@435 | 1370 | |
duke@435 | 1371 | // rewrite constant pool references in the methods_annotations: |
duke@435 | 1372 | if (!rewrite_cp_refs_in_methods_annotations(scratch_class, THREAD)) { |
twisti@1040 | 1373 | // propagate failure back to caller |
duke@435 | 1374 | return false; |
duke@435 | 1375 | } |
duke@435 | 1376 | |
duke@435 | 1377 | // rewrite constant pool references in the methods_parameter_annotations: |
duke@435 | 1378 | if (!rewrite_cp_refs_in_methods_parameter_annotations(scratch_class, |
duke@435 | 1379 | THREAD)) { |
twisti@1040 | 1380 | // propagate failure back to caller |
duke@435 | 1381 | return false; |
duke@435 | 1382 | } |
duke@435 | 1383 | |
duke@435 | 1384 | // rewrite constant pool references in the methods_default_annotations: |
duke@435 | 1385 | if (!rewrite_cp_refs_in_methods_default_annotations(scratch_class, |
duke@435 | 1386 | THREAD)) { |
twisti@1040 | 1387 | // propagate failure back to caller |
duke@435 | 1388 | return false; |
duke@435 | 1389 | } |
duke@435 | 1390 | |
duke@435 | 1391 | return true; |
duke@435 | 1392 | } // end rewrite_cp_refs() |
duke@435 | 1393 | |
duke@435 | 1394 | |
duke@435 | 1395 | // Rewrite constant pool references in the methods. |
duke@435 | 1396 | bool VM_RedefineClasses::rewrite_cp_refs_in_methods( |
duke@435 | 1397 | instanceKlassHandle scratch_class, TRAPS) { |
duke@435 | 1398 | |
duke@435 | 1399 | objArrayHandle methods(THREAD, scratch_class->methods()); |
duke@435 | 1400 | |
duke@435 | 1401 | if (methods.is_null() || methods->length() == 0) { |
duke@435 | 1402 | // no methods so nothing to do |
duke@435 | 1403 | return true; |
duke@435 | 1404 | } |
duke@435 | 1405 | |
duke@435 | 1406 | // rewrite constant pool references in the methods: |
duke@435 | 1407 | for (int i = methods->length() - 1; i >= 0; i--) { |
duke@435 | 1408 | methodHandle method(THREAD, (methodOop)methods->obj_at(i)); |
duke@435 | 1409 | methodHandle new_method; |
duke@435 | 1410 | rewrite_cp_refs_in_method(method, &new_method, CHECK_false); |
duke@435 | 1411 | if (!new_method.is_null()) { |
duke@435 | 1412 | // the method has been replaced so save the new method version |
duke@435 | 1413 | methods->obj_at_put(i, new_method()); |
duke@435 | 1414 | } |
duke@435 | 1415 | } |
duke@435 | 1416 | |
duke@435 | 1417 | return true; |
duke@435 | 1418 | } |
duke@435 | 1419 | |
duke@435 | 1420 | |
duke@435 | 1421 | // Rewrite constant pool references in the specific method. This code |
duke@435 | 1422 | // was adapted from Rewriter::rewrite_method(). |
duke@435 | 1423 | void VM_RedefineClasses::rewrite_cp_refs_in_method(methodHandle method, |
duke@435 | 1424 | methodHandle *new_method_p, TRAPS) { |
duke@435 | 1425 | |
duke@435 | 1426 | *new_method_p = methodHandle(); // default is no new method |
duke@435 | 1427 | |
duke@435 | 1428 | // We cache a pointer to the bytecodes here in code_base. If GC |
duke@435 | 1429 | // moves the methodOop, then the bytecodes will also move which |
duke@435 | 1430 | // will likely cause a crash. We create a No_Safepoint_Verifier |
duke@435 | 1431 | // object to detect whether we pass a possible safepoint in this |
duke@435 | 1432 | // code block. |
duke@435 | 1433 | No_Safepoint_Verifier nsv; |
duke@435 | 1434 | |
duke@435 | 1435 | // Bytecodes and their length |
duke@435 | 1436 | address code_base = method->code_base(); |
duke@435 | 1437 | int code_length = method->code_size(); |
duke@435 | 1438 | |
duke@435 | 1439 | int bc_length; |
duke@435 | 1440 | for (int bci = 0; bci < code_length; bci += bc_length) { |
duke@435 | 1441 | address bcp = code_base + bci; |
duke@435 | 1442 | Bytecodes::Code c = (Bytecodes::Code)(*bcp); |
duke@435 | 1443 | |
duke@435 | 1444 | bc_length = Bytecodes::length_for(c); |
duke@435 | 1445 | if (bc_length == 0) { |
duke@435 | 1446 | // More complicated bytecodes report a length of zero so |
duke@435 | 1447 | // we have to try again a slightly different way. |
duke@435 | 1448 | bc_length = Bytecodes::length_at(bcp); |
duke@435 | 1449 | } |
duke@435 | 1450 | |
duke@435 | 1451 | assert(bc_length != 0, "impossible bytecode length"); |
duke@435 | 1452 | |
duke@435 | 1453 | switch (c) { |
duke@435 | 1454 | case Bytecodes::_ldc: |
duke@435 | 1455 | { |
duke@435 | 1456 | int cp_index = *(bcp + 1); |
duke@435 | 1457 | int new_index = find_new_index(cp_index); |
duke@435 | 1458 | |
duke@435 | 1459 | if (StressLdcRewrite && new_index == 0) { |
duke@435 | 1460 | // If we are stressing ldc -> ldc_w rewriting, then we |
duke@435 | 1461 | // always need a new_index value. |
duke@435 | 1462 | new_index = cp_index; |
duke@435 | 1463 | } |
duke@435 | 1464 | if (new_index != 0) { |
duke@435 | 1465 | // the original index is mapped so we have more work to do |
duke@435 | 1466 | if (!StressLdcRewrite && new_index <= max_jubyte) { |
duke@435 | 1467 | // The new value can still use ldc instead of ldc_w |
duke@435 | 1468 | // unless we are trying to stress ldc -> ldc_w rewriting |
duke@435 | 1469 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 1470 | ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c), |
duke@435 | 1471 | bcp, cp_index, new_index)); |
duke@435 | 1472 | *(bcp + 1) = new_index; |
duke@435 | 1473 | } else { |
duke@435 | 1474 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 1475 | ("%s->ldc_w@" INTPTR_FORMAT " old=%d, new=%d", |
duke@435 | 1476 | Bytecodes::name(c), bcp, cp_index, new_index)); |
duke@435 | 1477 | // the new value needs ldc_w instead of ldc |
duke@435 | 1478 | u_char inst_buffer[4]; // max instruction size is 4 bytes |
duke@435 | 1479 | bcp = (address)inst_buffer; |
duke@435 | 1480 | // construct new instruction sequence |
duke@435 | 1481 | *bcp = Bytecodes::_ldc_w; |
duke@435 | 1482 | bcp++; |
duke@435 | 1483 | // Rewriter::rewrite_method() does not rewrite ldc -> ldc_w. |
duke@435 | 1484 | // See comment below for difference between put_Java_u2() |
duke@435 | 1485 | // and put_native_u2(). |
duke@435 | 1486 | Bytes::put_Java_u2(bcp, new_index); |
duke@435 | 1487 | |
duke@435 | 1488 | Relocator rc(method, NULL /* no RelocatorListener needed */); |
duke@435 | 1489 | methodHandle m; |
duke@435 | 1490 | { |
duke@435 | 1491 | Pause_No_Safepoint_Verifier pnsv(&nsv); |
duke@435 | 1492 | |
duke@435 | 1493 | // ldc is 2 bytes and ldc_w is 3 bytes |
duke@435 | 1494 | m = rc.insert_space_at(bci, 3, inst_buffer, THREAD); |
duke@435 | 1495 | if (m.is_null() || HAS_PENDING_EXCEPTION) { |
duke@435 | 1496 | guarantee(false, "insert_space_at() failed"); |
duke@435 | 1497 | } |
duke@435 | 1498 | } |
duke@435 | 1499 | |
duke@435 | 1500 | // return the new method so that the caller can update |
duke@435 | 1501 | // the containing class |
duke@435 | 1502 | *new_method_p = method = m; |
duke@435 | 1503 | // switch our bytecode processing loop from the old method |
duke@435 | 1504 | // to the new method |
duke@435 | 1505 | code_base = method->code_base(); |
duke@435 | 1506 | code_length = method->code_size(); |
duke@435 | 1507 | bcp = code_base + bci; |
duke@435 | 1508 | c = (Bytecodes::Code)(*bcp); |
duke@435 | 1509 | bc_length = Bytecodes::length_for(c); |
duke@435 | 1510 | assert(bc_length != 0, "sanity check"); |
duke@435 | 1511 | } // end we need ldc_w instead of ldc |
duke@435 | 1512 | } // end if there is a mapped index |
duke@435 | 1513 | } break; |
duke@435 | 1514 | |
duke@435 | 1515 | // these bytecodes have a two-byte constant pool index |
duke@435 | 1516 | case Bytecodes::_anewarray : // fall through |
duke@435 | 1517 | case Bytecodes::_checkcast : // fall through |
duke@435 | 1518 | case Bytecodes::_getfield : // fall through |
duke@435 | 1519 | case Bytecodes::_getstatic : // fall through |
duke@435 | 1520 | case Bytecodes::_instanceof : // fall through |
duke@435 | 1521 | case Bytecodes::_invokeinterface: // fall through |
duke@435 | 1522 | case Bytecodes::_invokespecial : // fall through |
duke@435 | 1523 | case Bytecodes::_invokestatic : // fall through |
duke@435 | 1524 | case Bytecodes::_invokevirtual : // fall through |
duke@435 | 1525 | case Bytecodes::_ldc_w : // fall through |
duke@435 | 1526 | case Bytecodes::_ldc2_w : // fall through |
duke@435 | 1527 | case Bytecodes::_multianewarray : // fall through |
duke@435 | 1528 | case Bytecodes::_new : // fall through |
duke@435 | 1529 | case Bytecodes::_putfield : // fall through |
duke@435 | 1530 | case Bytecodes::_putstatic : |
duke@435 | 1531 | { |
duke@435 | 1532 | address p = bcp + 1; |
duke@435 | 1533 | int cp_index = Bytes::get_Java_u2(p); |
duke@435 | 1534 | int new_index = find_new_index(cp_index); |
duke@435 | 1535 | if (new_index != 0) { |
duke@435 | 1536 | // the original index is mapped so update w/ new value |
duke@435 | 1537 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 1538 | ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c), |
duke@435 | 1539 | bcp, cp_index, new_index)); |
duke@435 | 1540 | // Rewriter::rewrite_method() uses put_native_u2() in this |
duke@435 | 1541 | // situation because it is reusing the constant pool index |
duke@435 | 1542 | // location for a native index into the constantPoolCache. |
duke@435 | 1543 | // Since we are updating the constant pool index prior to |
duke@435 | 1544 | // verification and constantPoolCache initialization, we |
duke@435 | 1545 | // need to keep the new index in Java byte order. |
duke@435 | 1546 | Bytes::put_Java_u2(p, new_index); |
duke@435 | 1547 | } |
duke@435 | 1548 | } break; |
duke@435 | 1549 | } |
duke@435 | 1550 | } // end for each bytecode |
duke@435 | 1551 | } // end rewrite_cp_refs_in_method() |
duke@435 | 1552 | |
duke@435 | 1553 | |
duke@435 | 1554 | // Rewrite constant pool references in the class_annotations field. |
duke@435 | 1555 | bool VM_RedefineClasses::rewrite_cp_refs_in_class_annotations( |
duke@435 | 1556 | instanceKlassHandle scratch_class, TRAPS) { |
duke@435 | 1557 | |
duke@435 | 1558 | typeArrayHandle class_annotations(THREAD, |
duke@435 | 1559 | scratch_class->class_annotations()); |
duke@435 | 1560 | if (class_annotations.is_null() || class_annotations->length() == 0) { |
duke@435 | 1561 | // no class_annotations so nothing to do |
duke@435 | 1562 | return true; |
duke@435 | 1563 | } |
duke@435 | 1564 | |
duke@435 | 1565 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1566 | ("class_annotations length=%d", class_annotations->length())); |
duke@435 | 1567 | |
duke@435 | 1568 | int byte_i = 0; // byte index into class_annotations |
duke@435 | 1569 | return rewrite_cp_refs_in_annotations_typeArray(class_annotations, byte_i, |
duke@435 | 1570 | THREAD); |
duke@435 | 1571 | } |
duke@435 | 1572 | |
duke@435 | 1573 | |
duke@435 | 1574 | // Rewrite constant pool references in an annotations typeArray. This |
duke@435 | 1575 | // "structure" is adapted from the RuntimeVisibleAnnotations_attribute |
duke@435 | 1576 | // that is described in section 4.8.15 of the 2nd-edition of the VM spec: |
duke@435 | 1577 | // |
duke@435 | 1578 | // annotations_typeArray { |
duke@435 | 1579 | // u2 num_annotations; |
duke@435 | 1580 | // annotation annotations[num_annotations]; |
duke@435 | 1581 | // } |
duke@435 | 1582 | // |
duke@435 | 1583 | bool VM_RedefineClasses::rewrite_cp_refs_in_annotations_typeArray( |
duke@435 | 1584 | typeArrayHandle annotations_typeArray, int &byte_i_ref, TRAPS) { |
duke@435 | 1585 | |
duke@435 | 1586 | if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
duke@435 | 1587 | // not enough room for num_annotations field |
duke@435 | 1588 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1589 | ("length() is too small for num_annotations field")); |
duke@435 | 1590 | return false; |
duke@435 | 1591 | } |
duke@435 | 1592 | |
duke@435 | 1593 | u2 num_annotations = Bytes::get_Java_u2((address) |
duke@435 | 1594 | annotations_typeArray->byte_at_addr(byte_i_ref)); |
duke@435 | 1595 | byte_i_ref += 2; |
duke@435 | 1596 | |
duke@435 | 1597 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1598 | ("num_annotations=%d", num_annotations)); |
duke@435 | 1599 | |
duke@435 | 1600 | int calc_num_annotations = 0; |
duke@435 | 1601 | for (; calc_num_annotations < num_annotations; calc_num_annotations++) { |
duke@435 | 1602 | if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray, |
duke@435 | 1603 | byte_i_ref, THREAD)) { |
duke@435 | 1604 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1605 | ("bad annotation_struct at %d", calc_num_annotations)); |
twisti@1040 | 1606 | // propagate failure back to caller |
duke@435 | 1607 | return false; |
duke@435 | 1608 | } |
duke@435 | 1609 | } |
duke@435 | 1610 | assert(num_annotations == calc_num_annotations, "sanity check"); |
duke@435 | 1611 | |
duke@435 | 1612 | return true; |
duke@435 | 1613 | } // end rewrite_cp_refs_in_annotations_typeArray() |
duke@435 | 1614 | |
duke@435 | 1615 | |
duke@435 | 1616 | // Rewrite constant pool references in the annotation struct portion of |
duke@435 | 1617 | // an annotations_typeArray. This "structure" is from section 4.8.15 of |
duke@435 | 1618 | // the 2nd-edition of the VM spec: |
duke@435 | 1619 | // |
duke@435 | 1620 | // struct annotation { |
duke@435 | 1621 | // u2 type_index; |
duke@435 | 1622 | // u2 num_element_value_pairs; |
duke@435 | 1623 | // { |
duke@435 | 1624 | // u2 element_name_index; |
duke@435 | 1625 | // element_value value; |
duke@435 | 1626 | // } element_value_pairs[num_element_value_pairs]; |
duke@435 | 1627 | // } |
duke@435 | 1628 | // |
duke@435 | 1629 | bool VM_RedefineClasses::rewrite_cp_refs_in_annotation_struct( |
duke@435 | 1630 | typeArrayHandle annotations_typeArray, int &byte_i_ref, TRAPS) { |
duke@435 | 1631 | if ((byte_i_ref + 2 + 2) > annotations_typeArray->length()) { |
duke@435 | 1632 | // not enough room for smallest annotation_struct |
duke@435 | 1633 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1634 | ("length() is too small for annotation_struct")); |
duke@435 | 1635 | return false; |
duke@435 | 1636 | } |
duke@435 | 1637 | |
duke@435 | 1638 | u2 type_index = rewrite_cp_ref_in_annotation_data(annotations_typeArray, |
duke@435 | 1639 | byte_i_ref, "mapped old type_index=%d", THREAD); |
duke@435 | 1640 | |
duke@435 | 1641 | u2 num_element_value_pairs = Bytes::get_Java_u2((address) |
duke@435 | 1642 | annotations_typeArray->byte_at_addr( |
duke@435 | 1643 | byte_i_ref)); |
duke@435 | 1644 | byte_i_ref += 2; |
duke@435 | 1645 | |
duke@435 | 1646 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1647 | ("type_index=%d num_element_value_pairs=%d", type_index, |
duke@435 | 1648 | num_element_value_pairs)); |
duke@435 | 1649 | |
duke@435 | 1650 | int calc_num_element_value_pairs = 0; |
duke@435 | 1651 | for (; calc_num_element_value_pairs < num_element_value_pairs; |
duke@435 | 1652 | calc_num_element_value_pairs++) { |
duke@435 | 1653 | if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
duke@435 | 1654 | // not enough room for another element_name_index, let alone |
duke@435 | 1655 | // the rest of another component |
duke@435 | 1656 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1657 | ("length() is too small for element_name_index")); |
duke@435 | 1658 | return false; |
duke@435 | 1659 | } |
duke@435 | 1660 | |
duke@435 | 1661 | u2 element_name_index = rewrite_cp_ref_in_annotation_data( |
duke@435 | 1662 | annotations_typeArray, byte_i_ref, |
duke@435 | 1663 | "mapped old element_name_index=%d", THREAD); |
duke@435 | 1664 | |
duke@435 | 1665 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1666 | ("element_name_index=%d", element_name_index)); |
duke@435 | 1667 | |
duke@435 | 1668 | if (!rewrite_cp_refs_in_element_value(annotations_typeArray, |
duke@435 | 1669 | byte_i_ref, THREAD)) { |
duke@435 | 1670 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1671 | ("bad element_value at %d", calc_num_element_value_pairs)); |
twisti@1040 | 1672 | // propagate failure back to caller |
duke@435 | 1673 | return false; |
duke@435 | 1674 | } |
duke@435 | 1675 | } // end for each component |
duke@435 | 1676 | assert(num_element_value_pairs == calc_num_element_value_pairs, |
duke@435 | 1677 | "sanity check"); |
duke@435 | 1678 | |
duke@435 | 1679 | return true; |
duke@435 | 1680 | } // end rewrite_cp_refs_in_annotation_struct() |
duke@435 | 1681 | |
duke@435 | 1682 | |
duke@435 | 1683 | // Rewrite a constant pool reference at the current position in |
duke@435 | 1684 | // annotations_typeArray if needed. Returns the original constant |
duke@435 | 1685 | // pool reference if a rewrite was not needed or the new constant |
duke@435 | 1686 | // pool reference if a rewrite was needed. |
duke@435 | 1687 | u2 VM_RedefineClasses::rewrite_cp_ref_in_annotation_data( |
duke@435 | 1688 | typeArrayHandle annotations_typeArray, int &byte_i_ref, |
duke@435 | 1689 | const char * trace_mesg, TRAPS) { |
duke@435 | 1690 | |
duke@435 | 1691 | address cp_index_addr = (address) |
duke@435 | 1692 | annotations_typeArray->byte_at_addr(byte_i_ref); |
duke@435 | 1693 | u2 old_cp_index = Bytes::get_Java_u2(cp_index_addr); |
duke@435 | 1694 | u2 new_cp_index = find_new_index(old_cp_index); |
duke@435 | 1695 | if (new_cp_index != 0) { |
duke@435 | 1696 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, (trace_mesg, old_cp_index)); |
duke@435 | 1697 | Bytes::put_Java_u2(cp_index_addr, new_cp_index); |
duke@435 | 1698 | old_cp_index = new_cp_index; |
duke@435 | 1699 | } |
duke@435 | 1700 | byte_i_ref += 2; |
duke@435 | 1701 | return old_cp_index; |
duke@435 | 1702 | } |
duke@435 | 1703 | |
duke@435 | 1704 | |
duke@435 | 1705 | // Rewrite constant pool references in the element_value portion of an |
duke@435 | 1706 | // annotations_typeArray. This "structure" is from section 4.8.15.1 of |
duke@435 | 1707 | // the 2nd-edition of the VM spec: |
duke@435 | 1708 | // |
duke@435 | 1709 | // struct element_value { |
duke@435 | 1710 | // u1 tag; |
duke@435 | 1711 | // union { |
duke@435 | 1712 | // u2 const_value_index; |
duke@435 | 1713 | // { |
duke@435 | 1714 | // u2 type_name_index; |
duke@435 | 1715 | // u2 const_name_index; |
duke@435 | 1716 | // } enum_const_value; |
duke@435 | 1717 | // u2 class_info_index; |
duke@435 | 1718 | // annotation annotation_value; |
duke@435 | 1719 | // struct { |
duke@435 | 1720 | // u2 num_values; |
duke@435 | 1721 | // element_value values[num_values]; |
duke@435 | 1722 | // } array_value; |
duke@435 | 1723 | // } value; |
duke@435 | 1724 | // } |
duke@435 | 1725 | // |
duke@435 | 1726 | bool VM_RedefineClasses::rewrite_cp_refs_in_element_value( |
duke@435 | 1727 | typeArrayHandle annotations_typeArray, int &byte_i_ref, TRAPS) { |
duke@435 | 1728 | |
duke@435 | 1729 | if ((byte_i_ref + 1) > annotations_typeArray->length()) { |
duke@435 | 1730 | // not enough room for a tag let alone the rest of an element_value |
duke@435 | 1731 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1732 | ("length() is too small for a tag")); |
duke@435 | 1733 | return false; |
duke@435 | 1734 | } |
duke@435 | 1735 | |
duke@435 | 1736 | u1 tag = annotations_typeArray->byte_at(byte_i_ref); |
duke@435 | 1737 | byte_i_ref++; |
duke@435 | 1738 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("tag='%c'", tag)); |
duke@435 | 1739 | |
duke@435 | 1740 | switch (tag) { |
duke@435 | 1741 | // These BaseType tag values are from Table 4.2 in VM spec: |
duke@435 | 1742 | case 'B': // byte |
duke@435 | 1743 | case 'C': // char |
duke@435 | 1744 | case 'D': // double |
duke@435 | 1745 | case 'F': // float |
duke@435 | 1746 | case 'I': // int |
duke@435 | 1747 | case 'J': // long |
duke@435 | 1748 | case 'S': // short |
duke@435 | 1749 | case 'Z': // boolean |
duke@435 | 1750 | |
duke@435 | 1751 | // The remaining tag values are from Table 4.8 in the 2nd-edition of |
duke@435 | 1752 | // the VM spec: |
duke@435 | 1753 | case 's': |
duke@435 | 1754 | { |
duke@435 | 1755 | // For the above tag values (including the BaseType values), |
duke@435 | 1756 | // value.const_value_index is right union field. |
duke@435 | 1757 | |
duke@435 | 1758 | if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
duke@435 | 1759 | // not enough room for a const_value_index |
duke@435 | 1760 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1761 | ("length() is too small for a const_value_index")); |
duke@435 | 1762 | return false; |
duke@435 | 1763 | } |
duke@435 | 1764 | |
duke@435 | 1765 | u2 const_value_index = rewrite_cp_ref_in_annotation_data( |
duke@435 | 1766 | annotations_typeArray, byte_i_ref, |
duke@435 | 1767 | "mapped old const_value_index=%d", THREAD); |
duke@435 | 1768 | |
duke@435 | 1769 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1770 | ("const_value_index=%d", const_value_index)); |
duke@435 | 1771 | } break; |
duke@435 | 1772 | |
duke@435 | 1773 | case 'e': |
duke@435 | 1774 | { |
duke@435 | 1775 | // for the above tag value, value.enum_const_value is right union field |
duke@435 | 1776 | |
duke@435 | 1777 | if ((byte_i_ref + 4) > annotations_typeArray->length()) { |
duke@435 | 1778 | // not enough room for a enum_const_value |
duke@435 | 1779 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1780 | ("length() is too small for a enum_const_value")); |
duke@435 | 1781 | return false; |
duke@435 | 1782 | } |
duke@435 | 1783 | |
duke@435 | 1784 | u2 type_name_index = rewrite_cp_ref_in_annotation_data( |
duke@435 | 1785 | annotations_typeArray, byte_i_ref, |
duke@435 | 1786 | "mapped old type_name_index=%d", THREAD); |
duke@435 | 1787 | |
duke@435 | 1788 | u2 const_name_index = rewrite_cp_ref_in_annotation_data( |
duke@435 | 1789 | annotations_typeArray, byte_i_ref, |
duke@435 | 1790 | "mapped old const_name_index=%d", THREAD); |
duke@435 | 1791 | |
duke@435 | 1792 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1793 | ("type_name_index=%d const_name_index=%d", type_name_index, |
duke@435 | 1794 | const_name_index)); |
duke@435 | 1795 | } break; |
duke@435 | 1796 | |
duke@435 | 1797 | case 'c': |
duke@435 | 1798 | { |
duke@435 | 1799 | // for the above tag value, value.class_info_index is right union field |
duke@435 | 1800 | |
duke@435 | 1801 | if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
duke@435 | 1802 | // not enough room for a class_info_index |
duke@435 | 1803 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1804 | ("length() is too small for a class_info_index")); |
duke@435 | 1805 | return false; |
duke@435 | 1806 | } |
duke@435 | 1807 | |
duke@435 | 1808 | u2 class_info_index = rewrite_cp_ref_in_annotation_data( |
duke@435 | 1809 | annotations_typeArray, byte_i_ref, |
duke@435 | 1810 | "mapped old class_info_index=%d", THREAD); |
duke@435 | 1811 | |
duke@435 | 1812 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1813 | ("class_info_index=%d", class_info_index)); |
duke@435 | 1814 | } break; |
duke@435 | 1815 | |
duke@435 | 1816 | case '@': |
duke@435 | 1817 | // For the above tag value, value.attr_value is the right union |
duke@435 | 1818 | // field. This is a nested annotation. |
duke@435 | 1819 | if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray, |
duke@435 | 1820 | byte_i_ref, THREAD)) { |
twisti@1040 | 1821 | // propagate failure back to caller |
duke@435 | 1822 | return false; |
duke@435 | 1823 | } |
duke@435 | 1824 | break; |
duke@435 | 1825 | |
duke@435 | 1826 | case '[': |
duke@435 | 1827 | { |
duke@435 | 1828 | if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
duke@435 | 1829 | // not enough room for a num_values field |
duke@435 | 1830 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1831 | ("length() is too small for a num_values field")); |
duke@435 | 1832 | return false; |
duke@435 | 1833 | } |
duke@435 | 1834 | |
duke@435 | 1835 | // For the above tag value, value.array_value is the right union |
duke@435 | 1836 | // field. This is an array of nested element_value. |
duke@435 | 1837 | u2 num_values = Bytes::get_Java_u2((address) |
duke@435 | 1838 | annotations_typeArray->byte_at_addr(byte_i_ref)); |
duke@435 | 1839 | byte_i_ref += 2; |
duke@435 | 1840 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("num_values=%d", num_values)); |
duke@435 | 1841 | |
duke@435 | 1842 | int calc_num_values = 0; |
duke@435 | 1843 | for (; calc_num_values < num_values; calc_num_values++) { |
duke@435 | 1844 | if (!rewrite_cp_refs_in_element_value( |
duke@435 | 1845 | annotations_typeArray, byte_i_ref, THREAD)) { |
duke@435 | 1846 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1847 | ("bad nested element_value at %d", calc_num_values)); |
twisti@1040 | 1848 | // propagate failure back to caller |
duke@435 | 1849 | return false; |
duke@435 | 1850 | } |
duke@435 | 1851 | } |
duke@435 | 1852 | assert(num_values == calc_num_values, "sanity check"); |
duke@435 | 1853 | } break; |
duke@435 | 1854 | |
duke@435 | 1855 | default: |
duke@435 | 1856 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("bad tag=0x%x", tag)); |
duke@435 | 1857 | return false; |
duke@435 | 1858 | } // end decode tag field |
duke@435 | 1859 | |
duke@435 | 1860 | return true; |
duke@435 | 1861 | } // end rewrite_cp_refs_in_element_value() |
duke@435 | 1862 | |
duke@435 | 1863 | |
duke@435 | 1864 | // Rewrite constant pool references in a fields_annotations field. |
duke@435 | 1865 | bool VM_RedefineClasses::rewrite_cp_refs_in_fields_annotations( |
duke@435 | 1866 | instanceKlassHandle scratch_class, TRAPS) { |
duke@435 | 1867 | |
duke@435 | 1868 | objArrayHandle fields_annotations(THREAD, |
duke@435 | 1869 | scratch_class->fields_annotations()); |
duke@435 | 1870 | |
duke@435 | 1871 | if (fields_annotations.is_null() || fields_annotations->length() == 0) { |
duke@435 | 1872 | // no fields_annotations so nothing to do |
duke@435 | 1873 | return true; |
duke@435 | 1874 | } |
duke@435 | 1875 | |
duke@435 | 1876 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1877 | ("fields_annotations length=%d", fields_annotations->length())); |
duke@435 | 1878 | |
duke@435 | 1879 | for (int i = 0; i < fields_annotations->length(); i++) { |
duke@435 | 1880 | typeArrayHandle field_annotations(THREAD, |
duke@435 | 1881 | (typeArrayOop)fields_annotations->obj_at(i)); |
duke@435 | 1882 | if (field_annotations.is_null() || field_annotations->length() == 0) { |
duke@435 | 1883 | // this field does not have any annotations so skip it |
duke@435 | 1884 | continue; |
duke@435 | 1885 | } |
duke@435 | 1886 | |
duke@435 | 1887 | int byte_i = 0; // byte index into field_annotations |
duke@435 | 1888 | if (!rewrite_cp_refs_in_annotations_typeArray(field_annotations, byte_i, |
duke@435 | 1889 | THREAD)) { |
duke@435 | 1890 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1891 | ("bad field_annotations at %d", i)); |
twisti@1040 | 1892 | // propagate failure back to caller |
duke@435 | 1893 | return false; |
duke@435 | 1894 | } |
duke@435 | 1895 | } |
duke@435 | 1896 | |
duke@435 | 1897 | return true; |
duke@435 | 1898 | } // end rewrite_cp_refs_in_fields_annotations() |
duke@435 | 1899 | |
duke@435 | 1900 | |
duke@435 | 1901 | // Rewrite constant pool references in a methods_annotations field. |
duke@435 | 1902 | bool VM_RedefineClasses::rewrite_cp_refs_in_methods_annotations( |
duke@435 | 1903 | instanceKlassHandle scratch_class, TRAPS) { |
duke@435 | 1904 | |
duke@435 | 1905 | objArrayHandle methods_annotations(THREAD, |
duke@435 | 1906 | scratch_class->methods_annotations()); |
duke@435 | 1907 | |
duke@435 | 1908 | if (methods_annotations.is_null() || methods_annotations->length() == 0) { |
duke@435 | 1909 | // no methods_annotations so nothing to do |
duke@435 | 1910 | return true; |
duke@435 | 1911 | } |
duke@435 | 1912 | |
duke@435 | 1913 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1914 | ("methods_annotations length=%d", methods_annotations->length())); |
duke@435 | 1915 | |
duke@435 | 1916 | for (int i = 0; i < methods_annotations->length(); i++) { |
duke@435 | 1917 | typeArrayHandle method_annotations(THREAD, |
duke@435 | 1918 | (typeArrayOop)methods_annotations->obj_at(i)); |
duke@435 | 1919 | if (method_annotations.is_null() || method_annotations->length() == 0) { |
duke@435 | 1920 | // this method does not have any annotations so skip it |
duke@435 | 1921 | continue; |
duke@435 | 1922 | } |
duke@435 | 1923 | |
duke@435 | 1924 | int byte_i = 0; // byte index into method_annotations |
duke@435 | 1925 | if (!rewrite_cp_refs_in_annotations_typeArray(method_annotations, byte_i, |
duke@435 | 1926 | THREAD)) { |
duke@435 | 1927 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1928 | ("bad method_annotations at %d", i)); |
twisti@1040 | 1929 | // propagate failure back to caller |
duke@435 | 1930 | return false; |
duke@435 | 1931 | } |
duke@435 | 1932 | } |
duke@435 | 1933 | |
duke@435 | 1934 | return true; |
duke@435 | 1935 | } // end rewrite_cp_refs_in_methods_annotations() |
duke@435 | 1936 | |
duke@435 | 1937 | |
duke@435 | 1938 | // Rewrite constant pool references in a methods_parameter_annotations |
duke@435 | 1939 | // field. This "structure" is adapted from the |
duke@435 | 1940 | // RuntimeVisibleParameterAnnotations_attribute described in section |
duke@435 | 1941 | // 4.8.17 of the 2nd-edition of the VM spec: |
duke@435 | 1942 | // |
duke@435 | 1943 | // methods_parameter_annotations_typeArray { |
duke@435 | 1944 | // u1 num_parameters; |
duke@435 | 1945 | // { |
duke@435 | 1946 | // u2 num_annotations; |
duke@435 | 1947 | // annotation annotations[num_annotations]; |
duke@435 | 1948 | // } parameter_annotations[num_parameters]; |
duke@435 | 1949 | // } |
duke@435 | 1950 | // |
duke@435 | 1951 | bool VM_RedefineClasses::rewrite_cp_refs_in_methods_parameter_annotations( |
duke@435 | 1952 | instanceKlassHandle scratch_class, TRAPS) { |
duke@435 | 1953 | |
duke@435 | 1954 | objArrayHandle methods_parameter_annotations(THREAD, |
duke@435 | 1955 | scratch_class->methods_parameter_annotations()); |
duke@435 | 1956 | |
duke@435 | 1957 | if (methods_parameter_annotations.is_null() |
duke@435 | 1958 | || methods_parameter_annotations->length() == 0) { |
duke@435 | 1959 | // no methods_parameter_annotations so nothing to do |
duke@435 | 1960 | return true; |
duke@435 | 1961 | } |
duke@435 | 1962 | |
duke@435 | 1963 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1964 | ("methods_parameter_annotations length=%d", |
duke@435 | 1965 | methods_parameter_annotations->length())); |
duke@435 | 1966 | |
duke@435 | 1967 | for (int i = 0; i < methods_parameter_annotations->length(); i++) { |
duke@435 | 1968 | typeArrayHandle method_parameter_annotations(THREAD, |
duke@435 | 1969 | (typeArrayOop)methods_parameter_annotations->obj_at(i)); |
duke@435 | 1970 | if (method_parameter_annotations.is_null() |
duke@435 | 1971 | || method_parameter_annotations->length() == 0) { |
duke@435 | 1972 | // this method does not have any parameter annotations so skip it |
duke@435 | 1973 | continue; |
duke@435 | 1974 | } |
duke@435 | 1975 | |
duke@435 | 1976 | if (method_parameter_annotations->length() < 1) { |
duke@435 | 1977 | // not enough room for a num_parameters field |
duke@435 | 1978 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1979 | ("length() is too small for a num_parameters field at %d", i)); |
duke@435 | 1980 | return false; |
duke@435 | 1981 | } |
duke@435 | 1982 | |
duke@435 | 1983 | int byte_i = 0; // byte index into method_parameter_annotations |
duke@435 | 1984 | |
duke@435 | 1985 | u1 num_parameters = method_parameter_annotations->byte_at(byte_i); |
duke@435 | 1986 | byte_i++; |
duke@435 | 1987 | |
duke@435 | 1988 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1989 | ("num_parameters=%d", num_parameters)); |
duke@435 | 1990 | |
duke@435 | 1991 | int calc_num_parameters = 0; |
duke@435 | 1992 | for (; calc_num_parameters < num_parameters; calc_num_parameters++) { |
duke@435 | 1993 | if (!rewrite_cp_refs_in_annotations_typeArray( |
duke@435 | 1994 | method_parameter_annotations, byte_i, THREAD)) { |
duke@435 | 1995 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 1996 | ("bad method_parameter_annotations at %d", calc_num_parameters)); |
twisti@1040 | 1997 | // propagate failure back to caller |
duke@435 | 1998 | return false; |
duke@435 | 1999 | } |
duke@435 | 2000 | } |
duke@435 | 2001 | assert(num_parameters == calc_num_parameters, "sanity check"); |
duke@435 | 2002 | } |
duke@435 | 2003 | |
duke@435 | 2004 | return true; |
duke@435 | 2005 | } // end rewrite_cp_refs_in_methods_parameter_annotations() |
duke@435 | 2006 | |
duke@435 | 2007 | |
duke@435 | 2008 | // Rewrite constant pool references in a methods_default_annotations |
duke@435 | 2009 | // field. This "structure" is adapted from the AnnotationDefault_attribute |
duke@435 | 2010 | // that is described in section 4.8.19 of the 2nd-edition of the VM spec: |
duke@435 | 2011 | // |
duke@435 | 2012 | // methods_default_annotations_typeArray { |
duke@435 | 2013 | // element_value default_value; |
duke@435 | 2014 | // } |
duke@435 | 2015 | // |
duke@435 | 2016 | bool VM_RedefineClasses::rewrite_cp_refs_in_methods_default_annotations( |
duke@435 | 2017 | instanceKlassHandle scratch_class, TRAPS) { |
duke@435 | 2018 | |
duke@435 | 2019 | objArrayHandle methods_default_annotations(THREAD, |
duke@435 | 2020 | scratch_class->methods_default_annotations()); |
duke@435 | 2021 | |
duke@435 | 2022 | if (methods_default_annotations.is_null() |
duke@435 | 2023 | || methods_default_annotations->length() == 0) { |
duke@435 | 2024 | // no methods_default_annotations so nothing to do |
duke@435 | 2025 | return true; |
duke@435 | 2026 | } |
duke@435 | 2027 | |
duke@435 | 2028 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 2029 | ("methods_default_annotations length=%d", |
duke@435 | 2030 | methods_default_annotations->length())); |
duke@435 | 2031 | |
duke@435 | 2032 | for (int i = 0; i < methods_default_annotations->length(); i++) { |
duke@435 | 2033 | typeArrayHandle method_default_annotations(THREAD, |
duke@435 | 2034 | (typeArrayOop)methods_default_annotations->obj_at(i)); |
duke@435 | 2035 | if (method_default_annotations.is_null() |
duke@435 | 2036 | || method_default_annotations->length() == 0) { |
duke@435 | 2037 | // this method does not have any default annotations so skip it |
duke@435 | 2038 | continue; |
duke@435 | 2039 | } |
duke@435 | 2040 | |
duke@435 | 2041 | int byte_i = 0; // byte index into method_default_annotations |
duke@435 | 2042 | |
duke@435 | 2043 | if (!rewrite_cp_refs_in_element_value( |
duke@435 | 2044 | method_default_annotations, byte_i, THREAD)) { |
duke@435 | 2045 | RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
duke@435 | 2046 | ("bad default element_value at %d", i)); |
twisti@1040 | 2047 | // propagate failure back to caller |
duke@435 | 2048 | return false; |
duke@435 | 2049 | } |
duke@435 | 2050 | } |
duke@435 | 2051 | |
duke@435 | 2052 | return true; |
duke@435 | 2053 | } // end rewrite_cp_refs_in_methods_default_annotations() |
duke@435 | 2054 | |
duke@435 | 2055 | |
duke@435 | 2056 | // Rewrite constant pool references in the method's stackmap table. |
duke@435 | 2057 | // These "structures" are adapted from the StackMapTable_attribute that |
duke@435 | 2058 | // is described in section 4.8.4 of the 6.0 version of the VM spec |
duke@435 | 2059 | // (dated 2005.10.26): |
duke@435 | 2060 | // file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf |
duke@435 | 2061 | // |
duke@435 | 2062 | // stack_map { |
duke@435 | 2063 | // u2 number_of_entries; |
duke@435 | 2064 | // stack_map_frame entries[number_of_entries]; |
duke@435 | 2065 | // } |
duke@435 | 2066 | // |
duke@435 | 2067 | void VM_RedefineClasses::rewrite_cp_refs_in_stack_map_table( |
duke@435 | 2068 | methodHandle method, TRAPS) { |
duke@435 | 2069 | |
duke@435 | 2070 | if (!method->has_stackmap_table()) { |
duke@435 | 2071 | return; |
duke@435 | 2072 | } |
duke@435 | 2073 | |
duke@435 | 2074 | typeArrayOop stackmap_data = method->stackmap_data(); |
duke@435 | 2075 | address stackmap_p = (address)stackmap_data->byte_at_addr(0); |
duke@435 | 2076 | address stackmap_end = stackmap_p + stackmap_data->length(); |
duke@435 | 2077 | |
duke@435 | 2078 | assert(stackmap_p + 2 <= stackmap_end, "no room for number_of_entries"); |
duke@435 | 2079 | u2 number_of_entries = Bytes::get_Java_u2(stackmap_p); |
duke@435 | 2080 | stackmap_p += 2; |
duke@435 | 2081 | |
duke@435 | 2082 | RC_TRACE_WITH_THREAD(0x04000000, THREAD, |
duke@435 | 2083 | ("number_of_entries=%u", number_of_entries)); |
duke@435 | 2084 | |
duke@435 | 2085 | // walk through each stack_map_frame |
duke@435 | 2086 | u2 calc_number_of_entries = 0; |
duke@435 | 2087 | for (; calc_number_of_entries < number_of_entries; calc_number_of_entries++) { |
duke@435 | 2088 | // The stack_map_frame structure is a u1 frame_type followed by |
duke@435 | 2089 | // 0 or more bytes of data: |
duke@435 | 2090 | // |
duke@435 | 2091 | // union stack_map_frame { |
duke@435 | 2092 | // same_frame; |
duke@435 | 2093 | // same_locals_1_stack_item_frame; |
duke@435 | 2094 | // same_locals_1_stack_item_frame_extended; |
duke@435 | 2095 | // chop_frame; |
duke@435 | 2096 | // same_frame_extended; |
duke@435 | 2097 | // append_frame; |
duke@435 | 2098 | // full_frame; |
duke@435 | 2099 | // } |
duke@435 | 2100 | |
duke@435 | 2101 | assert(stackmap_p + 1 <= stackmap_end, "no room for frame_type"); |
duke@435 | 2102 | // The Linux compiler does not like frame_type to be u1 or u2. It |
duke@435 | 2103 | // issues the following warning for the first if-statement below: |
duke@435 | 2104 | // |
duke@435 | 2105 | // "warning: comparison is always true due to limited range of data type" |
duke@435 | 2106 | // |
duke@435 | 2107 | u4 frame_type = *stackmap_p; |
duke@435 | 2108 | stackmap_p++; |
duke@435 | 2109 | |
duke@435 | 2110 | // same_frame { |
duke@435 | 2111 | // u1 frame_type = SAME; /* 0-63 */ |
duke@435 | 2112 | // } |
duke@435 | 2113 | if (frame_type >= 0 && frame_type <= 63) { |
duke@435 | 2114 | // nothing more to do for same_frame |
duke@435 | 2115 | } |
duke@435 | 2116 | |
duke@435 | 2117 | // same_locals_1_stack_item_frame { |
duke@435 | 2118 | // u1 frame_type = SAME_LOCALS_1_STACK_ITEM; /* 64-127 */ |
duke@435 | 2119 | // verification_type_info stack[1]; |
duke@435 | 2120 | // } |
duke@435 | 2121 | else if (frame_type >= 64 && frame_type <= 127) { |
duke@435 | 2122 | rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
duke@435 | 2123 | calc_number_of_entries, frame_type, THREAD); |
duke@435 | 2124 | } |
duke@435 | 2125 | |
duke@435 | 2126 | // reserved for future use |
duke@435 | 2127 | else if (frame_type >= 128 && frame_type <= 246) { |
duke@435 | 2128 | // nothing more to do for reserved frame_types |
duke@435 | 2129 | } |
duke@435 | 2130 | |
duke@435 | 2131 | // same_locals_1_stack_item_frame_extended { |
duke@435 | 2132 | // u1 frame_type = SAME_LOCALS_1_STACK_ITEM_EXTENDED; /* 247 */ |
duke@435 | 2133 | // u2 offset_delta; |
duke@435 | 2134 | // verification_type_info stack[1]; |
duke@435 | 2135 | // } |
duke@435 | 2136 | else if (frame_type == 247) { |
duke@435 | 2137 | stackmap_p += 2; |
duke@435 | 2138 | rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
duke@435 | 2139 | calc_number_of_entries, frame_type, THREAD); |
duke@435 | 2140 | } |
duke@435 | 2141 | |
duke@435 | 2142 | // chop_frame { |
duke@435 | 2143 | // u1 frame_type = CHOP; /* 248-250 */ |
duke@435 | 2144 | // u2 offset_delta; |
duke@435 | 2145 | // } |
duke@435 | 2146 | else if (frame_type >= 248 && frame_type <= 250) { |
duke@435 | 2147 | stackmap_p += 2; |
duke@435 | 2148 | } |
duke@435 | 2149 | |
duke@435 | 2150 | // same_frame_extended { |
duke@435 | 2151 | // u1 frame_type = SAME_FRAME_EXTENDED; /* 251*/ |
duke@435 | 2152 | // u2 offset_delta; |
duke@435 | 2153 | // } |
duke@435 | 2154 | else if (frame_type == 251) { |
duke@435 | 2155 | stackmap_p += 2; |
duke@435 | 2156 | } |
duke@435 | 2157 | |
duke@435 | 2158 | // append_frame { |
duke@435 | 2159 | // u1 frame_type = APPEND; /* 252-254 */ |
duke@435 | 2160 | // u2 offset_delta; |
duke@435 | 2161 | // verification_type_info locals[frame_type - 251]; |
duke@435 | 2162 | // } |
duke@435 | 2163 | else if (frame_type >= 252 && frame_type <= 254) { |
duke@435 | 2164 | assert(stackmap_p + 2 <= stackmap_end, |
duke@435 | 2165 | "no room for offset_delta"); |
duke@435 | 2166 | stackmap_p += 2; |
duke@435 | 2167 | u1 len = frame_type - 251; |
duke@435 | 2168 | for (u1 i = 0; i < len; i++) { |
duke@435 | 2169 | rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
duke@435 | 2170 | calc_number_of_entries, frame_type, THREAD); |
duke@435 | 2171 | } |
duke@435 | 2172 | } |
duke@435 | 2173 | |
duke@435 | 2174 | // full_frame { |
duke@435 | 2175 | // u1 frame_type = FULL_FRAME; /* 255 */ |
duke@435 | 2176 | // u2 offset_delta; |
duke@435 | 2177 | // u2 number_of_locals; |
duke@435 | 2178 | // verification_type_info locals[number_of_locals]; |
duke@435 | 2179 | // u2 number_of_stack_items; |
duke@435 | 2180 | // verification_type_info stack[number_of_stack_items]; |
duke@435 | 2181 | // } |
duke@435 | 2182 | else if (frame_type == 255) { |
duke@435 | 2183 | assert(stackmap_p + 2 + 2 <= stackmap_end, |
duke@435 | 2184 | "no room for smallest full_frame"); |
duke@435 | 2185 | stackmap_p += 2; |
duke@435 | 2186 | |
duke@435 | 2187 | u2 number_of_locals = Bytes::get_Java_u2(stackmap_p); |
duke@435 | 2188 | stackmap_p += 2; |
duke@435 | 2189 | |
duke@435 | 2190 | for (u2 locals_i = 0; locals_i < number_of_locals; locals_i++) { |
duke@435 | 2191 | rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
duke@435 | 2192 | calc_number_of_entries, frame_type, THREAD); |
duke@435 | 2193 | } |
duke@435 | 2194 | |
duke@435 | 2195 | // Use the largest size for the number_of_stack_items, but only get |
duke@435 | 2196 | // the right number of bytes. |
duke@435 | 2197 | u2 number_of_stack_items = Bytes::get_Java_u2(stackmap_p); |
duke@435 | 2198 | stackmap_p += 2; |
duke@435 | 2199 | |
duke@435 | 2200 | for (u2 stack_i = 0; stack_i < number_of_stack_items; stack_i++) { |
duke@435 | 2201 | rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
duke@435 | 2202 | calc_number_of_entries, frame_type, THREAD); |
duke@435 | 2203 | } |
duke@435 | 2204 | } |
duke@435 | 2205 | } // end while there is a stack_map_frame |
duke@435 | 2206 | assert(number_of_entries == calc_number_of_entries, "sanity check"); |
duke@435 | 2207 | } // end rewrite_cp_refs_in_stack_map_table() |
duke@435 | 2208 | |
duke@435 | 2209 | |
duke@435 | 2210 | // Rewrite constant pool references in the verification type info |
duke@435 | 2211 | // portion of the method's stackmap table. These "structures" are |
duke@435 | 2212 | // adapted from the StackMapTable_attribute that is described in |
duke@435 | 2213 | // section 4.8.4 of the 6.0 version of the VM spec (dated 2005.10.26): |
duke@435 | 2214 | // file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf |
duke@435 | 2215 | // |
duke@435 | 2216 | // The verification_type_info structure is a u1 tag followed by 0 or |
duke@435 | 2217 | // more bytes of data: |
duke@435 | 2218 | // |
duke@435 | 2219 | // union verification_type_info { |
duke@435 | 2220 | // Top_variable_info; |
duke@435 | 2221 | // Integer_variable_info; |
duke@435 | 2222 | // Float_variable_info; |
duke@435 | 2223 | // Long_variable_info; |
duke@435 | 2224 | // Double_variable_info; |
duke@435 | 2225 | // Null_variable_info; |
duke@435 | 2226 | // UninitializedThis_variable_info; |
duke@435 | 2227 | // Object_variable_info; |
duke@435 | 2228 | // Uninitialized_variable_info; |
duke@435 | 2229 | // } |
duke@435 | 2230 | // |
duke@435 | 2231 | void VM_RedefineClasses::rewrite_cp_refs_in_verification_type_info( |
duke@435 | 2232 | address& stackmap_p_ref, address stackmap_end, u2 frame_i, |
duke@435 | 2233 | u1 frame_type, TRAPS) { |
duke@435 | 2234 | |
duke@435 | 2235 | assert(stackmap_p_ref + 1 <= stackmap_end, "no room for tag"); |
duke@435 | 2236 | u1 tag = *stackmap_p_ref; |
duke@435 | 2237 | stackmap_p_ref++; |
duke@435 | 2238 | |
duke@435 | 2239 | switch (tag) { |
duke@435 | 2240 | // Top_variable_info { |
duke@435 | 2241 | // u1 tag = ITEM_Top; /* 0 */ |
duke@435 | 2242 | // } |
duke@435 | 2243 | // verificationType.hpp has zero as ITEM_Bogus instead of ITEM_Top |
duke@435 | 2244 | case 0: // fall through |
duke@435 | 2245 | |
duke@435 | 2246 | // Integer_variable_info { |
duke@435 | 2247 | // u1 tag = ITEM_Integer; /* 1 */ |
duke@435 | 2248 | // } |
duke@435 | 2249 | case ITEM_Integer: // fall through |
duke@435 | 2250 | |
duke@435 | 2251 | // Float_variable_info { |
duke@435 | 2252 | // u1 tag = ITEM_Float; /* 2 */ |
duke@435 | 2253 | // } |
duke@435 | 2254 | case ITEM_Float: // fall through |
duke@435 | 2255 | |
duke@435 | 2256 | // Double_variable_info { |
duke@435 | 2257 | // u1 tag = ITEM_Double; /* 3 */ |
duke@435 | 2258 | // } |
duke@435 | 2259 | case ITEM_Double: // fall through |
duke@435 | 2260 | |
duke@435 | 2261 | // Long_variable_info { |
duke@435 | 2262 | // u1 tag = ITEM_Long; /* 4 */ |
duke@435 | 2263 | // } |
duke@435 | 2264 | case ITEM_Long: // fall through |
duke@435 | 2265 | |
duke@435 | 2266 | // Null_variable_info { |
duke@435 | 2267 | // u1 tag = ITEM_Null; /* 5 */ |
duke@435 | 2268 | // } |
duke@435 | 2269 | case ITEM_Null: // fall through |
duke@435 | 2270 | |
duke@435 | 2271 | // UninitializedThis_variable_info { |
duke@435 | 2272 | // u1 tag = ITEM_UninitializedThis; /* 6 */ |
duke@435 | 2273 | // } |
duke@435 | 2274 | case ITEM_UninitializedThis: |
duke@435 | 2275 | // nothing more to do for the above tag types |
duke@435 | 2276 | break; |
duke@435 | 2277 | |
duke@435 | 2278 | // Object_variable_info { |
duke@435 | 2279 | // u1 tag = ITEM_Object; /* 7 */ |
duke@435 | 2280 | // u2 cpool_index; |
duke@435 | 2281 | // } |
duke@435 | 2282 | case ITEM_Object: |
duke@435 | 2283 | { |
duke@435 | 2284 | assert(stackmap_p_ref + 2 <= stackmap_end, "no room for cpool_index"); |
duke@435 | 2285 | u2 cpool_index = Bytes::get_Java_u2(stackmap_p_ref); |
duke@435 | 2286 | u2 new_cp_index = find_new_index(cpool_index); |
duke@435 | 2287 | if (new_cp_index != 0) { |
duke@435 | 2288 | RC_TRACE_WITH_THREAD(0x04000000, THREAD, |
duke@435 | 2289 | ("mapped old cpool_index=%d", cpool_index)); |
duke@435 | 2290 | Bytes::put_Java_u2(stackmap_p_ref, new_cp_index); |
duke@435 | 2291 | cpool_index = new_cp_index; |
duke@435 | 2292 | } |
duke@435 | 2293 | stackmap_p_ref += 2; |
duke@435 | 2294 | |
duke@435 | 2295 | RC_TRACE_WITH_THREAD(0x04000000, THREAD, |
duke@435 | 2296 | ("frame_i=%u, frame_type=%u, cpool_index=%d", frame_i, |
duke@435 | 2297 | frame_type, cpool_index)); |
duke@435 | 2298 | } break; |
duke@435 | 2299 | |
duke@435 | 2300 | // Uninitialized_variable_info { |
duke@435 | 2301 | // u1 tag = ITEM_Uninitialized; /* 8 */ |
duke@435 | 2302 | // u2 offset; |
duke@435 | 2303 | // } |
duke@435 | 2304 | case ITEM_Uninitialized: |
duke@435 | 2305 | assert(stackmap_p_ref + 2 <= stackmap_end, "no room for offset"); |
duke@435 | 2306 | stackmap_p_ref += 2; |
duke@435 | 2307 | break; |
duke@435 | 2308 | |
duke@435 | 2309 | default: |
duke@435 | 2310 | RC_TRACE_WITH_THREAD(0x04000000, THREAD, |
duke@435 | 2311 | ("frame_i=%u, frame_type=%u, bad tag=0x%x", frame_i, frame_type, tag)); |
duke@435 | 2312 | ShouldNotReachHere(); |
duke@435 | 2313 | break; |
duke@435 | 2314 | } // end switch (tag) |
duke@435 | 2315 | } // end rewrite_cp_refs_in_verification_type_info() |
duke@435 | 2316 | |
duke@435 | 2317 | |
duke@435 | 2318 | // Change the constant pool associated with klass scratch_class to |
duke@435 | 2319 | // scratch_cp. If shrink is true, then scratch_cp_length elements |
duke@435 | 2320 | // are copied from scratch_cp to a smaller constant pool and the |
duke@435 | 2321 | // smaller constant pool is associated with scratch_class. |
duke@435 | 2322 | void VM_RedefineClasses::set_new_constant_pool( |
duke@435 | 2323 | instanceKlassHandle scratch_class, constantPoolHandle scratch_cp, |
duke@435 | 2324 | int scratch_cp_length, bool shrink, TRAPS) { |
duke@435 | 2325 | assert(!shrink || scratch_cp->length() >= scratch_cp_length, "sanity check"); |
duke@435 | 2326 | |
duke@435 | 2327 | if (shrink) { |
duke@435 | 2328 | // scratch_cp is a merged constant pool and has enough space for a |
duke@435 | 2329 | // worst case merge situation. We want to associate the minimum |
duke@435 | 2330 | // sized constant pool with the klass to save space. |
duke@435 | 2331 | constantPoolHandle smaller_cp(THREAD, |
jmasa@953 | 2332 | oopFactory::new_constantPool(scratch_cp_length, |
jmasa@953 | 2333 | methodOopDesc::IsUnsafeConc, |
jmasa@953 | 2334 | THREAD)); |
duke@435 | 2335 | // preserve orig_length() value in the smaller copy |
duke@435 | 2336 | int orig_length = scratch_cp->orig_length(); |
duke@435 | 2337 | assert(orig_length != 0, "sanity check"); |
duke@435 | 2338 | smaller_cp->set_orig_length(orig_length); |
duke@435 | 2339 | scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD); |
duke@435 | 2340 | scratch_cp = smaller_cp; |
jmasa@953 | 2341 | smaller_cp()->set_is_conc_safe(true); |
duke@435 | 2342 | } |
duke@435 | 2343 | |
duke@435 | 2344 | // attach new constant pool to klass |
duke@435 | 2345 | scratch_cp->set_pool_holder(scratch_class()); |
duke@435 | 2346 | |
duke@435 | 2347 | // attach klass to new constant pool |
duke@435 | 2348 | scratch_class->set_constants(scratch_cp()); |
duke@435 | 2349 | |
duke@435 | 2350 | int i; // for portability |
duke@435 | 2351 | |
duke@435 | 2352 | // update each field in klass to use new constant pool indices as needed |
duke@435 | 2353 | typeArrayHandle fields(THREAD, scratch_class->fields()); |
duke@435 | 2354 | int n_fields = fields->length(); |
duke@435 | 2355 | for (i = 0; i < n_fields; i += instanceKlass::next_offset) { |
duke@435 | 2356 | jshort cur_index = fields->short_at(i + instanceKlass::name_index_offset); |
duke@435 | 2357 | jshort new_index = find_new_index(cur_index); |
duke@435 | 2358 | if (new_index != 0) { |
duke@435 | 2359 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2360 | ("field-name_index change: %d to %d", cur_index, new_index)); |
duke@435 | 2361 | fields->short_at_put(i + instanceKlass::name_index_offset, new_index); |
duke@435 | 2362 | } |
duke@435 | 2363 | cur_index = fields->short_at(i + instanceKlass::signature_index_offset); |
duke@435 | 2364 | new_index = find_new_index(cur_index); |
duke@435 | 2365 | if (new_index != 0) { |
duke@435 | 2366 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2367 | ("field-signature_index change: %d to %d", cur_index, new_index)); |
duke@435 | 2368 | fields->short_at_put(i + instanceKlass::signature_index_offset, |
duke@435 | 2369 | new_index); |
duke@435 | 2370 | } |
duke@435 | 2371 | cur_index = fields->short_at(i + instanceKlass::initval_index_offset); |
duke@435 | 2372 | new_index = find_new_index(cur_index); |
duke@435 | 2373 | if (new_index != 0) { |
duke@435 | 2374 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2375 | ("field-initval_index change: %d to %d", cur_index, new_index)); |
duke@435 | 2376 | fields->short_at_put(i + instanceKlass::initval_index_offset, new_index); |
duke@435 | 2377 | } |
duke@435 | 2378 | cur_index = fields->short_at(i + instanceKlass::generic_signature_offset); |
duke@435 | 2379 | new_index = find_new_index(cur_index); |
duke@435 | 2380 | if (new_index != 0) { |
duke@435 | 2381 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2382 | ("field-generic_signature change: %d to %d", cur_index, new_index)); |
duke@435 | 2383 | fields->short_at_put(i + instanceKlass::generic_signature_offset, |
duke@435 | 2384 | new_index); |
duke@435 | 2385 | } |
duke@435 | 2386 | } // end for each field |
duke@435 | 2387 | |
duke@435 | 2388 | // Update constant pool indices in the inner classes info to use |
duke@435 | 2389 | // new constant indices as needed. The inner classes info is a |
duke@435 | 2390 | // quadruple: |
duke@435 | 2391 | // (inner_class_info, outer_class_info, inner_name, inner_access_flags) |
duke@435 | 2392 | typeArrayOop inner_class_list = scratch_class->inner_classes(); |
duke@435 | 2393 | int icl_length = (inner_class_list == NULL) ? 0 : inner_class_list->length(); |
duke@435 | 2394 | if (icl_length > 0) { |
duke@435 | 2395 | typeArrayHandle inner_class_list_h(THREAD, inner_class_list); |
duke@435 | 2396 | for (int i = 0; i < icl_length; |
duke@435 | 2397 | i += instanceKlass::inner_class_next_offset) { |
duke@435 | 2398 | int cur_index = inner_class_list_h->ushort_at(i |
duke@435 | 2399 | + instanceKlass::inner_class_inner_class_info_offset); |
duke@435 | 2400 | if (cur_index == 0) { |
duke@435 | 2401 | continue; // JVM spec. allows null inner class refs so skip it |
duke@435 | 2402 | } |
duke@435 | 2403 | int new_index = find_new_index(cur_index); |
duke@435 | 2404 | if (new_index != 0) { |
duke@435 | 2405 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2406 | ("inner_class_info change: %d to %d", cur_index, new_index)); |
duke@435 | 2407 | inner_class_list_h->ushort_at_put(i |
duke@435 | 2408 | + instanceKlass::inner_class_inner_class_info_offset, new_index); |
duke@435 | 2409 | } |
duke@435 | 2410 | cur_index = inner_class_list_h->ushort_at(i |
duke@435 | 2411 | + instanceKlass::inner_class_outer_class_info_offset); |
duke@435 | 2412 | new_index = find_new_index(cur_index); |
duke@435 | 2413 | if (new_index != 0) { |
duke@435 | 2414 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2415 | ("outer_class_info change: %d to %d", cur_index, new_index)); |
duke@435 | 2416 | inner_class_list_h->ushort_at_put(i |
duke@435 | 2417 | + instanceKlass::inner_class_outer_class_info_offset, new_index); |
duke@435 | 2418 | } |
duke@435 | 2419 | cur_index = inner_class_list_h->ushort_at(i |
duke@435 | 2420 | + instanceKlass::inner_class_inner_name_offset); |
duke@435 | 2421 | new_index = find_new_index(cur_index); |
duke@435 | 2422 | if (new_index != 0) { |
duke@435 | 2423 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2424 | ("inner_name change: %d to %d", cur_index, new_index)); |
duke@435 | 2425 | inner_class_list_h->ushort_at_put(i |
duke@435 | 2426 | + instanceKlass::inner_class_inner_name_offset, new_index); |
duke@435 | 2427 | } |
duke@435 | 2428 | } // end for each inner class |
duke@435 | 2429 | } // end if we have inner classes |
duke@435 | 2430 | |
duke@435 | 2431 | // Attach each method in klass to the new constant pool and update |
duke@435 | 2432 | // to use new constant pool indices as needed: |
duke@435 | 2433 | objArrayHandle methods(THREAD, scratch_class->methods()); |
duke@435 | 2434 | for (i = methods->length() - 1; i >= 0; i--) { |
duke@435 | 2435 | methodHandle method(THREAD, (methodOop)methods->obj_at(i)); |
duke@435 | 2436 | method->set_constants(scratch_cp()); |
duke@435 | 2437 | |
duke@435 | 2438 | int new_index = find_new_index(method->name_index()); |
duke@435 | 2439 | if (new_index != 0) { |
duke@435 | 2440 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2441 | ("method-name_index change: %d to %d", method->name_index(), |
duke@435 | 2442 | new_index)); |
duke@435 | 2443 | method->set_name_index(new_index); |
duke@435 | 2444 | } |
duke@435 | 2445 | new_index = find_new_index(method->signature_index()); |
duke@435 | 2446 | if (new_index != 0) { |
duke@435 | 2447 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2448 | ("method-signature_index change: %d to %d", |
duke@435 | 2449 | method->signature_index(), new_index)); |
duke@435 | 2450 | method->set_signature_index(new_index); |
duke@435 | 2451 | } |
duke@435 | 2452 | new_index = find_new_index(method->generic_signature_index()); |
duke@435 | 2453 | if (new_index != 0) { |
duke@435 | 2454 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2455 | ("method-generic_signature_index change: %d to %d", |
duke@435 | 2456 | method->generic_signature_index(), new_index)); |
duke@435 | 2457 | method->set_generic_signature_index(new_index); |
duke@435 | 2458 | } |
duke@435 | 2459 | |
duke@435 | 2460 | // Update constant pool indices in the method's checked exception |
duke@435 | 2461 | // table to use new constant indices as needed. |
duke@435 | 2462 | int cext_length = method->checked_exceptions_length(); |
duke@435 | 2463 | if (cext_length > 0) { |
duke@435 | 2464 | CheckedExceptionElement * cext_table = |
duke@435 | 2465 | method->checked_exceptions_start(); |
duke@435 | 2466 | for (int j = 0; j < cext_length; j++) { |
duke@435 | 2467 | int cur_index = cext_table[j].class_cp_index; |
duke@435 | 2468 | int new_index = find_new_index(cur_index); |
duke@435 | 2469 | if (new_index != 0) { |
duke@435 | 2470 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2471 | ("cext-class_cp_index change: %d to %d", cur_index, new_index)); |
duke@435 | 2472 | cext_table[j].class_cp_index = (u2)new_index; |
duke@435 | 2473 | } |
duke@435 | 2474 | } // end for each checked exception table entry |
duke@435 | 2475 | } // end if there are checked exception table entries |
duke@435 | 2476 | |
duke@435 | 2477 | // Update each catch type index in the method's exception table |
duke@435 | 2478 | // to use new constant pool indices as needed. The exception table |
duke@435 | 2479 | // holds quadruple entries of the form: |
duke@435 | 2480 | // (beg_bci, end_bci, handler_bci, klass_index) |
duke@435 | 2481 | const int beg_bci_offset = 0; |
duke@435 | 2482 | const int end_bci_offset = 1; |
duke@435 | 2483 | const int handler_bci_offset = 2; |
duke@435 | 2484 | const int klass_index_offset = 3; |
duke@435 | 2485 | const int entry_size = 4; |
duke@435 | 2486 | |
duke@435 | 2487 | typeArrayHandle ex_table (THREAD, method->exception_table()); |
duke@435 | 2488 | int ext_length = ex_table->length(); |
duke@435 | 2489 | assert(ext_length % entry_size == 0, "exception table format has changed"); |
duke@435 | 2490 | |
duke@435 | 2491 | for (int j = 0; j < ext_length; j += entry_size) { |
duke@435 | 2492 | int cur_index = ex_table->int_at(j + klass_index_offset); |
duke@435 | 2493 | int new_index = find_new_index(cur_index); |
duke@435 | 2494 | if (new_index != 0) { |
duke@435 | 2495 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2496 | ("ext-klass_index change: %d to %d", cur_index, new_index)); |
duke@435 | 2497 | ex_table->int_at_put(j + klass_index_offset, new_index); |
duke@435 | 2498 | } |
duke@435 | 2499 | } // end for each exception table entry |
duke@435 | 2500 | |
duke@435 | 2501 | // Update constant pool indices in the method's local variable |
duke@435 | 2502 | // table to use new constant indices as needed. The local variable |
duke@435 | 2503 | // table hold sextuple entries of the form: |
duke@435 | 2504 | // (start_pc, length, name_index, descriptor_index, signature_index, slot) |
duke@435 | 2505 | int lvt_length = method->localvariable_table_length(); |
duke@435 | 2506 | if (lvt_length > 0) { |
duke@435 | 2507 | LocalVariableTableElement * lv_table = |
duke@435 | 2508 | method->localvariable_table_start(); |
duke@435 | 2509 | for (int j = 0; j < lvt_length; j++) { |
duke@435 | 2510 | int cur_index = lv_table[j].name_cp_index; |
duke@435 | 2511 | int new_index = find_new_index(cur_index); |
duke@435 | 2512 | if (new_index != 0) { |
duke@435 | 2513 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2514 | ("lvt-name_cp_index change: %d to %d", cur_index, new_index)); |
duke@435 | 2515 | lv_table[j].name_cp_index = (u2)new_index; |
duke@435 | 2516 | } |
duke@435 | 2517 | cur_index = lv_table[j].descriptor_cp_index; |
duke@435 | 2518 | new_index = find_new_index(cur_index); |
duke@435 | 2519 | if (new_index != 0) { |
duke@435 | 2520 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2521 | ("lvt-descriptor_cp_index change: %d to %d", cur_index, |
duke@435 | 2522 | new_index)); |
duke@435 | 2523 | lv_table[j].descriptor_cp_index = (u2)new_index; |
duke@435 | 2524 | } |
duke@435 | 2525 | cur_index = lv_table[j].signature_cp_index; |
duke@435 | 2526 | new_index = find_new_index(cur_index); |
duke@435 | 2527 | if (new_index != 0) { |
duke@435 | 2528 | RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
duke@435 | 2529 | ("lvt-signature_cp_index change: %d to %d", cur_index, new_index)); |
duke@435 | 2530 | lv_table[j].signature_cp_index = (u2)new_index; |
duke@435 | 2531 | } |
duke@435 | 2532 | } // end for each local variable table entry |
duke@435 | 2533 | } // end if there are local variable table entries |
duke@435 | 2534 | |
duke@435 | 2535 | rewrite_cp_refs_in_stack_map_table(method, THREAD); |
duke@435 | 2536 | } // end for each method |
jmasa@953 | 2537 | assert(scratch_cp()->is_conc_safe(), "Just checking"); |
duke@435 | 2538 | } // end set_new_constant_pool() |
duke@435 | 2539 | |
duke@435 | 2540 | |
duke@435 | 2541 | // Unevolving classes may point to methods of the_class directly |
duke@435 | 2542 | // from their constant pool caches, itables, and/or vtables. We |
duke@435 | 2543 | // use the SystemDictionary::classes_do() facility and this helper |
duke@435 | 2544 | // to fix up these pointers. |
duke@435 | 2545 | // |
duke@435 | 2546 | // Note: We currently don't support updating the vtable in |
duke@435 | 2547 | // arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp. |
duke@435 | 2548 | void VM_RedefineClasses::adjust_cpool_cache_and_vtable(klassOop k_oop, |
duke@435 | 2549 | oop initiating_loader, TRAPS) { |
duke@435 | 2550 | Klass *k = k_oop->klass_part(); |
duke@435 | 2551 | if (k->oop_is_instance()) { |
duke@435 | 2552 | HandleMark hm(THREAD); |
duke@435 | 2553 | instanceKlass *ik = (instanceKlass *) k; |
duke@435 | 2554 | |
duke@435 | 2555 | // HotSpot specific optimization! HotSpot does not currently |
duke@435 | 2556 | // support delegation from the bootstrap class loader to a |
duke@435 | 2557 | // user-defined class loader. This means that if the bootstrap |
duke@435 | 2558 | // class loader is the initiating class loader, then it will also |
duke@435 | 2559 | // be the defining class loader. This also means that classes |
duke@435 | 2560 | // loaded by the bootstrap class loader cannot refer to classes |
duke@435 | 2561 | // loaded by a user-defined class loader. Note: a user-defined |
duke@435 | 2562 | // class loader can delegate to the bootstrap class loader. |
duke@435 | 2563 | // |
duke@435 | 2564 | // If the current class being redefined has a user-defined class |
duke@435 | 2565 | // loader as its defining class loader, then we can skip all |
duke@435 | 2566 | // classes loaded by the bootstrap class loader. |
duke@435 | 2567 | bool is_user_defined = |
duke@435 | 2568 | instanceKlass::cast(_the_class_oop)->class_loader() != NULL; |
duke@435 | 2569 | if (is_user_defined && ik->class_loader() == NULL) { |
duke@435 | 2570 | return; |
duke@435 | 2571 | } |
duke@435 | 2572 | |
duke@435 | 2573 | // This is a very busy routine. We don't want too much tracing |
duke@435 | 2574 | // printed out. |
duke@435 | 2575 | bool trace_name_printed = false; |
duke@435 | 2576 | |
duke@435 | 2577 | // Very noisy: only enable this call if you are trying to determine |
duke@435 | 2578 | // that a specific class gets found by this routine. |
duke@435 | 2579 | // RC_TRACE macro has an embedded ResourceMark |
duke@435 | 2580 | // RC_TRACE_WITH_THREAD(0x00100000, THREAD, |
duke@435 | 2581 | // ("adjust check: name=%s", ik->external_name())); |
duke@435 | 2582 | // trace_name_printed = true; |
duke@435 | 2583 | |
duke@435 | 2584 | // Fix the vtable embedded in the_class and subclasses of the_class, |
duke@435 | 2585 | // if one exists. We discard scratch_class and we don't keep an |
duke@435 | 2586 | // instanceKlass around to hold obsolete methods so we don't have |
duke@435 | 2587 | // any other instanceKlass embedded vtables to update. The vtable |
duke@435 | 2588 | // holds the methodOops for virtual (but not final) methods. |
duke@435 | 2589 | if (ik->vtable_length() > 0 && ik->is_subtype_of(_the_class_oop)) { |
duke@435 | 2590 | // ik->vtable() creates a wrapper object; rm cleans it up |
duke@435 | 2591 | ResourceMark rm(THREAD); |
duke@435 | 2592 | ik->vtable()->adjust_method_entries(_matching_old_methods, |
duke@435 | 2593 | _matching_new_methods, |
duke@435 | 2594 | _matching_methods_length, |
duke@435 | 2595 | &trace_name_printed); |
duke@435 | 2596 | } |
duke@435 | 2597 | |
duke@435 | 2598 | // If the current class has an itable and we are either redefining an |
duke@435 | 2599 | // interface or if the current class is a subclass of the_class, then |
duke@435 | 2600 | // we potentially have to fix the itable. If we are redefining an |
duke@435 | 2601 | // interface, then we have to call adjust_method_entries() for |
duke@435 | 2602 | // every instanceKlass that has an itable since there isn't a |
duke@435 | 2603 | // subclass relationship between an interface and an instanceKlass. |
duke@435 | 2604 | if (ik->itable_length() > 0 && (Klass::cast(_the_class_oop)->is_interface() |
duke@435 | 2605 | || ik->is_subclass_of(_the_class_oop))) { |
duke@435 | 2606 | // ik->itable() creates a wrapper object; rm cleans it up |
duke@435 | 2607 | ResourceMark rm(THREAD); |
duke@435 | 2608 | ik->itable()->adjust_method_entries(_matching_old_methods, |
duke@435 | 2609 | _matching_new_methods, |
duke@435 | 2610 | _matching_methods_length, |
duke@435 | 2611 | &trace_name_printed); |
duke@435 | 2612 | } |
duke@435 | 2613 | |
duke@435 | 2614 | // The constant pools in other classes (other_cp) can refer to |
duke@435 | 2615 | // methods in the_class. We have to update method information in |
duke@435 | 2616 | // other_cp's cache. If other_cp has a previous version, then we |
duke@435 | 2617 | // have to repeat the process for each previous version. The |
duke@435 | 2618 | // constant pool cache holds the methodOops for non-virtual |
duke@435 | 2619 | // methods and for virtual, final methods. |
duke@435 | 2620 | // |
duke@435 | 2621 | // Special case: if the current class is the_class, then new_cp |
duke@435 | 2622 | // has already been attached to the_class and old_cp has already |
duke@435 | 2623 | // been added as a previous version. The new_cp doesn't have any |
duke@435 | 2624 | // cached references to old methods so it doesn't need to be |
duke@435 | 2625 | // updated. We can simply start with the previous version(s) in |
duke@435 | 2626 | // that case. |
duke@435 | 2627 | constantPoolHandle other_cp; |
duke@435 | 2628 | constantPoolCacheOop cp_cache; |
duke@435 | 2629 | |
duke@435 | 2630 | if (k_oop != _the_class_oop) { |
duke@435 | 2631 | // this klass' constant pool cache may need adjustment |
duke@435 | 2632 | other_cp = constantPoolHandle(ik->constants()); |
duke@435 | 2633 | cp_cache = other_cp->cache(); |
duke@435 | 2634 | if (cp_cache != NULL) { |
duke@435 | 2635 | cp_cache->adjust_method_entries(_matching_old_methods, |
duke@435 | 2636 | _matching_new_methods, |
duke@435 | 2637 | _matching_methods_length, |
duke@435 | 2638 | &trace_name_printed); |
duke@435 | 2639 | } |
duke@435 | 2640 | } |
duke@435 | 2641 | { |
duke@435 | 2642 | ResourceMark rm(THREAD); |
duke@435 | 2643 | // PreviousVersionInfo objects returned via PreviousVersionWalker |
duke@435 | 2644 | // contain a GrowableArray of handles. We have to clean up the |
duke@435 | 2645 | // GrowableArray _after_ the PreviousVersionWalker destructor |
duke@435 | 2646 | // has destroyed the handles. |
duke@435 | 2647 | { |
duke@435 | 2648 | // the previous versions' constant pool caches may need adjustment |
duke@435 | 2649 | PreviousVersionWalker pvw(ik); |
duke@435 | 2650 | for (PreviousVersionInfo * pv_info = pvw.next_previous_version(); |
duke@435 | 2651 | pv_info != NULL; pv_info = pvw.next_previous_version()) { |
duke@435 | 2652 | other_cp = pv_info->prev_constant_pool_handle(); |
duke@435 | 2653 | cp_cache = other_cp->cache(); |
duke@435 | 2654 | if (cp_cache != NULL) { |
duke@435 | 2655 | cp_cache->adjust_method_entries(_matching_old_methods, |
duke@435 | 2656 | _matching_new_methods, |
duke@435 | 2657 | _matching_methods_length, |
duke@435 | 2658 | &trace_name_printed); |
duke@435 | 2659 | } |
duke@435 | 2660 | } |
duke@435 | 2661 | } // pvw is cleaned up |
duke@435 | 2662 | } // rm is cleaned up |
duke@435 | 2663 | } |
duke@435 | 2664 | } |
duke@435 | 2665 | |
duke@435 | 2666 | void VM_RedefineClasses::update_jmethod_ids() { |
duke@435 | 2667 | for (int j = 0; j < _matching_methods_length; ++j) { |
duke@435 | 2668 | methodOop old_method = _matching_old_methods[j]; |
duke@435 | 2669 | jmethodID jmid = old_method->find_jmethod_id_or_null(); |
duke@435 | 2670 | if (jmid != NULL) { |
duke@435 | 2671 | // There is a jmethodID, change it to point to the new method |
duke@435 | 2672 | methodHandle new_method_h(_matching_new_methods[j]); |
duke@435 | 2673 | JNIHandles::change_method_associated_with_jmethod_id(jmid, new_method_h); |
duke@435 | 2674 | assert(JNIHandles::resolve_jmethod_id(jmid) == _matching_new_methods[j], |
duke@435 | 2675 | "should be replaced"); |
duke@435 | 2676 | } |
duke@435 | 2677 | } |
duke@435 | 2678 | } |
duke@435 | 2679 | |
duke@435 | 2680 | void VM_RedefineClasses::check_methods_and_mark_as_obsolete( |
duke@435 | 2681 | BitMap *emcp_methods, int * emcp_method_count_p) { |
duke@435 | 2682 | *emcp_method_count_p = 0; |
duke@435 | 2683 | int obsolete_count = 0; |
duke@435 | 2684 | int old_index = 0; |
duke@435 | 2685 | for (int j = 0; j < _matching_methods_length; ++j, ++old_index) { |
duke@435 | 2686 | methodOop old_method = _matching_old_methods[j]; |
duke@435 | 2687 | methodOop new_method = _matching_new_methods[j]; |
duke@435 | 2688 | methodOop old_array_method; |
duke@435 | 2689 | |
duke@435 | 2690 | // Maintain an old_index into the _old_methods array by skipping |
duke@435 | 2691 | // deleted methods |
duke@435 | 2692 | while ((old_array_method = (methodOop) _old_methods->obj_at(old_index)) |
duke@435 | 2693 | != old_method) { |
duke@435 | 2694 | ++old_index; |
duke@435 | 2695 | } |
duke@435 | 2696 | |
duke@435 | 2697 | if (MethodComparator::methods_EMCP(old_method, new_method)) { |
duke@435 | 2698 | // The EMCP definition from JSR-163 requires the bytecodes to be |
duke@435 | 2699 | // the same with the exception of constant pool indices which may |
duke@435 | 2700 | // differ. However, the constants referred to by those indices |
duke@435 | 2701 | // must be the same. |
duke@435 | 2702 | // |
duke@435 | 2703 | // We use methods_EMCP() for comparison since constant pool |
duke@435 | 2704 | // merging can remove duplicate constant pool entries that were |
duke@435 | 2705 | // present in the old method and removed from the rewritten new |
duke@435 | 2706 | // method. A faster binary comparison function would consider the |
duke@435 | 2707 | // old and new methods to be different when they are actually |
duke@435 | 2708 | // EMCP. |
duke@435 | 2709 | // |
duke@435 | 2710 | // The old and new methods are EMCP and you would think that we |
duke@435 | 2711 | // could get rid of one of them here and now and save some space. |
duke@435 | 2712 | // However, the concept of EMCP only considers the bytecodes and |
duke@435 | 2713 | // the constant pool entries in the comparison. Other things, |
duke@435 | 2714 | // e.g., the line number table (LNT) or the local variable table |
duke@435 | 2715 | // (LVT) don't count in the comparison. So the new (and EMCP) |
duke@435 | 2716 | // method can have a new LNT that we need so we can't just |
duke@435 | 2717 | // overwrite the new method with the old method. |
duke@435 | 2718 | // |
duke@435 | 2719 | // When this routine is called, we have already attached the new |
duke@435 | 2720 | // methods to the_class so the old methods are effectively |
duke@435 | 2721 | // overwritten. However, if an old method is still executing, |
duke@435 | 2722 | // then the old method cannot be collected until sometime after |
duke@435 | 2723 | // the old method call has returned. So the overwriting of old |
duke@435 | 2724 | // methods by new methods will save us space except for those |
duke@435 | 2725 | // (hopefully few) old methods that are still executing. |
duke@435 | 2726 | // |
duke@435 | 2727 | // A method refers to a constMethodOop and this presents another |
duke@435 | 2728 | // possible avenue to space savings. The constMethodOop in the |
duke@435 | 2729 | // new method contains possibly new attributes (LNT, LVT, etc). |
duke@435 | 2730 | // At first glance, it seems possible to save space by replacing |
duke@435 | 2731 | // the constMethodOop in the old method with the constMethodOop |
duke@435 | 2732 | // from the new method. The old and new methods would share the |
duke@435 | 2733 | // same constMethodOop and we would save the space occupied by |
duke@435 | 2734 | // the old constMethodOop. However, the constMethodOop contains |
duke@435 | 2735 | // a back reference to the containing method. Sharing the |
duke@435 | 2736 | // constMethodOop between two methods could lead to confusion in |
duke@435 | 2737 | // the code that uses the back reference. This would lead to |
duke@435 | 2738 | // brittle code that could be broken in non-obvious ways now or |
duke@435 | 2739 | // in the future. |
duke@435 | 2740 | // |
duke@435 | 2741 | // Another possibility is to copy the constMethodOop from the new |
duke@435 | 2742 | // method to the old method and then overwrite the new method with |
duke@435 | 2743 | // the old method. Since the constMethodOop contains the bytecodes |
duke@435 | 2744 | // for the method embedded in the oop, this option would change |
duke@435 | 2745 | // the bytecodes out from under any threads executing the old |
duke@435 | 2746 | // method and make the thread's bcp invalid. Since EMCP requires |
duke@435 | 2747 | // that the bytecodes be the same modulo constant pool indices, it |
duke@435 | 2748 | // is straight forward to compute the correct new bcp in the new |
duke@435 | 2749 | // constMethodOop from the old bcp in the old constMethodOop. The |
duke@435 | 2750 | // time consuming part would be searching all the frames in all |
duke@435 | 2751 | // of the threads to find all of the calls to the old method. |
duke@435 | 2752 | // |
duke@435 | 2753 | // It looks like we will have to live with the limited savings |
duke@435 | 2754 | // that we get from effectively overwriting the old methods |
duke@435 | 2755 | // when the new methods are attached to the_class. |
duke@435 | 2756 | |
duke@435 | 2757 | // track which methods are EMCP for add_previous_version() call |
duke@435 | 2758 | emcp_methods->set_bit(old_index); |
duke@435 | 2759 | (*emcp_method_count_p)++; |
duke@435 | 2760 | |
duke@435 | 2761 | // An EMCP method is _not_ obsolete. An obsolete method has a |
duke@435 | 2762 | // different jmethodID than the current method. An EMCP method |
duke@435 | 2763 | // has the same jmethodID as the current method. Having the |
duke@435 | 2764 | // same jmethodID for all EMCP versions of a method allows for |
duke@435 | 2765 | // a consistent view of the EMCP methods regardless of which |
duke@435 | 2766 | // EMCP method you happen to have in hand. For example, a |
duke@435 | 2767 | // breakpoint set in one EMCP method will work for all EMCP |
duke@435 | 2768 | // versions of the method including the current one. |
duke@435 | 2769 | } else { |
duke@435 | 2770 | // mark obsolete methods as such |
duke@435 | 2771 | old_method->set_is_obsolete(); |
duke@435 | 2772 | obsolete_count++; |
duke@435 | 2773 | |
duke@435 | 2774 | // obsolete methods need a unique idnum |
duke@435 | 2775 | u2 num = instanceKlass::cast(_the_class_oop)->next_method_idnum(); |
duke@435 | 2776 | if (num != constMethodOopDesc::UNSET_IDNUM) { |
duke@435 | 2777 | // u2 old_num = old_method->method_idnum(); |
duke@435 | 2778 | old_method->set_method_idnum(num); |
duke@435 | 2779 | // TO DO: attach obsolete annotations to obsolete method's new idnum |
duke@435 | 2780 | } |
duke@435 | 2781 | // With tracing we try not to "yack" too much. The position of |
duke@435 | 2782 | // this trace assumes there are fewer obsolete methods than |
duke@435 | 2783 | // EMCP methods. |
duke@435 | 2784 | RC_TRACE(0x00000100, ("mark %s(%s) as obsolete", |
duke@435 | 2785 | old_method->name()->as_C_string(), |
duke@435 | 2786 | old_method->signature()->as_C_string())); |
duke@435 | 2787 | } |
duke@435 | 2788 | old_method->set_is_old(); |
duke@435 | 2789 | } |
duke@435 | 2790 | for (int i = 0; i < _deleted_methods_length; ++i) { |
duke@435 | 2791 | methodOop old_method = _deleted_methods[i]; |
duke@435 | 2792 | |
duke@435 | 2793 | assert(old_method->vtable_index() < 0, |
duke@435 | 2794 | "cannot delete methods with vtable entries");; |
duke@435 | 2795 | |
duke@435 | 2796 | // Mark all deleted methods as old and obsolete |
duke@435 | 2797 | old_method->set_is_old(); |
duke@435 | 2798 | old_method->set_is_obsolete(); |
duke@435 | 2799 | ++obsolete_count; |
duke@435 | 2800 | // With tracing we try not to "yack" too much. The position of |
duke@435 | 2801 | // this trace assumes there are fewer obsolete methods than |
duke@435 | 2802 | // EMCP methods. |
duke@435 | 2803 | RC_TRACE(0x00000100, ("mark deleted %s(%s) as obsolete", |
duke@435 | 2804 | old_method->name()->as_C_string(), |
duke@435 | 2805 | old_method->signature()->as_C_string())); |
duke@435 | 2806 | } |
duke@435 | 2807 | assert((*emcp_method_count_p + obsolete_count) == _old_methods->length(), |
duke@435 | 2808 | "sanity check"); |
duke@435 | 2809 | RC_TRACE(0x00000100, ("EMCP_cnt=%d, obsolete_cnt=%d", *emcp_method_count_p, |
duke@435 | 2810 | obsolete_count)); |
duke@435 | 2811 | } |
duke@435 | 2812 | |
duke@435 | 2813 | // This internal class transfers the native function registration from old methods |
duke@435 | 2814 | // to new methods. It is designed to handle both the simple case of unchanged |
duke@435 | 2815 | // native methods and the complex cases of native method prefixes being added and/or |
duke@435 | 2816 | // removed. |
duke@435 | 2817 | // It expects only to be used during the VM_RedefineClasses op (a safepoint). |
duke@435 | 2818 | // |
duke@435 | 2819 | // This class is used after the new methods have been installed in "the_class". |
duke@435 | 2820 | // |
duke@435 | 2821 | // So, for example, the following must be handled. Where 'm' is a method and |
duke@435 | 2822 | // a number followed by an underscore is a prefix. |
duke@435 | 2823 | // |
duke@435 | 2824 | // Old Name New Name |
duke@435 | 2825 | // Simple transfer to new method m -> m |
duke@435 | 2826 | // Add prefix m -> 1_m |
duke@435 | 2827 | // Remove prefix 1_m -> m |
duke@435 | 2828 | // Simultaneous add of prefixes m -> 3_2_1_m |
duke@435 | 2829 | // Simultaneous removal of prefixes 3_2_1_m -> m |
duke@435 | 2830 | // Simultaneous add and remove 1_m -> 2_m |
duke@435 | 2831 | // Same, caused by prefix removal only 3_2_1_m -> 3_2_m |
duke@435 | 2832 | // |
duke@435 | 2833 | class TransferNativeFunctionRegistration { |
duke@435 | 2834 | private: |
duke@435 | 2835 | instanceKlassHandle the_class; |
duke@435 | 2836 | int prefix_count; |
duke@435 | 2837 | char** prefixes; |
duke@435 | 2838 | |
duke@435 | 2839 | // Recursively search the binary tree of possibly prefixed method names. |
duke@435 | 2840 | // Iteration could be used if all agents were well behaved. Full tree walk is |
duke@435 | 2841 | // more resilent to agents not cleaning up intermediate methods. |
duke@435 | 2842 | // Branch at each depth in the binary tree is: |
duke@435 | 2843 | // (1) without the prefix. |
duke@435 | 2844 | // (2) with the prefix. |
duke@435 | 2845 | // where 'prefix' is the prefix at that 'depth' (first prefix, second prefix,...) |
duke@435 | 2846 | methodOop search_prefix_name_space(int depth, char* name_str, size_t name_len, |
duke@435 | 2847 | symbolOop signature) { |
duke@435 | 2848 | symbolOop name_symbol = SymbolTable::probe(name_str, (int)name_len); |
duke@435 | 2849 | if (name_symbol != NULL) { |
duke@435 | 2850 | methodOop method = Klass::cast(the_class())->lookup_method(name_symbol, signature); |
duke@435 | 2851 | if (method != NULL) { |
duke@435 | 2852 | // Even if prefixed, intermediate methods must exist. |
duke@435 | 2853 | if (method->is_native()) { |
duke@435 | 2854 | // Wahoo, we found a (possibly prefixed) version of the method, return it. |
duke@435 | 2855 | return method; |
duke@435 | 2856 | } |
duke@435 | 2857 | if (depth < prefix_count) { |
duke@435 | 2858 | // Try applying further prefixes (other than this one). |
duke@435 | 2859 | method = search_prefix_name_space(depth+1, name_str, name_len, signature); |
duke@435 | 2860 | if (method != NULL) { |
duke@435 | 2861 | return method; // found |
duke@435 | 2862 | } |
duke@435 | 2863 | |
duke@435 | 2864 | // Try adding this prefix to the method name and see if it matches |
duke@435 | 2865 | // another method name. |
duke@435 | 2866 | char* prefix = prefixes[depth]; |
duke@435 | 2867 | size_t prefix_len = strlen(prefix); |
duke@435 | 2868 | size_t trial_len = name_len + prefix_len; |
duke@435 | 2869 | char* trial_name_str = NEW_RESOURCE_ARRAY(char, trial_len + 1); |
duke@435 | 2870 | strcpy(trial_name_str, prefix); |
duke@435 | 2871 | strcat(trial_name_str, name_str); |
duke@435 | 2872 | method = search_prefix_name_space(depth+1, trial_name_str, trial_len, |
duke@435 | 2873 | signature); |
duke@435 | 2874 | if (method != NULL) { |
duke@435 | 2875 | // If found along this branch, it was prefixed, mark as such |
duke@435 | 2876 | method->set_is_prefixed_native(); |
duke@435 | 2877 | return method; // found |
duke@435 | 2878 | } |
duke@435 | 2879 | } |
duke@435 | 2880 | } |
duke@435 | 2881 | } |
duke@435 | 2882 | return NULL; // This whole branch bore nothing |
duke@435 | 2883 | } |
duke@435 | 2884 | |
duke@435 | 2885 | // Return the method name with old prefixes stripped away. |
duke@435 | 2886 | char* method_name_without_prefixes(methodOop method) { |
duke@435 | 2887 | symbolOop name = method->name(); |
duke@435 | 2888 | char* name_str = name->as_utf8(); |
duke@435 | 2889 | |
duke@435 | 2890 | // Old prefixing may be defunct, strip prefixes, if any. |
duke@435 | 2891 | for (int i = prefix_count-1; i >= 0; i--) { |
duke@435 | 2892 | char* prefix = prefixes[i]; |
duke@435 | 2893 | size_t prefix_len = strlen(prefix); |
duke@435 | 2894 | if (strncmp(prefix, name_str, prefix_len) == 0) { |
duke@435 | 2895 | name_str += prefix_len; |
duke@435 | 2896 | } |
duke@435 | 2897 | } |
duke@435 | 2898 | return name_str; |
duke@435 | 2899 | } |
duke@435 | 2900 | |
duke@435 | 2901 | // Strip any prefixes off the old native method, then try to find a |
duke@435 | 2902 | // (possibly prefixed) new native that matches it. |
duke@435 | 2903 | methodOop strip_and_search_for_new_native(methodOop method) { |
duke@435 | 2904 | ResourceMark rm; |
duke@435 | 2905 | char* name_str = method_name_without_prefixes(method); |
duke@435 | 2906 | return search_prefix_name_space(0, name_str, strlen(name_str), |
duke@435 | 2907 | method->signature()); |
duke@435 | 2908 | } |
duke@435 | 2909 | |
duke@435 | 2910 | public: |
duke@435 | 2911 | |
duke@435 | 2912 | // Construct a native method transfer processor for this class. |
duke@435 | 2913 | TransferNativeFunctionRegistration(instanceKlassHandle _the_class) { |
duke@435 | 2914 | assert(SafepointSynchronize::is_at_safepoint(), "sanity check"); |
duke@435 | 2915 | |
duke@435 | 2916 | the_class = _the_class; |
duke@435 | 2917 | prefixes = JvmtiExport::get_all_native_method_prefixes(&prefix_count); |
duke@435 | 2918 | } |
duke@435 | 2919 | |
duke@435 | 2920 | // Attempt to transfer any of the old or deleted methods that are native |
duke@435 | 2921 | void transfer_registrations(methodOop* old_methods, int methods_length) { |
duke@435 | 2922 | for (int j = 0; j < methods_length; j++) { |
duke@435 | 2923 | methodOop old_method = old_methods[j]; |
duke@435 | 2924 | |
duke@435 | 2925 | if (old_method->is_native() && old_method->has_native_function()) { |
duke@435 | 2926 | methodOop new_method = strip_and_search_for_new_native(old_method); |
duke@435 | 2927 | if (new_method != NULL) { |
duke@435 | 2928 | // Actually set the native function in the new method. |
duke@435 | 2929 | // Redefine does not send events (except CFLH), certainly not this |
duke@435 | 2930 | // behind the scenes re-registration. |
duke@435 | 2931 | new_method->set_native_function(old_method->native_function(), |
duke@435 | 2932 | !methodOopDesc::native_bind_event_is_interesting); |
duke@435 | 2933 | } |
duke@435 | 2934 | } |
duke@435 | 2935 | } |
duke@435 | 2936 | } |
duke@435 | 2937 | }; |
duke@435 | 2938 | |
duke@435 | 2939 | // Don't lose the association between a native method and its JNI function. |
duke@435 | 2940 | void VM_RedefineClasses::transfer_old_native_function_registrations(instanceKlassHandle the_class) { |
duke@435 | 2941 | TransferNativeFunctionRegistration transfer(the_class); |
duke@435 | 2942 | transfer.transfer_registrations(_deleted_methods, _deleted_methods_length); |
duke@435 | 2943 | transfer.transfer_registrations(_matching_old_methods, _matching_methods_length); |
duke@435 | 2944 | } |
duke@435 | 2945 | |
duke@435 | 2946 | // Deoptimize all compiled code that depends on this class. |
duke@435 | 2947 | // |
duke@435 | 2948 | // If the can_redefine_classes capability is obtained in the onload |
duke@435 | 2949 | // phase then the compiler has recorded all dependencies from startup. |
duke@435 | 2950 | // In that case we need only deoptimize and throw away all compiled code |
duke@435 | 2951 | // that depends on the class. |
duke@435 | 2952 | // |
duke@435 | 2953 | // If can_redefine_classes is obtained sometime after the onload |
duke@435 | 2954 | // phase then the dependency information may be incomplete. In that case |
duke@435 | 2955 | // the first call to RedefineClasses causes all compiled code to be |
duke@435 | 2956 | // thrown away. As can_redefine_classes has been obtained then |
duke@435 | 2957 | // all future compilations will record dependencies so second and |
duke@435 | 2958 | // subsequent calls to RedefineClasses need only throw away code |
duke@435 | 2959 | // that depends on the class. |
duke@435 | 2960 | // |
duke@435 | 2961 | void VM_RedefineClasses::flush_dependent_code(instanceKlassHandle k_h, TRAPS) { |
duke@435 | 2962 | assert_locked_or_safepoint(Compile_lock); |
duke@435 | 2963 | |
duke@435 | 2964 | // All dependencies have been recorded from startup or this is a second or |
duke@435 | 2965 | // subsequent use of RedefineClasses |
duke@435 | 2966 | if (JvmtiExport::all_dependencies_are_recorded()) { |
duke@435 | 2967 | Universe::flush_evol_dependents_on(k_h); |
duke@435 | 2968 | } else { |
duke@435 | 2969 | CodeCache::mark_all_nmethods_for_deoptimization(); |
duke@435 | 2970 | |
duke@435 | 2971 | ResourceMark rm(THREAD); |
duke@435 | 2972 | DeoptimizationMarker dm; |
duke@435 | 2973 | |
duke@435 | 2974 | // Deoptimize all activations depending on marked nmethods |
duke@435 | 2975 | Deoptimization::deoptimize_dependents(); |
duke@435 | 2976 | |
duke@435 | 2977 | // Make the dependent methods not entrant (in VM_Deoptimize they are made zombies) |
duke@435 | 2978 | CodeCache::make_marked_nmethods_not_entrant(); |
duke@435 | 2979 | |
duke@435 | 2980 | // From now on we know that the dependency information is complete |
duke@435 | 2981 | JvmtiExport::set_all_dependencies_are_recorded(true); |
duke@435 | 2982 | } |
duke@435 | 2983 | } |
duke@435 | 2984 | |
duke@435 | 2985 | void VM_RedefineClasses::compute_added_deleted_matching_methods() { |
duke@435 | 2986 | methodOop old_method; |
duke@435 | 2987 | methodOop new_method; |
duke@435 | 2988 | |
duke@435 | 2989 | _matching_old_methods = NEW_RESOURCE_ARRAY(methodOop, _old_methods->length()); |
duke@435 | 2990 | _matching_new_methods = NEW_RESOURCE_ARRAY(methodOop, _old_methods->length()); |
duke@435 | 2991 | _added_methods = NEW_RESOURCE_ARRAY(methodOop, _new_methods->length()); |
duke@435 | 2992 | _deleted_methods = NEW_RESOURCE_ARRAY(methodOop, _old_methods->length()); |
duke@435 | 2993 | |
duke@435 | 2994 | _matching_methods_length = 0; |
duke@435 | 2995 | _deleted_methods_length = 0; |
duke@435 | 2996 | _added_methods_length = 0; |
duke@435 | 2997 | |
duke@435 | 2998 | int nj = 0; |
duke@435 | 2999 | int oj = 0; |
duke@435 | 3000 | while (true) { |
duke@435 | 3001 | if (oj >= _old_methods->length()) { |
duke@435 | 3002 | if (nj >= _new_methods->length()) { |
duke@435 | 3003 | break; // we've looked at everything, done |
duke@435 | 3004 | } |
duke@435 | 3005 | // New method at the end |
duke@435 | 3006 | new_method = (methodOop) _new_methods->obj_at(nj); |
duke@435 | 3007 | _added_methods[_added_methods_length++] = new_method; |
duke@435 | 3008 | ++nj; |
duke@435 | 3009 | } else if (nj >= _new_methods->length()) { |
duke@435 | 3010 | // Old method, at the end, is deleted |
duke@435 | 3011 | old_method = (methodOop) _old_methods->obj_at(oj); |
duke@435 | 3012 | _deleted_methods[_deleted_methods_length++] = old_method; |
duke@435 | 3013 | ++oj; |
duke@435 | 3014 | } else { |
duke@435 | 3015 | old_method = (methodOop) _old_methods->obj_at(oj); |
duke@435 | 3016 | new_method = (methodOop) _new_methods->obj_at(nj); |
duke@435 | 3017 | if (old_method->name() == new_method->name()) { |
duke@435 | 3018 | if (old_method->signature() == new_method->signature()) { |
duke@435 | 3019 | _matching_old_methods[_matching_methods_length ] = old_method; |
duke@435 | 3020 | _matching_new_methods[_matching_methods_length++] = new_method; |
duke@435 | 3021 | ++nj; |
duke@435 | 3022 | ++oj; |
duke@435 | 3023 | } else { |
duke@435 | 3024 | // added overloaded have already been moved to the end, |
duke@435 | 3025 | // so this is a deleted overloaded method |
duke@435 | 3026 | _deleted_methods[_deleted_methods_length++] = old_method; |
duke@435 | 3027 | ++oj; |
duke@435 | 3028 | } |
duke@435 | 3029 | } else { // names don't match |
duke@435 | 3030 | if (old_method->name()->fast_compare(new_method->name()) > 0) { |
duke@435 | 3031 | // new method |
duke@435 | 3032 | _added_methods[_added_methods_length++] = new_method; |
duke@435 | 3033 | ++nj; |
duke@435 | 3034 | } else { |
duke@435 | 3035 | // deleted method |
duke@435 | 3036 | _deleted_methods[_deleted_methods_length++] = old_method; |
duke@435 | 3037 | ++oj; |
duke@435 | 3038 | } |
duke@435 | 3039 | } |
duke@435 | 3040 | } |
duke@435 | 3041 | } |
duke@435 | 3042 | assert(_matching_methods_length + _deleted_methods_length == _old_methods->length(), "sanity"); |
duke@435 | 3043 | assert(_matching_methods_length + _added_methods_length == _new_methods->length(), "sanity"); |
duke@435 | 3044 | } |
duke@435 | 3045 | |
duke@435 | 3046 | |
duke@435 | 3047 | |
duke@435 | 3048 | // Install the redefinition of a class: |
duke@435 | 3049 | // - house keeping (flushing breakpoints and caches, deoptimizing |
duke@435 | 3050 | // dependent compiled code) |
duke@435 | 3051 | // - replacing parts in the_class with parts from scratch_class |
duke@435 | 3052 | // - adding a weak reference to track the obsolete but interesting |
duke@435 | 3053 | // parts of the_class |
duke@435 | 3054 | // - adjusting constant pool caches and vtables in other classes |
duke@435 | 3055 | // that refer to methods in the_class. These adjustments use the |
duke@435 | 3056 | // SystemDictionary::classes_do() facility which only allows |
duke@435 | 3057 | // a helper method to be specified. The interesting parameters |
duke@435 | 3058 | // that we would like to pass to the helper method are saved in |
duke@435 | 3059 | // static global fields in the VM operation. |
duke@435 | 3060 | void VM_RedefineClasses::redefine_single_class(jclass the_jclass, |
duke@435 | 3061 | instanceKlassHandle scratch_class, TRAPS) { |
duke@435 | 3062 | |
duke@435 | 3063 | RC_TIMER_START(_timer_rsc_phase1); |
duke@435 | 3064 | |
duke@435 | 3065 | oop the_class_mirror = JNIHandles::resolve_non_null(the_jclass); |
duke@435 | 3066 | klassOop the_class_oop = java_lang_Class::as_klassOop(the_class_mirror); |
duke@435 | 3067 | instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop); |
duke@435 | 3068 | |
duke@435 | 3069 | #ifndef JVMTI_KERNEL |
duke@435 | 3070 | // Remove all breakpoints in methods of this class |
duke@435 | 3071 | JvmtiBreakpoints& jvmti_breakpoints = JvmtiCurrentBreakpoints::get_jvmti_breakpoints(); |
duke@435 | 3072 | jvmti_breakpoints.clearall_in_class_at_safepoint(the_class_oop); |
duke@435 | 3073 | #endif // !JVMTI_KERNEL |
duke@435 | 3074 | |
duke@435 | 3075 | if (the_class_oop == Universe::reflect_invoke_cache()->klass()) { |
duke@435 | 3076 | // We are redefining java.lang.reflect.Method. Method.invoke() is |
duke@435 | 3077 | // cached and users of the cache care about each active version of |
duke@435 | 3078 | // the method so we have to track this previous version. |
duke@435 | 3079 | // Do this before methods get switched |
duke@435 | 3080 | Universe::reflect_invoke_cache()->add_previous_version( |
duke@435 | 3081 | the_class->method_with_idnum(Universe::reflect_invoke_cache()->method_idnum())); |
duke@435 | 3082 | } |
duke@435 | 3083 | |
duke@435 | 3084 | // Deoptimize all compiled code that depends on this class |
duke@435 | 3085 | flush_dependent_code(the_class, THREAD); |
duke@435 | 3086 | |
duke@435 | 3087 | _old_methods = the_class->methods(); |
duke@435 | 3088 | _new_methods = scratch_class->methods(); |
duke@435 | 3089 | _the_class_oop = the_class_oop; |
duke@435 | 3090 | compute_added_deleted_matching_methods(); |
duke@435 | 3091 | update_jmethod_ids(); |
duke@435 | 3092 | |
duke@435 | 3093 | // Attach new constant pool to the original klass. The original |
duke@435 | 3094 | // klass still refers to the old constant pool (for now). |
duke@435 | 3095 | scratch_class->constants()->set_pool_holder(the_class()); |
duke@435 | 3096 | |
duke@435 | 3097 | #if 0 |
duke@435 | 3098 | // In theory, with constant pool merging in place we should be able |
duke@435 | 3099 | // to save space by using the new, merged constant pool in place of |
duke@435 | 3100 | // the old constant pool(s). By "pool(s)" I mean the constant pool in |
duke@435 | 3101 | // the klass version we are replacing now and any constant pool(s) in |
duke@435 | 3102 | // previous versions of klass. Nice theory, doesn't work in practice. |
duke@435 | 3103 | // When this code is enabled, even simple programs throw NullPointer |
duke@435 | 3104 | // exceptions. I'm guessing that this is caused by some constant pool |
duke@435 | 3105 | // cache difference between the new, merged constant pool and the |
duke@435 | 3106 | // constant pool that was just being used by the klass. I'm keeping |
duke@435 | 3107 | // this code around to archive the idea, but the code has to remain |
duke@435 | 3108 | // disabled for now. |
duke@435 | 3109 | |
duke@435 | 3110 | // Attach each old method to the new constant pool. This can be |
duke@435 | 3111 | // done here since we are past the bytecode verification and |
duke@435 | 3112 | // constant pool optimization phases. |
duke@435 | 3113 | for (int i = _old_methods->length() - 1; i >= 0; i--) { |
duke@435 | 3114 | methodOop method = (methodOop)_old_methods->obj_at(i); |
duke@435 | 3115 | method->set_constants(scratch_class->constants()); |
duke@435 | 3116 | } |
duke@435 | 3117 | |
duke@435 | 3118 | { |
duke@435 | 3119 | // walk all previous versions of the klass |
duke@435 | 3120 | instanceKlass *ik = (instanceKlass *)the_class()->klass_part(); |
duke@435 | 3121 | PreviousVersionWalker pvw(ik); |
duke@435 | 3122 | instanceKlassHandle ikh; |
duke@435 | 3123 | do { |
duke@435 | 3124 | ikh = pvw.next_previous_version(); |
duke@435 | 3125 | if (!ikh.is_null()) { |
duke@435 | 3126 | ik = ikh(); |
duke@435 | 3127 | |
duke@435 | 3128 | // attach previous version of klass to the new constant pool |
duke@435 | 3129 | ik->set_constants(scratch_class->constants()); |
duke@435 | 3130 | |
duke@435 | 3131 | // Attach each method in the previous version of klass to the |
duke@435 | 3132 | // new constant pool |
duke@435 | 3133 | objArrayOop prev_methods = ik->methods(); |
duke@435 | 3134 | for (int i = prev_methods->length() - 1; i >= 0; i--) { |
duke@435 | 3135 | methodOop method = (methodOop)prev_methods->obj_at(i); |
duke@435 | 3136 | method->set_constants(scratch_class->constants()); |
duke@435 | 3137 | } |
duke@435 | 3138 | } |
duke@435 | 3139 | } while (!ikh.is_null()); |
duke@435 | 3140 | } |
duke@435 | 3141 | #endif |
duke@435 | 3142 | |
duke@435 | 3143 | // Replace methods and constantpool |
duke@435 | 3144 | the_class->set_methods(_new_methods); |
duke@435 | 3145 | scratch_class->set_methods(_old_methods); // To prevent potential GCing of the old methods, |
duke@435 | 3146 | // and to be able to undo operation easily. |
duke@435 | 3147 | |
duke@435 | 3148 | constantPoolOop old_constants = the_class->constants(); |
duke@435 | 3149 | the_class->set_constants(scratch_class->constants()); |
duke@435 | 3150 | scratch_class->set_constants(old_constants); // See the previous comment. |
duke@435 | 3151 | #if 0 |
duke@435 | 3152 | // We are swapping the guts of "the new class" with the guts of "the |
duke@435 | 3153 | // class". Since the old constant pool has just been attached to "the |
duke@435 | 3154 | // new class", it seems logical to set the pool holder in the old |
duke@435 | 3155 | // constant pool also. However, doing this will change the observable |
duke@435 | 3156 | // class hierarchy for any old methods that are still executing. A |
duke@435 | 3157 | // method can query the identity of its "holder" and this query uses |
duke@435 | 3158 | // the method's constant pool link to find the holder. The change in |
duke@435 | 3159 | // holding class from "the class" to "the new class" can confuse |
duke@435 | 3160 | // things. |
duke@435 | 3161 | // |
duke@435 | 3162 | // Setting the old constant pool's holder will also cause |
duke@435 | 3163 | // verification done during vtable initialization below to fail. |
duke@435 | 3164 | // During vtable initialization, the vtable's class is verified to be |
duke@435 | 3165 | // a subtype of the method's holder. The vtable's class is "the |
duke@435 | 3166 | // class" and the method's holder is gotten from the constant pool |
duke@435 | 3167 | // link in the method itself. For "the class"'s directly implemented |
duke@435 | 3168 | // methods, the method holder is "the class" itself (as gotten from |
duke@435 | 3169 | // the new constant pool). The check works fine in this case. The |
duke@435 | 3170 | // check also works fine for methods inherited from super classes. |
duke@435 | 3171 | // |
duke@435 | 3172 | // Miranda methods are a little more complicated. A miranda method is |
duke@435 | 3173 | // provided by an interface when the class implementing the interface |
duke@435 | 3174 | // does not provide its own method. These interfaces are implemented |
duke@435 | 3175 | // internally as an instanceKlass. These special instanceKlasses |
duke@435 | 3176 | // share the constant pool of the class that "implements" the |
duke@435 | 3177 | // interface. By sharing the constant pool, the method holder of a |
duke@435 | 3178 | // miranda method is the class that "implements" the interface. In a |
duke@435 | 3179 | // non-redefine situation, the subtype check works fine. However, if |
duke@435 | 3180 | // the old constant pool's pool holder is modified, then the check |
duke@435 | 3181 | // fails because there is no class hierarchy relationship between the |
duke@435 | 3182 | // vtable's class and "the new class". |
duke@435 | 3183 | |
duke@435 | 3184 | old_constants->set_pool_holder(scratch_class()); |
duke@435 | 3185 | #endif |
duke@435 | 3186 | |
duke@435 | 3187 | // track which methods are EMCP for add_previous_version() call below |
duke@435 | 3188 | BitMap emcp_methods(_old_methods->length()); |
duke@435 | 3189 | int emcp_method_count = 0; |
duke@435 | 3190 | emcp_methods.clear(); // clears 0..(length() - 1) |
duke@435 | 3191 | check_methods_and_mark_as_obsolete(&emcp_methods, &emcp_method_count); |
duke@435 | 3192 | transfer_old_native_function_registrations(the_class); |
duke@435 | 3193 | |
duke@435 | 3194 | // The class file bytes from before any retransformable agents mucked |
duke@435 | 3195 | // with them was cached on the scratch class, move to the_class. |
duke@435 | 3196 | // Note: we still want to do this if nothing needed caching since it |
duke@435 | 3197 | // should get cleared in the_class too. |
duke@435 | 3198 | the_class->set_cached_class_file(scratch_class->get_cached_class_file_bytes(), |
duke@435 | 3199 | scratch_class->get_cached_class_file_len()); |
duke@435 | 3200 | |
duke@435 | 3201 | // Replace inner_classes |
duke@435 | 3202 | typeArrayOop old_inner_classes = the_class->inner_classes(); |
duke@435 | 3203 | the_class->set_inner_classes(scratch_class->inner_classes()); |
duke@435 | 3204 | scratch_class->set_inner_classes(old_inner_classes); |
duke@435 | 3205 | |
duke@435 | 3206 | // Initialize the vtable and interface table after |
duke@435 | 3207 | // methods have been rewritten |
duke@435 | 3208 | { |
duke@435 | 3209 | ResourceMark rm(THREAD); |
duke@435 | 3210 | // no exception should happen here since we explicitly |
duke@435 | 3211 | // do not check loader constraints. |
duke@435 | 3212 | // compare_and_normalize_class_versions has already checked: |
duke@435 | 3213 | // - classloaders unchanged, signatures unchanged |
duke@435 | 3214 | // - all instanceKlasses for redefined classes reused & contents updated |
duke@435 | 3215 | the_class->vtable()->initialize_vtable(false, THREAD); |
duke@435 | 3216 | the_class->itable()->initialize_itable(false, THREAD); |
never@1577 | 3217 | assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())), "redefine exception"); |
duke@435 | 3218 | } |
duke@435 | 3219 | |
duke@435 | 3220 | // Leave arrays of jmethodIDs and itable index cache unchanged |
duke@435 | 3221 | |
duke@435 | 3222 | // Copy the "source file name" attribute from new class version |
duke@435 | 3223 | the_class->set_source_file_name(scratch_class->source_file_name()); |
duke@435 | 3224 | |
duke@435 | 3225 | // Copy the "source debug extension" attribute from new class version |
duke@435 | 3226 | the_class->set_source_debug_extension( |
duke@435 | 3227 | scratch_class->source_debug_extension()); |
duke@435 | 3228 | |
duke@435 | 3229 | // Use of javac -g could be different in the old and the new |
duke@435 | 3230 | if (scratch_class->access_flags().has_localvariable_table() != |
duke@435 | 3231 | the_class->access_flags().has_localvariable_table()) { |
duke@435 | 3232 | |
duke@435 | 3233 | AccessFlags flags = the_class->access_flags(); |
duke@435 | 3234 | if (scratch_class->access_flags().has_localvariable_table()) { |
duke@435 | 3235 | flags.set_has_localvariable_table(); |
duke@435 | 3236 | } else { |
duke@435 | 3237 | flags.clear_has_localvariable_table(); |
duke@435 | 3238 | } |
duke@435 | 3239 | the_class->set_access_flags(flags); |
duke@435 | 3240 | } |
duke@435 | 3241 | |
duke@435 | 3242 | // Replace class annotation fields values |
duke@435 | 3243 | typeArrayOop old_class_annotations = the_class->class_annotations(); |
duke@435 | 3244 | the_class->set_class_annotations(scratch_class->class_annotations()); |
duke@435 | 3245 | scratch_class->set_class_annotations(old_class_annotations); |
duke@435 | 3246 | |
duke@435 | 3247 | // Replace fields annotation fields values |
duke@435 | 3248 | objArrayOop old_fields_annotations = the_class->fields_annotations(); |
duke@435 | 3249 | the_class->set_fields_annotations(scratch_class->fields_annotations()); |
duke@435 | 3250 | scratch_class->set_fields_annotations(old_fields_annotations); |
duke@435 | 3251 | |
duke@435 | 3252 | // Replace methods annotation fields values |
duke@435 | 3253 | objArrayOop old_methods_annotations = the_class->methods_annotations(); |
duke@435 | 3254 | the_class->set_methods_annotations(scratch_class->methods_annotations()); |
duke@435 | 3255 | scratch_class->set_methods_annotations(old_methods_annotations); |
duke@435 | 3256 | |
duke@435 | 3257 | // Replace methods parameter annotation fields values |
duke@435 | 3258 | objArrayOop old_methods_parameter_annotations = |
duke@435 | 3259 | the_class->methods_parameter_annotations(); |
duke@435 | 3260 | the_class->set_methods_parameter_annotations( |
duke@435 | 3261 | scratch_class->methods_parameter_annotations()); |
duke@435 | 3262 | scratch_class->set_methods_parameter_annotations(old_methods_parameter_annotations); |
duke@435 | 3263 | |
duke@435 | 3264 | // Replace methods default annotation fields values |
duke@435 | 3265 | objArrayOop old_methods_default_annotations = |
duke@435 | 3266 | the_class->methods_default_annotations(); |
duke@435 | 3267 | the_class->set_methods_default_annotations( |
duke@435 | 3268 | scratch_class->methods_default_annotations()); |
duke@435 | 3269 | scratch_class->set_methods_default_annotations(old_methods_default_annotations); |
duke@435 | 3270 | |
duke@435 | 3271 | // Replace minor version number of class file |
duke@435 | 3272 | u2 old_minor_version = the_class->minor_version(); |
duke@435 | 3273 | the_class->set_minor_version(scratch_class->minor_version()); |
duke@435 | 3274 | scratch_class->set_minor_version(old_minor_version); |
duke@435 | 3275 | |
duke@435 | 3276 | // Replace major version number of class file |
duke@435 | 3277 | u2 old_major_version = the_class->major_version(); |
duke@435 | 3278 | the_class->set_major_version(scratch_class->major_version()); |
duke@435 | 3279 | scratch_class->set_major_version(old_major_version); |
duke@435 | 3280 | |
duke@435 | 3281 | // Replace CP indexes for class and name+type of enclosing method |
duke@435 | 3282 | u2 old_class_idx = the_class->enclosing_method_class_index(); |
duke@435 | 3283 | u2 old_method_idx = the_class->enclosing_method_method_index(); |
duke@435 | 3284 | the_class->set_enclosing_method_indices( |
duke@435 | 3285 | scratch_class->enclosing_method_class_index(), |
duke@435 | 3286 | scratch_class->enclosing_method_method_index()); |
duke@435 | 3287 | scratch_class->set_enclosing_method_indices(old_class_idx, old_method_idx); |
duke@435 | 3288 | |
duke@435 | 3289 | // keep track of previous versions of this class |
duke@435 | 3290 | the_class->add_previous_version(scratch_class, &emcp_methods, |
duke@435 | 3291 | emcp_method_count); |
duke@435 | 3292 | |
duke@435 | 3293 | RC_TIMER_STOP(_timer_rsc_phase1); |
duke@435 | 3294 | RC_TIMER_START(_timer_rsc_phase2); |
duke@435 | 3295 | |
duke@435 | 3296 | // Adjust constantpool caches and vtables for all classes |
duke@435 | 3297 | // that reference methods of the evolved class. |
duke@435 | 3298 | SystemDictionary::classes_do(adjust_cpool_cache_and_vtable, THREAD); |
duke@435 | 3299 | |
duke@435 | 3300 | if (the_class->oop_map_cache() != NULL) { |
duke@435 | 3301 | // Flush references to any obsolete methods from the oop map cache |
duke@435 | 3302 | // so that obsolete methods are not pinned. |
duke@435 | 3303 | the_class->oop_map_cache()->flush_obsolete_entries(); |
duke@435 | 3304 | } |
duke@435 | 3305 | |
duke@435 | 3306 | // increment the classRedefinedCount field in the_class and in any |
duke@435 | 3307 | // direct and indirect subclasses of the_class |
duke@435 | 3308 | increment_class_counter((instanceKlass *)the_class()->klass_part(), THREAD); |
duke@435 | 3309 | |
duke@435 | 3310 | // RC_TRACE macro has an embedded ResourceMark |
duke@435 | 3311 | RC_TRACE_WITH_THREAD(0x00000001, THREAD, |
duke@435 | 3312 | ("redefined name=%s, count=%d (avail_mem=" UINT64_FORMAT "K)", |
duke@435 | 3313 | the_class->external_name(), |
duke@435 | 3314 | java_lang_Class::classRedefinedCount(the_class_mirror), |
duke@435 | 3315 | os::available_memory() >> 10)); |
duke@435 | 3316 | |
duke@435 | 3317 | RC_TIMER_STOP(_timer_rsc_phase2); |
duke@435 | 3318 | } // end redefine_single_class() |
duke@435 | 3319 | |
duke@435 | 3320 | |
duke@435 | 3321 | // Increment the classRedefinedCount field in the specific instanceKlass |
duke@435 | 3322 | // and in all direct and indirect subclasses. |
duke@435 | 3323 | void VM_RedefineClasses::increment_class_counter(instanceKlass *ik, TRAPS) { |
duke@435 | 3324 | oop class_mirror = ik->java_mirror(); |
duke@435 | 3325 | klassOop class_oop = java_lang_Class::as_klassOop(class_mirror); |
duke@435 | 3326 | int new_count = java_lang_Class::classRedefinedCount(class_mirror) + 1; |
duke@435 | 3327 | java_lang_Class::set_classRedefinedCount(class_mirror, new_count); |
duke@435 | 3328 | |
duke@435 | 3329 | if (class_oop != _the_class_oop) { |
duke@435 | 3330 | // _the_class_oop count is printed at end of redefine_single_class() |
duke@435 | 3331 | RC_TRACE_WITH_THREAD(0x00000008, THREAD, |
duke@435 | 3332 | ("updated count in subclass=%s to %d", ik->external_name(), new_count)); |
duke@435 | 3333 | } |
duke@435 | 3334 | |
duke@435 | 3335 | for (Klass *subk = ik->subklass(); subk != NULL; |
duke@435 | 3336 | subk = subk->next_sibling()) { |
duke@435 | 3337 | klassOop sub = subk->as_klassOop(); |
duke@435 | 3338 | instanceKlass *subik = (instanceKlass *)sub->klass_part(); |
duke@435 | 3339 | |
duke@435 | 3340 | // recursively do subclasses of the current subclass |
duke@435 | 3341 | increment_class_counter(subik, THREAD); |
duke@435 | 3342 | } |
duke@435 | 3343 | } |
duke@435 | 3344 | |
duke@435 | 3345 | #ifndef PRODUCT |
duke@435 | 3346 | void VM_RedefineClasses::check_class(klassOop k_oop, |
duke@435 | 3347 | oop initiating_loader, TRAPS) { |
duke@435 | 3348 | Klass *k = k_oop->klass_part(); |
duke@435 | 3349 | if (k->oop_is_instance()) { |
duke@435 | 3350 | HandleMark hm(THREAD); |
duke@435 | 3351 | instanceKlass *ik = (instanceKlass *) k; |
duke@435 | 3352 | |
duke@435 | 3353 | if (ik->vtable_length() > 0) { |
duke@435 | 3354 | ResourceMark rm(THREAD); |
duke@435 | 3355 | if (!ik->vtable()->check_no_old_entries()) { |
duke@435 | 3356 | tty->print_cr("klassVtable::check_no_old_entries failure -- OLD method found -- class: %s", ik->signature_name()); |
duke@435 | 3357 | ik->vtable()->dump_vtable(); |
duke@435 | 3358 | dump_methods(); |
duke@435 | 3359 | assert(false, "OLD method found"); |
duke@435 | 3360 | } |
duke@435 | 3361 | } |
duke@435 | 3362 | } |
duke@435 | 3363 | } |
duke@435 | 3364 | |
duke@435 | 3365 | void VM_RedefineClasses::dump_methods() { |
duke@435 | 3366 | int j; |
duke@435 | 3367 | tty->print_cr("_old_methods --"); |
duke@435 | 3368 | for (j = 0; j < _old_methods->length(); ++j) { |
duke@435 | 3369 | methodOop m = (methodOop) _old_methods->obj_at(j); |
duke@435 | 3370 | tty->print("%4d (%5d) ", j, m->vtable_index()); |
duke@435 | 3371 | m->access_flags().print_on(tty); |
duke@435 | 3372 | tty->print(" -- "); |
duke@435 | 3373 | m->print_name(tty); |
duke@435 | 3374 | tty->cr(); |
duke@435 | 3375 | } |
duke@435 | 3376 | tty->print_cr("_new_methods --"); |
duke@435 | 3377 | for (j = 0; j < _new_methods->length(); ++j) { |
duke@435 | 3378 | methodOop m = (methodOop) _new_methods->obj_at(j); |
duke@435 | 3379 | tty->print("%4d (%5d) ", j, m->vtable_index()); |
duke@435 | 3380 | m->access_flags().print_on(tty); |
duke@435 | 3381 | tty->print(" -- "); |
duke@435 | 3382 | m->print_name(tty); |
duke@435 | 3383 | tty->cr(); |
duke@435 | 3384 | } |
duke@435 | 3385 | tty->print_cr("_matching_(old/new)_methods --"); |
duke@435 | 3386 | for (j = 0; j < _matching_methods_length; ++j) { |
duke@435 | 3387 | methodOop m = _matching_old_methods[j]; |
duke@435 | 3388 | tty->print("%4d (%5d) ", j, m->vtable_index()); |
duke@435 | 3389 | m->access_flags().print_on(tty); |
duke@435 | 3390 | tty->print(" -- "); |
duke@435 | 3391 | m->print_name(tty); |
duke@435 | 3392 | tty->cr(); |
duke@435 | 3393 | m = _matching_new_methods[j]; |
duke@435 | 3394 | tty->print(" (%5d) ", m->vtable_index()); |
duke@435 | 3395 | m->access_flags().print_on(tty); |
duke@435 | 3396 | tty->cr(); |
duke@435 | 3397 | } |
duke@435 | 3398 | tty->print_cr("_deleted_methods --"); |
duke@435 | 3399 | for (j = 0; j < _deleted_methods_length; ++j) { |
duke@435 | 3400 | methodOop m = _deleted_methods[j]; |
duke@435 | 3401 | tty->print("%4d (%5d) ", j, m->vtable_index()); |
duke@435 | 3402 | m->access_flags().print_on(tty); |
duke@435 | 3403 | tty->print(" -- "); |
duke@435 | 3404 | m->print_name(tty); |
duke@435 | 3405 | tty->cr(); |
duke@435 | 3406 | } |
duke@435 | 3407 | tty->print_cr("_added_methods --"); |
duke@435 | 3408 | for (j = 0; j < _added_methods_length; ++j) { |
duke@435 | 3409 | methodOop m = _added_methods[j]; |
duke@435 | 3410 | tty->print("%4d (%5d) ", j, m->vtable_index()); |
duke@435 | 3411 | m->access_flags().print_on(tty); |
duke@435 | 3412 | tty->print(" -- "); |
duke@435 | 3413 | m->print_name(tty); |
duke@435 | 3414 | tty->cr(); |
duke@435 | 3415 | } |
duke@435 | 3416 | } |
duke@435 | 3417 | #endif |