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