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