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