Mercurial > hg > graal-compiler
annotate src/share/vm/prims/jvmtiRedefineClasses.cpp @ 12067:e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
Summary: Change InstanceKlass::_source_file_name and _generic_signature to u2 fields.
Reviewed-by: coleenp, iklam
author | jiangli |
---|---|
date | Mon, 19 Aug 2013 14:59:54 -0400 |
parents | 85147f28faba |
children | ff2520b97b00 |
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); | |
1075 if (res != JVMTI_ERROR_NONE) { | |
1076 return res; | |
1077 } | |
1078 | |
1079 if (VerifyMergedCPBytecodes) { | |
1080 // verify what we have done during constant pool merging | |
1081 { | |
1082 RedefineVerifyMark rvm(&the_class, &scratch_class, state); | |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
628
diff
changeset
|
1083 Verifier::verify(scratch_class, Verifier::ThrowException, true, THREAD); |
0 | 1084 } |
1085 | |
1086 if (HAS_PENDING_EXCEPTION) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1087 Symbol* ex_name = PENDING_EXCEPTION->klass()->name(); |
0 | 1088 // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
1089 RC_TRACE_WITH_THREAD(0x00000002, THREAD, | |
1090 ("verify_byte_codes post merge-CP exception: '%s'", | |
1091 ex_name->as_C_string())); | |
1092 CLEAR_PENDING_EXCEPTION; | |
1093 if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) { | |
1094 return JVMTI_ERROR_OUT_OF_MEMORY; | |
1095 } else { | |
1096 // tell the caller that constant pool merging screwed up | |
1097 return JVMTI_ERROR_INTERNAL; | |
1098 } | |
1099 } | |
1100 } | |
1101 | |
1102 Rewriter::rewrite(scratch_class, THREAD); | |
3748 | 1103 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
|
1104 scratch_class->link_methods(THREAD); |
3748 | 1105 } |
0 | 1106 if (HAS_PENDING_EXCEPTION) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1107 Symbol* ex_name = PENDING_EXCEPTION->klass()->name(); |
0 | 1108 CLEAR_PENDING_EXCEPTION; |
1109 if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) { | |
1110 return JVMTI_ERROR_OUT_OF_MEMORY; | |
1111 } else { | |
1112 return JVMTI_ERROR_INTERNAL; | |
1113 } | |
1114 } | |
1115 | |
1116 // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark | |
1117 RC_TRACE_WITH_THREAD(0x00000001, THREAD, | |
1118 ("loaded name=%s (avail_mem=" UINT64_FORMAT "K)", | |
1119 the_class->external_name(), os::available_memory() >> 10)); | |
1120 } | |
1121 | |
1122 return JVMTI_ERROR_NONE; | |
1123 } | |
1124 | |
1125 | |
1126 // Map old_index to new_index as needed. scratch_cp is only needed | |
1127 // for RC_TRACE() calls. | |
1128 void VM_RedefineClasses::map_index(constantPoolHandle scratch_cp, | |
1129 int old_index, int new_index) { | |
1130 if (find_new_index(old_index) != 0) { | |
1131 // old_index is already mapped | |
1132 return; | |
1133 } | |
1134 | |
1135 if (old_index == new_index) { | |
1136 // no mapping is needed | |
1137 return; | |
1138 } | |
1139 | |
1140 _index_map_p->at_put(old_index, new_index); | |
1141 _index_map_count++; | |
1142 | |
1143 RC_TRACE(0x00040000, ("mapped tag %d at index %d to %d", | |
1144 scratch_cp->tag_at(old_index).value(), old_index, new_index)); | |
1145 } // end map_index() | |
1146 | |
1147 | |
10151
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1148 // 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
|
1149 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
|
1150 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
|
1151 // 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
|
1152 return; |
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1153 } |
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1154 |
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1155 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
|
1156 // 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
|
1157 return; |
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1158 } |
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1159 |
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1160 _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
|
1161 _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
|
1162 |
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1163 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
|
1164 } // end map_index() |
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 |
0 | 1167 // Merge old_cp and scratch_cp and return the results of the merge via |
1168 // merge_cp_p. The number of entries in *merge_cp_p is returned via | |
1169 // merge_cp_length_p. The entries in old_cp occupy the same locations | |
1170 // in *merge_cp_p. Also creates a map of indices from entries in | |
1171 // scratch_cp to the corresponding entry in *merge_cp_p. Index map | |
1172 // entries are only created for entries in scratch_cp that occupy a | |
1173 // different location in *merged_cp_p. | |
1174 bool VM_RedefineClasses::merge_constant_pools(constantPoolHandle old_cp, | |
1175 constantPoolHandle scratch_cp, constantPoolHandle *merge_cp_p, | |
1176 int *merge_cp_length_p, TRAPS) { | |
1177 | |
1178 if (merge_cp_p == NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1179 assert(false, "caller must provide scratch constantPool"); |
0 | 1180 return false; // robustness |
1181 } | |
1182 if (merge_cp_length_p == NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1183 assert(false, "caller must provide scratch CP length"); |
0 | 1184 return false; // robustness |
1185 } | |
1186 // Worst case we need old_cp->length() + scratch_cp()->length(), | |
1187 // but the caller might be smart so make sure we have at least | |
1188 // the minimum. | |
1189 if ((*merge_cp_p)->length() < old_cp->length()) { | |
1190 assert(false, "merge area too small"); | |
1191 return false; // robustness | |
1192 } | |
1193 | |
1194 RC_TRACE_WITH_THREAD(0x00010000, THREAD, | |
1195 ("old_cp_len=%d, scratch_cp_len=%d", old_cp->length(), | |
1196 scratch_cp->length())); | |
1197 | |
1198 { | |
1199 // Pass 0: | |
1200 // The old_cp is copied to *merge_cp_p; this means that any code | |
1201 // 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
|
1202 // perfect fit for ConstantPool*::copy_cp_to(), but we need to |
0 | 1203 // handle one special case: |
1204 // - revert JVM_CONSTANT_Class to JVM_CONSTANT_UnresolvedClass | |
1205 // This will make verification happy. | |
1206 | |
1207 int old_i; // index into old_cp | |
1208 | |
1209 // index zero (0) is not used in constantPools | |
1210 for (old_i = 1; old_i < old_cp->length(); old_i++) { | |
1211 // leave debugging crumb | |
1212 jbyte old_tag = old_cp->tag_at(old_i).value(); | |
1213 switch (old_tag) { | |
1214 case JVM_CONSTANT_Class: | |
2332
fbbeec6dad2d
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
2226
diff
changeset
|
1215 case JVM_CONSTANT_UnresolvedClass: |
0 | 1216 // 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
|
1217 // 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
|
1218 // JVM_CONSTANT_UnresolvedClass (klass_name_at() deals with transition) |
0 | 1219 (*merge_cp_p)->unresolved_klass_at_put(old_i, |
1220 old_cp->klass_name_at(old_i)); | |
1221 break; | |
1222 | |
1223 case JVM_CONSTANT_Double: | |
1224 case JVM_CONSTANT_Long: | |
1225 // just copy the entry to *merge_cp_p, but double and long take | |
1226 // two constant pool entries | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1227 ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i, CHECK_0); |
0 | 1228 old_i++; |
1229 break; | |
1230 | |
1231 default: | |
1232 // 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
|
1233 ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i, CHECK_0); |
0 | 1234 break; |
1235 } | |
1236 } // end for each old_cp entry | |
1237 | |
7952
edd76a5856f7
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
7949
diff
changeset
|
1238 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
|
1239 (*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
|
1240 |
0 | 1241 // We don't need to sanity check that *merge_cp_length_p is within |
1242 // *merge_cp_p bounds since we have the minimum on-entry check above. | |
1243 (*merge_cp_length_p) = old_i; | |
1244 } | |
1245 | |
1246 // merge_cp_len should be the same as old_cp->length() at this point | |
1247 // so this trace message is really a "warm-and-breathing" message. | |
1248 RC_TRACE_WITH_THREAD(0x00020000, THREAD, | |
1249 ("after pass 0: merge_cp_len=%d", *merge_cp_length_p)); | |
1250 | |
1251 int scratch_i; // index into scratch_cp | |
1252 { | |
1253 // Pass 1a: | |
1254 // Compare scratch_cp entries to the old_cp entries that we have | |
1255 // already copied to *merge_cp_p. In this pass, we are eliminating | |
1256 // exact duplicates (matching entry at same index) so we only | |
1257 // compare entries in the common indice range. | |
1258 int increment = 1; | |
1259 int pass1a_length = MIN2(old_cp->length(), scratch_cp->length()); | |
1260 for (scratch_i = 1; scratch_i < pass1a_length; scratch_i += increment) { | |
1261 switch (scratch_cp->tag_at(scratch_i).value()) { | |
1262 case JVM_CONSTANT_Double: | |
1263 case JVM_CONSTANT_Long: | |
1264 // double and long take two constant pool entries | |
1265 increment = 2; | |
1266 break; | |
1267 | |
1268 default: | |
1269 increment = 1; | |
1270 break; | |
1271 } | |
1272 | |
1273 bool match = scratch_cp->compare_entry_to(scratch_i, *merge_cp_p, | |
1274 scratch_i, CHECK_0); | |
1275 if (match) { | |
1276 // found a match at the same index so nothing more to do | |
1277 continue; | |
1278 } else if (is_unresolved_class_mismatch(scratch_cp, scratch_i, | |
1279 *merge_cp_p, scratch_i)) { | |
1280 // The mismatch in compare_entry_to() above is because of a | |
1281 // resolved versus unresolved class entry at the same index | |
1282 // with the same string value. Since Pass 0 reverted any | |
1283 // class entries to unresolved class entries in *merge_cp_p, | |
1284 // we go with the unresolved class entry. | |
1285 continue; | |
1286 } | |
1287 | |
1288 int found_i = scratch_cp->find_matching_entry(scratch_i, *merge_cp_p, | |
1289 CHECK_0); | |
1290 if (found_i != 0) { | |
1291 guarantee(found_i != scratch_i, | |
1292 "compare_entry_to() and find_matching_entry() do not agree"); | |
1293 | |
1294 // Found a matching entry somewhere else in *merge_cp_p so | |
1295 // just need a mapping entry. | |
1296 map_index(scratch_cp, scratch_i, found_i); | |
1297 continue; | |
1298 } | |
1299 | |
1300 // The find_matching_entry() call above could fail to find a match | |
1301 // due to a resolved versus unresolved class or string entry situation | |
1302 // like we solved above with the is_unresolved_*_mismatch() calls. | |
1303 // However, we would have to call is_unresolved_*_mismatch() over | |
1304 // all of *merge_cp_p (potentially) and that doesn't seem to be | |
1305 // worth the time. | |
1306 | |
1307 // No match found so we have to append this entry and any unique | |
1308 // referenced entries to *merge_cp_p. | |
1309 append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p, | |
1310 CHECK_0); | |
1311 } | |
1312 } | |
1313 | |
1314 RC_TRACE_WITH_THREAD(0x00020000, THREAD, | |
1315 ("after pass 1a: merge_cp_len=%d, scratch_i=%d, index_map_len=%d", | |
1316 *merge_cp_length_p, scratch_i, _index_map_count)); | |
1317 | |
1318 if (scratch_i < scratch_cp->length()) { | |
1319 // Pass 1b: | |
1320 // old_cp is smaller than scratch_cp so there are entries in | |
1321 // scratch_cp that we have not yet processed. We take care of | |
1322 // those now. | |
1323 int increment = 1; | |
1324 for (; scratch_i < scratch_cp->length(); scratch_i += increment) { | |
1325 switch (scratch_cp->tag_at(scratch_i).value()) { | |
1326 case JVM_CONSTANT_Double: | |
1327 case JVM_CONSTANT_Long: | |
1328 // double and long take two constant pool entries | |
1329 increment = 2; | |
1330 break; | |
1331 | |
1332 default: | |
1333 increment = 1; | |
1334 break; | |
1335 } | |
1336 | |
1337 int found_i = | |
1338 scratch_cp->find_matching_entry(scratch_i, *merge_cp_p, CHECK_0); | |
1339 if (found_i != 0) { | |
1340 // Found a matching entry somewhere else in *merge_cp_p so | |
1341 // just need a mapping entry. | |
1342 map_index(scratch_cp, scratch_i, found_i); | |
1343 continue; | |
1344 } | |
1345 | |
1346 // No match found so we have to append this entry and any unique | |
1347 // referenced entries to *merge_cp_p. | |
1348 append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p, | |
1349 CHECK_0); | |
1350 } | |
1351 | |
1352 RC_TRACE_WITH_THREAD(0x00020000, THREAD, | |
1353 ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d", | |
1354 *merge_cp_length_p, scratch_i, _index_map_count)); | |
1355 } | |
10382
e7d29a019a3c
8014052: JSR292: assert(end_offset == next_offset) failed: matched ending
sspitsyn
parents:
10268
diff
changeset
|
1356 finalize_operands_merge(*merge_cp_p, THREAD); |
0 | 1357 |
1358 return true; | |
1359 } // end merge_constant_pools() | |
1360 | |
1361 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1362 // 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
|
1363 class MergeCPCleaner { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1364 ClassLoaderData* _loader_data; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1365 ConstantPool* _cp; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1366 ConstantPool* _scratch_cp; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1367 public: |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1368 MergeCPCleaner(ClassLoaderData* loader_data, ConstantPool* merge_cp) : |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1369 _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
|
1370 ~MergeCPCleaner() { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1371 _loader_data->add_to_deallocate_list(_cp); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1372 if (_scratch_cp != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1373 _loader_data->add_to_deallocate_list(_scratch_cp); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1374 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1375 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1376 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
|
1377 }; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1378 |
0 | 1379 // Merge constant pools between the_class and scratch_class and |
1380 // potentially rewrite bytecodes in scratch_class to use the merged | |
1381 // constant pool. | |
1382 jvmtiError VM_RedefineClasses::merge_cp_and_rewrite( | |
1383 instanceKlassHandle the_class, instanceKlassHandle scratch_class, | |
1384 TRAPS) { | |
1385 // worst case merged constant pool length is old and new combined | |
1386 int merge_cp_length = the_class->constants()->length() | |
1387 + scratch_class->constants()->length(); | |
1388 | |
1389 // Constant pools are not easily reused so we allocate a new one | |
1390 // each time. | |
518
0af8b0718fc9
6692899: CMS: many vm.parallel_class_loading tests fail with assert "missing Printezis mark"
jmasa
parents:
0
diff
changeset
|
1391 // 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
|
1392 // 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
|
1393 // 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
|
1394 // 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
|
1395 ClassLoaderData* loader_data = the_class->class_loader_data(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1396 ConstantPool* merge_cp_oop = |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1397 ConstantPool::allocate(loader_data, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1398 merge_cp_length, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1399 THREAD); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1400 MergeCPCleaner cp_cleaner(loader_data, merge_cp_oop); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1401 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1402 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
|
1403 // MergeCPCleaner clears out merge_cp_oop |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1404 constantPoolHandle merge_cp(THREAD, merge_cp_oop); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1405 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1406 // 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
|
1407 // 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
|
1408 constantPoolHandle old_cp(THREAD, the_class->constants()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1409 constantPoolHandle scratch_cp(THREAD, scratch_class->constants()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1410 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1411 // 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
|
1412 // an error. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1413 if (merge_cp_length != the_class->constants()->length() |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1414 + scratch_class->constants()->length()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1415 return JVMTI_ERROR_INTERNAL; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1416 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1417 |
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
1418 // Update the version number of the constant pool |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
1419 merge_cp->increment_and_save_version(old_cp->version()); |
0 | 1420 |
1421 ResourceMark rm(THREAD); | |
1422 _index_map_count = 0; | |
1423 _index_map_p = new intArray(scratch_cp->length(), -1); | |
1424 | |
10151
15a99ca4ee34
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
10133
diff
changeset
|
1425 _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
|
1426 _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
|
1427 _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
|
1428 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
|
1429 |
7952
edd76a5856f7
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
7949
diff
changeset
|
1430 // 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
|
1431 merge_cp->set_pool_holder(scratch_class()); |
0 | 1432 bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp, |
1433 &merge_cp_length, THREAD); | |
7952
edd76a5856f7
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
7949
diff
changeset
|
1434 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
|
1435 |
0 | 1436 if (!result) { |
1437 // The merge can fail due to memory allocation failure or due | |
1438 // to robustness checks. | |
1439 return JVMTI_ERROR_INTERNAL; | |
1440 } | |
1441 | |
1442 RC_TRACE_WITH_THREAD(0x00010000, THREAD, | |
1443 ("merge_cp_len=%d, index_map_len=%d", merge_cp_length, _index_map_count)); | |
1444 | |
1445 if (_index_map_count == 0) { | |
1446 // there is nothing to map between the new and merged constant pools | |
1447 | |
1448 if (old_cp->length() == scratch_cp->length()) { | |
1449 // The old and new constant pools are the same length and the | |
1450 // index map is empty. This means that the three constant pools | |
1451 // are equivalent (but not the same). Unfortunately, the new | |
1452 // constant pool has not gone through link resolution nor have | |
1453 // the new class bytecodes gone through constant pool cache | |
1454 // rewriting so we can't use the old constant pool with the new | |
1455 // class. | |
1456 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1457 // toss the merged constant pool at return |
0 | 1458 } else if (old_cp->length() < scratch_cp->length()) { |
1459 // The old constant pool has fewer entries than the new constant | |
1460 // pool and the index map is empty. This means the new constant | |
1461 // pool is a superset of the old constant pool. However, the old | |
1462 // class bytecodes have already gone through constant pool cache | |
1463 // rewriting so we can't use the new constant pool with the old | |
1464 // class. | |
1465 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1466 // toss the merged constant pool at return |
0 | 1467 } else { |
1468 // The old constant pool has more entries than the new constant | |
1469 // pool and the index map is empty. This means that both the old | |
1470 // and merged constant pools are supersets of the new constant | |
1471 // pool. | |
1472 | |
1473 // 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
|
1474 // merged constant pool |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1475 set_new_constant_pool(loader_data, scratch_class, merge_cp, merge_cp_length, THREAD); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1476 // 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
|
1477 // 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
|
1478 cp_cleaner.add_scratch_cp(scratch_cp()); |
0 | 1479 } |
1480 } else { | |
1481 if (RC_TRACE_ENABLED(0x00040000)) { | |
1482 // don't want to loop unless we are tracing | |
1483 int count = 0; | |
1484 for (int i = 1; i < _index_map_p->length(); i++) { | |
1485 int value = _index_map_p->at(i); | |
1486 | |
1487 if (value != -1) { | |
1488 RC_TRACE_WITH_THREAD(0x00040000, THREAD, | |
1489 ("index_map[%d]: old=%d new=%d", count, i, value)); | |
1490 count++; | |
1491 } | |
1492 } | |
1493 } | |
1494 | |
1495 // We have entries mapped between the new and merged constant pools | |
1496 // so we have to rewrite some constant pool references. | |
1497 if (!rewrite_cp_refs(scratch_class, THREAD)) { | |
1498 return JVMTI_ERROR_INTERNAL; | |
1499 } | |
1500 | |
1501 // Replace the new constant pool with a shrunken copy of the | |
1502 // merged constant pool so now the rewritten bytecodes have | |
1503 // valid references; the previous new constant pool will get | |
1504 // GCed. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1505 set_new_constant_pool(loader_data, scratch_class, merge_cp, merge_cp_length, THREAD); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1506 // 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
|
1507 // 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
|
1508 cp_cleaner.add_scratch_cp(scratch_cp()); |
0 | 1509 } |
1510 | |
1511 return JVMTI_ERROR_NONE; | |
1512 } // end merge_cp_and_rewrite() | |
1513 | |
1514 | |
1515 // Rewrite constant pool references in klass scratch_class. | |
1516 bool VM_RedefineClasses::rewrite_cp_refs(instanceKlassHandle scratch_class, | |
1517 TRAPS) { | |
1518 | |
1519 // rewrite constant pool references in the methods: | |
1520 if (!rewrite_cp_refs_in_methods(scratch_class, THREAD)) { | |
605 | 1521 // propagate failure back to caller |
0 | 1522 return false; |
1523 } | |
1524 | |
1525 // rewrite constant pool references in the class_annotations: | |
1526 if (!rewrite_cp_refs_in_class_annotations(scratch_class, THREAD)) { | |
605 | 1527 // propagate failure back to caller |
0 | 1528 return false; |
1529 } | |
1530 | |
1531 // rewrite constant pool references in the fields_annotations: | |
1532 if (!rewrite_cp_refs_in_fields_annotations(scratch_class, THREAD)) { | |
605 | 1533 // propagate failure back to caller |
0 | 1534 return false; |
1535 } | |
1536 | |
1537 // rewrite constant pool references in the methods_annotations: | |
1538 if (!rewrite_cp_refs_in_methods_annotations(scratch_class, THREAD)) { | |
605 | 1539 // propagate failure back to caller |
0 | 1540 return false; |
1541 } | |
1542 | |
1543 // rewrite constant pool references in the methods_parameter_annotations: | |
1544 if (!rewrite_cp_refs_in_methods_parameter_annotations(scratch_class, | |
1545 THREAD)) { | |
605 | 1546 // propagate failure back to caller |
0 | 1547 return false; |
1548 } | |
1549 | |
1550 // rewrite constant pool references in the methods_default_annotations: | |
1551 if (!rewrite_cp_refs_in_methods_default_annotations(scratch_class, | |
1552 THREAD)) { | |
605 | 1553 // propagate failure back to caller |
0 | 1554 return false; |
1555 } | |
1556 | |
12067
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1557 // rewrite sourc file name index: |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1558 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
|
1559 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
|
1560 u2 new_source_file_name_idx = find_new_index(source_file_name_idx); |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1561 scratch_class->set_source_file_name_index(new_source_file_name_idx); |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1562 } |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1563 |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1564 // 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
|
1565 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
|
1566 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
|
1567 u2 new_generic_signature_index = find_new_index(generic_signature_index); |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1568 scratch_class->set_generic_signature_index(new_generic_signature_index); |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1569 } |
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
12022
diff
changeset
|
1570 |
0 | 1571 return true; |
1572 } // end rewrite_cp_refs() | |
1573 | |
1574 // Rewrite constant pool references in the methods. | |
1575 bool VM_RedefineClasses::rewrite_cp_refs_in_methods( | |
1576 instanceKlassHandle scratch_class, TRAPS) { | |
1577 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1578 Array<Method*>* methods = scratch_class->methods(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1579 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1580 if (methods == NULL || methods->length() == 0) { |
0 | 1581 // no methods so nothing to do |
1582 return true; | |
1583 } | |
1584 | |
1585 // rewrite constant pool references in the methods: | |
1586 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
|
1587 methodHandle method(THREAD, methods->at(i)); |
0 | 1588 methodHandle new_method; |
1589 rewrite_cp_refs_in_method(method, &new_method, CHECK_false); | |
1590 if (!new_method.is_null()) { | |
1591 // the method has been replaced so save the new method version | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1592 methods->at_put(i, new_method()); |
0 | 1593 } |
1594 } | |
1595 | |
1596 return true; | |
1597 } | |
1598 | |
1599 | |
1600 // Rewrite constant pool references in the specific method. This code | |
1601 // was adapted from Rewriter::rewrite_method(). | |
1602 void VM_RedefineClasses::rewrite_cp_refs_in_method(methodHandle method, | |
1603 methodHandle *new_method_p, TRAPS) { | |
1604 | |
1605 *new_method_p = methodHandle(); // default is no new method | |
1606 | |
1607 // 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
|
1608 // moves the Method*, then the bytecodes will also move which |
0 | 1609 // will likely cause a crash. We create a No_Safepoint_Verifier |
1610 // object to detect whether we pass a possible safepoint in this | |
1611 // code block. | |
1612 No_Safepoint_Verifier nsv; | |
1613 | |
1614 // Bytecodes and their length | |
1615 address code_base = method->code_base(); | |
1616 int code_length = method->code_size(); | |
1617 | |
1618 int bc_length; | |
1619 for (int bci = 0; bci < code_length; bci += bc_length) { | |
1620 address bcp = code_base + bci; | |
1621 Bytecodes::Code c = (Bytecodes::Code)(*bcp); | |
1622 | |
1623 bc_length = Bytecodes::length_for(c); | |
1624 if (bc_length == 0) { | |
1625 // More complicated bytecodes report a length of zero so | |
1626 // we have to try again a slightly different way. | |
2142 | 1627 bc_length = Bytecodes::length_at(method(), bcp); |
0 | 1628 } |
1629 | |
1630 assert(bc_length != 0, "impossible bytecode length"); | |
1631 | |
1632 switch (c) { | |
1633 case Bytecodes::_ldc: | |
1634 { | |
1635 int cp_index = *(bcp + 1); | |
1636 int new_index = find_new_index(cp_index); | |
1637 | |
1638 if (StressLdcRewrite && new_index == 0) { | |
1639 // If we are stressing ldc -> ldc_w rewriting, then we | |
1640 // always need a new_index value. | |
1641 new_index = cp_index; | |
1642 } | |
1643 if (new_index != 0) { | |
1644 // the original index is mapped so we have more work to do | |
1645 if (!StressLdcRewrite && new_index <= max_jubyte) { | |
1646 // The new value can still use ldc instead of ldc_w | |
1647 // unless we are trying to stress ldc -> ldc_w rewriting | |
1648 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
1649 ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c), | |
1650 bcp, cp_index, new_index)); | |
1651 *(bcp + 1) = new_index; | |
1652 } else { | |
1653 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
1654 ("%s->ldc_w@" INTPTR_FORMAT " old=%d, new=%d", | |
1655 Bytecodes::name(c), bcp, cp_index, new_index)); | |
1656 // the new value needs ldc_w instead of ldc | |
1657 u_char inst_buffer[4]; // max instruction size is 4 bytes | |
1658 bcp = (address)inst_buffer; | |
1659 // construct new instruction sequence | |
1660 *bcp = Bytecodes::_ldc_w; | |
1661 bcp++; | |
1662 // Rewriter::rewrite_method() does not rewrite ldc -> ldc_w. | |
1663 // See comment below for difference between put_Java_u2() | |
1664 // and put_native_u2(). | |
1665 Bytes::put_Java_u2(bcp, new_index); | |
1666 | |
1667 Relocator rc(method, NULL /* no RelocatorListener needed */); | |
1668 methodHandle m; | |
1669 { | |
1670 Pause_No_Safepoint_Verifier pnsv(&nsv); | |
1671 | |
1672 // ldc is 2 bytes and ldc_w is 3 bytes | |
1673 m = rc.insert_space_at(bci, 3, inst_buffer, THREAD); | |
1674 if (m.is_null() || HAS_PENDING_EXCEPTION) { | |
1675 guarantee(false, "insert_space_at() failed"); | |
1676 } | |
1677 } | |
1678 | |
1679 // return the new method so that the caller can update | |
1680 // the containing class | |
1681 *new_method_p = method = m; | |
1682 // switch our bytecode processing loop from the old method | |
1683 // to the new method | |
1684 code_base = method->code_base(); | |
1685 code_length = method->code_size(); | |
1686 bcp = code_base + bci; | |
1687 c = (Bytecodes::Code)(*bcp); | |
1688 bc_length = Bytecodes::length_for(c); | |
1689 assert(bc_length != 0, "sanity check"); | |
1690 } // end we need ldc_w instead of ldc | |
1691 } // end if there is a mapped index | |
1692 } break; | |
1693 | |
1694 // these bytecodes have a two-byte constant pool index | |
1695 case Bytecodes::_anewarray : // fall through | |
1696 case Bytecodes::_checkcast : // fall through | |
1697 case Bytecodes::_getfield : // fall through | |
1698 case Bytecodes::_getstatic : // fall through | |
1699 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
|
1700 case Bytecodes::_invokedynamic : // fall through |
0 | 1701 case Bytecodes::_invokeinterface: // fall through |
1702 case Bytecodes::_invokespecial : // fall through | |
1703 case Bytecodes::_invokestatic : // fall through | |
1704 case Bytecodes::_invokevirtual : // fall through | |
1705 case Bytecodes::_ldc_w : // fall through | |
1706 case Bytecodes::_ldc2_w : // fall through | |
1707 case Bytecodes::_multianewarray : // fall through | |
1708 case Bytecodes::_new : // fall through | |
1709 case Bytecodes::_putfield : // fall through | |
1710 case Bytecodes::_putstatic : | |
1711 { | |
1712 address p = bcp + 1; | |
1713 int cp_index = Bytes::get_Java_u2(p); | |
1714 int new_index = find_new_index(cp_index); | |
1715 if (new_index != 0) { | |
1716 // the original index is mapped so update w/ new value | |
1717 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
1718 ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c), | |
1719 bcp, cp_index, new_index)); | |
1720 // Rewriter::rewrite_method() uses put_native_u2() in this | |
1721 // situation because it is reusing the constant pool index | |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
1722 // location for a native index into the ConstantPoolCache. |
0 | 1723 // 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
|
1724 // verification and ConstantPoolCache initialization, we |
0 | 1725 // need to keep the new index in Java byte order. |
1726 Bytes::put_Java_u2(p, new_index); | |
1727 } | |
1728 } break; | |
1729 } | |
1730 } // end for each bytecode | |
8068
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1731 |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1732 // 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
|
1733 // method parameter data present |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1734 if(method->has_method_parameters()) { |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1735 const int len = method->method_parameters_length(); |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1736 MethodParametersElement* elem = method->method_parameters_start(); |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1737 |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1738 for (int i = 0; i < len; i++) { |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1739 const u2 cp_index = elem[i].name_cp_index; |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1740 elem[i].name_cp_index = find_new_index(cp_index); |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1741 } |
56c364daccc3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
8031
diff
changeset
|
1742 } |
0 | 1743 } // end rewrite_cp_refs_in_method() |
1744 | |
1745 | |
1746 // Rewrite constant pool references in the class_annotations field. | |
1747 bool VM_RedefineClasses::rewrite_cp_refs_in_class_annotations( | |
1748 instanceKlassHandle scratch_class, TRAPS) { | |
1749 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1750 AnnotationArray* class_annotations = scratch_class->class_annotations(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1751 if (class_annotations == NULL || class_annotations->length() == 0) { |
0 | 1752 // no class_annotations so nothing to do |
1753 return true; | |
1754 } | |
1755 | |
1756 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1757 ("class_annotations length=%d", class_annotations->length())); | |
1758 | |
1759 int byte_i = 0; // byte index into class_annotations | |
1760 return rewrite_cp_refs_in_annotations_typeArray(class_annotations, byte_i, | |
1761 THREAD); | |
1762 } | |
1763 | |
1764 | |
1765 // Rewrite constant pool references in an annotations typeArray. This | |
1766 // "structure" is adapted from the RuntimeVisibleAnnotations_attribute | |
1767 // that is described in section 4.8.15 of the 2nd-edition of the VM spec: | |
1768 // | |
1769 // annotations_typeArray { | |
1770 // u2 num_annotations; | |
1771 // annotation annotations[num_annotations]; | |
1772 // } | |
1773 // | |
1774 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
|
1775 AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) { |
0 | 1776 |
1777 if ((byte_i_ref + 2) > annotations_typeArray->length()) { | |
1778 // not enough room for num_annotations field | |
1779 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1780 ("length() is too small for num_annotations field")); | |
1781 return false; | |
1782 } | |
1783 | |
1784 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
|
1785 annotations_typeArray->adr_at(byte_i_ref)); |
0 | 1786 byte_i_ref += 2; |
1787 | |
1788 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1789 ("num_annotations=%d", num_annotations)); | |
1790 | |
1791 int calc_num_annotations = 0; | |
1792 for (; calc_num_annotations < num_annotations; calc_num_annotations++) { | |
1793 if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray, | |
1794 byte_i_ref, THREAD)) { | |
1795 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1796 ("bad annotation_struct at %d", calc_num_annotations)); | |
605 | 1797 // propagate failure back to caller |
0 | 1798 return false; |
1799 } | |
1800 } | |
1801 assert(num_annotations == calc_num_annotations, "sanity check"); | |
1802 | |
1803 return true; | |
1804 } // end rewrite_cp_refs_in_annotations_typeArray() | |
1805 | |
1806 | |
1807 // Rewrite constant pool references in the annotation struct portion of | |
1808 // an annotations_typeArray. This "structure" is from section 4.8.15 of | |
1809 // the 2nd-edition of the VM spec: | |
1810 // | |
1811 // struct annotation { | |
1812 // u2 type_index; | |
1813 // u2 num_element_value_pairs; | |
1814 // { | |
1815 // u2 element_name_index; | |
1816 // element_value value; | |
1817 // } element_value_pairs[num_element_value_pairs]; | |
1818 // } | |
1819 // | |
1820 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
|
1821 AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) { |
0 | 1822 if ((byte_i_ref + 2 + 2) > annotations_typeArray->length()) { |
1823 // not enough room for smallest annotation_struct | |
1824 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1825 ("length() is too small for annotation_struct")); | |
1826 return false; | |
1827 } | |
1828 | |
1829 u2 type_index = rewrite_cp_ref_in_annotation_data(annotations_typeArray, | |
1830 byte_i_ref, "mapped old type_index=%d", THREAD); | |
1831 | |
1832 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
|
1833 annotations_typeArray->adr_at(byte_i_ref)); |
0 | 1834 byte_i_ref += 2; |
1835 | |
1836 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1837 ("type_index=%d num_element_value_pairs=%d", type_index, | |
1838 num_element_value_pairs)); | |
1839 | |
1840 int calc_num_element_value_pairs = 0; | |
1841 for (; calc_num_element_value_pairs < num_element_value_pairs; | |
1842 calc_num_element_value_pairs++) { | |
1843 if ((byte_i_ref + 2) > annotations_typeArray->length()) { | |
1844 // not enough room for another element_name_index, let alone | |
1845 // the rest of another component | |
1846 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1847 ("length() is too small for element_name_index")); | |
1848 return false; | |
1849 } | |
1850 | |
1851 u2 element_name_index = rewrite_cp_ref_in_annotation_data( | |
1852 annotations_typeArray, byte_i_ref, | |
1853 "mapped old element_name_index=%d", THREAD); | |
1854 | |
1855 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1856 ("element_name_index=%d", element_name_index)); | |
1857 | |
1858 if (!rewrite_cp_refs_in_element_value(annotations_typeArray, | |
1859 byte_i_ref, THREAD)) { | |
1860 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1861 ("bad element_value at %d", calc_num_element_value_pairs)); | |
605 | 1862 // propagate failure back to caller |
0 | 1863 return false; |
1864 } | |
1865 } // end for each component | |
1866 assert(num_element_value_pairs == calc_num_element_value_pairs, | |
1867 "sanity check"); | |
1868 | |
1869 return true; | |
1870 } // end rewrite_cp_refs_in_annotation_struct() | |
1871 | |
1872 | |
1873 // Rewrite a constant pool reference at the current position in | |
1874 // annotations_typeArray if needed. Returns the original constant | |
1875 // pool reference if a rewrite was not needed or the new constant | |
1876 // pool reference if a rewrite was needed. | |
1877 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
|
1878 AnnotationArray* annotations_typeArray, int &byte_i_ref, |
0 | 1879 const char * trace_mesg, TRAPS) { |
1880 | |
1881 address cp_index_addr = (address) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1882 annotations_typeArray->adr_at(byte_i_ref); |
0 | 1883 u2 old_cp_index = Bytes::get_Java_u2(cp_index_addr); |
1884 u2 new_cp_index = find_new_index(old_cp_index); | |
1885 if (new_cp_index != 0) { | |
1886 RC_TRACE_WITH_THREAD(0x02000000, THREAD, (trace_mesg, old_cp_index)); | |
1887 Bytes::put_Java_u2(cp_index_addr, new_cp_index); | |
1888 old_cp_index = new_cp_index; | |
1889 } | |
1890 byte_i_ref += 2; | |
1891 return old_cp_index; | |
1892 } | |
1893 | |
1894 | |
1895 // Rewrite constant pool references in the element_value portion of an | |
1896 // annotations_typeArray. This "structure" is from section 4.8.15.1 of | |
1897 // the 2nd-edition of the VM spec: | |
1898 // | |
1899 // struct element_value { | |
1900 // u1 tag; | |
1901 // union { | |
1902 // u2 const_value_index; | |
1903 // { | |
1904 // u2 type_name_index; | |
1905 // u2 const_name_index; | |
1906 // } enum_const_value; | |
1907 // u2 class_info_index; | |
1908 // annotation annotation_value; | |
1909 // struct { | |
1910 // u2 num_values; | |
1911 // element_value values[num_values]; | |
1912 // } array_value; | |
1913 // } value; | |
1914 // } | |
1915 // | |
1916 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
|
1917 AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) { |
0 | 1918 |
1919 if ((byte_i_ref + 1) > annotations_typeArray->length()) { | |
1920 // not enough room for a tag let alone the rest of an element_value | |
1921 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1922 ("length() is too small for a tag")); | |
1923 return false; | |
1924 } | |
1925 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
1926 u1 tag = annotations_typeArray->at(byte_i_ref); |
0 | 1927 byte_i_ref++; |
1928 RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("tag='%c'", tag)); | |
1929 | |
1930 switch (tag) { | |
1931 // These BaseType tag values are from Table 4.2 in VM spec: | |
1932 case 'B': // byte | |
1933 case 'C': // char | |
1934 case 'D': // double | |
1935 case 'F': // float | |
1936 case 'I': // int | |
1937 case 'J': // long | |
1938 case 'S': // short | |
1939 case 'Z': // boolean | |
1940 | |
1941 // The remaining tag values are from Table 4.8 in the 2nd-edition of | |
1942 // the VM spec: | |
1943 case 's': | |
1944 { | |
1945 // For the above tag values (including the BaseType values), | |
1946 // value.const_value_index is right union field. | |
1947 | |
1948 if ((byte_i_ref + 2) > annotations_typeArray->length()) { | |
1949 // not enough room for a const_value_index | |
1950 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1951 ("length() is too small for a const_value_index")); | |
1952 return false; | |
1953 } | |
1954 | |
1955 u2 const_value_index = rewrite_cp_ref_in_annotation_data( | |
1956 annotations_typeArray, byte_i_ref, | |
1957 "mapped old const_value_index=%d", THREAD); | |
1958 | |
1959 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1960 ("const_value_index=%d", const_value_index)); | |
1961 } break; | |
1962 | |
1963 case 'e': | |
1964 { | |
1965 // for the above tag value, value.enum_const_value is right union field | |
1966 | |
1967 if ((byte_i_ref + 4) > annotations_typeArray->length()) { | |
1968 // not enough room for a enum_const_value | |
1969 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1970 ("length() is too small for a enum_const_value")); | |
1971 return false; | |
1972 } | |
1973 | |
1974 u2 type_name_index = rewrite_cp_ref_in_annotation_data( | |
1975 annotations_typeArray, byte_i_ref, | |
1976 "mapped old type_name_index=%d", THREAD); | |
1977 | |
1978 u2 const_name_index = rewrite_cp_ref_in_annotation_data( | |
1979 annotations_typeArray, byte_i_ref, | |
1980 "mapped old const_name_index=%d", THREAD); | |
1981 | |
1982 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1983 ("type_name_index=%d const_name_index=%d", type_name_index, | |
1984 const_name_index)); | |
1985 } break; | |
1986 | |
1987 case 'c': | |
1988 { | |
1989 // for the above tag value, value.class_info_index is right union field | |
1990 | |
1991 if ((byte_i_ref + 2) > annotations_typeArray->length()) { | |
1992 // not enough room for a class_info_index | |
1993 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
1994 ("length() is too small for a class_info_index")); | |
1995 return false; | |
1996 } | |
1997 | |
1998 u2 class_info_index = rewrite_cp_ref_in_annotation_data( | |
1999 annotations_typeArray, byte_i_ref, | |
2000 "mapped old class_info_index=%d", THREAD); | |
2001 | |
2002 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2003 ("class_info_index=%d", class_info_index)); | |
2004 } break; | |
2005 | |
2006 case '@': | |
2007 // For the above tag value, value.attr_value is the right union | |
2008 // field. This is a nested annotation. | |
2009 if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray, | |
2010 byte_i_ref, THREAD)) { | |
605 | 2011 // propagate failure back to caller |
0 | 2012 return false; |
2013 } | |
2014 break; | |
2015 | |
2016 case '[': | |
2017 { | |
2018 if ((byte_i_ref + 2) > annotations_typeArray->length()) { | |
2019 // not enough room for a num_values field | |
2020 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2021 ("length() is too small for a num_values field")); | |
2022 return false; | |
2023 } | |
2024 | |
2025 // For the above tag value, value.array_value is the right union | |
2026 // field. This is an array of nested element_value. | |
2027 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
|
2028 annotations_typeArray->adr_at(byte_i_ref)); |
0 | 2029 byte_i_ref += 2; |
2030 RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("num_values=%d", num_values)); | |
2031 | |
2032 int calc_num_values = 0; | |
2033 for (; calc_num_values < num_values; calc_num_values++) { | |
2034 if (!rewrite_cp_refs_in_element_value( | |
2035 annotations_typeArray, byte_i_ref, THREAD)) { | |
2036 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2037 ("bad nested element_value at %d", calc_num_values)); | |
605 | 2038 // propagate failure back to caller |
0 | 2039 return false; |
2040 } | |
2041 } | |
2042 assert(num_values == calc_num_values, "sanity check"); | |
2043 } break; | |
2044 | |
2045 default: | |
2046 RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("bad tag=0x%x", tag)); | |
2047 return false; | |
2048 } // end decode tag field | |
2049 | |
2050 return true; | |
2051 } // end rewrite_cp_refs_in_element_value() | |
2052 | |
2053 | |
2054 // Rewrite constant pool references in a fields_annotations field. | |
2055 bool VM_RedefineClasses::rewrite_cp_refs_in_fields_annotations( | |
2056 instanceKlassHandle scratch_class, TRAPS) { | |
2057 | |
8031 | 2058 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
|
2059 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2060 if (fields_annotations == NULL || fields_annotations->length() == 0) { |
0 | 2061 // no fields_annotations so nothing to do |
2062 return true; | |
2063 } | |
2064 | |
2065 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2066 ("fields_annotations length=%d", fields_annotations->length())); | |
2067 | |
2068 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
|
2069 AnnotationArray* field_annotations = fields_annotations->at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2070 if (field_annotations == NULL || field_annotations->length() == 0) { |
0 | 2071 // this field does not have any annotations so skip it |
2072 continue; | |
2073 } | |
2074 | |
2075 int byte_i = 0; // byte index into field_annotations | |
2076 if (!rewrite_cp_refs_in_annotations_typeArray(field_annotations, byte_i, | |
2077 THREAD)) { | |
2078 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2079 ("bad field_annotations at %d", i)); | |
605 | 2080 // propagate failure back to caller |
0 | 2081 return false; |
2082 } | |
2083 } | |
2084 | |
2085 return true; | |
2086 } // end rewrite_cp_refs_in_fields_annotations() | |
2087 | |
2088 | |
2089 // Rewrite constant pool references in a methods_annotations field. | |
2090 bool VM_RedefineClasses::rewrite_cp_refs_in_methods_annotations( | |
2091 instanceKlassHandle scratch_class, TRAPS) { | |
2092 | |
8031 | 2093 for (int i = 0; i < scratch_class->methods()->length(); i++) { |
2094 Method* m = scratch_class->methods()->at(i); | |
2095 AnnotationArray* method_annotations = m->constMethod()->method_annotations(); | |
2096 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2097 if (method_annotations == NULL || method_annotations->length() == 0) { |
0 | 2098 // this method does not have any annotations so skip it |
2099 continue; | |
2100 } | |
2101 | |
2102 int byte_i = 0; // byte index into method_annotations | |
2103 if (!rewrite_cp_refs_in_annotations_typeArray(method_annotations, byte_i, | |
2104 THREAD)) { | |
2105 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2106 ("bad method_annotations at %d", i)); | |
605 | 2107 // propagate failure back to caller |
0 | 2108 return false; |
2109 } | |
2110 } | |
2111 | |
2112 return true; | |
2113 } // end rewrite_cp_refs_in_methods_annotations() | |
2114 | |
2115 | |
2116 // Rewrite constant pool references in a methods_parameter_annotations | |
2117 // field. This "structure" is adapted from the | |
2118 // RuntimeVisibleParameterAnnotations_attribute described in section | |
2119 // 4.8.17 of the 2nd-edition of the VM spec: | |
2120 // | |
2121 // methods_parameter_annotations_typeArray { | |
2122 // u1 num_parameters; | |
2123 // { | |
2124 // u2 num_annotations; | |
2125 // annotation annotations[num_annotations]; | |
2126 // } parameter_annotations[num_parameters]; | |
2127 // } | |
2128 // | |
2129 bool VM_RedefineClasses::rewrite_cp_refs_in_methods_parameter_annotations( | |
2130 instanceKlassHandle scratch_class, TRAPS) { | |
2131 | |
8031 | 2132 for (int i = 0; i < scratch_class->methods()->length(); i++) { |
2133 Method* m = scratch_class->methods()->at(i); | |
2134 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
|
2135 if (method_parameter_annotations == NULL |
0 | 2136 || method_parameter_annotations->length() == 0) { |
2137 // this method does not have any parameter annotations so skip it | |
2138 continue; | |
2139 } | |
2140 | |
2141 if (method_parameter_annotations->length() < 1) { | |
2142 // not enough room for a num_parameters field | |
2143 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2144 ("length() is too small for a num_parameters field at %d", i)); | |
2145 return false; | |
2146 } | |
2147 | |
2148 int byte_i = 0; // byte index into method_parameter_annotations | |
2149 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2150 u1 num_parameters = method_parameter_annotations->at(byte_i); |
0 | 2151 byte_i++; |
2152 | |
2153 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2154 ("num_parameters=%d", num_parameters)); | |
2155 | |
2156 int calc_num_parameters = 0; | |
2157 for (; calc_num_parameters < num_parameters; calc_num_parameters++) { | |
2158 if (!rewrite_cp_refs_in_annotations_typeArray( | |
2159 method_parameter_annotations, byte_i, THREAD)) { | |
2160 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2161 ("bad method_parameter_annotations at %d", calc_num_parameters)); | |
605 | 2162 // propagate failure back to caller |
0 | 2163 return false; |
2164 } | |
2165 } | |
2166 assert(num_parameters == calc_num_parameters, "sanity check"); | |
2167 } | |
2168 | |
2169 return true; | |
2170 } // end rewrite_cp_refs_in_methods_parameter_annotations() | |
2171 | |
2172 | |
2173 // Rewrite constant pool references in a methods_default_annotations | |
2174 // field. This "structure" is adapted from the AnnotationDefault_attribute | |
2175 // that is described in section 4.8.19 of the 2nd-edition of the VM spec: | |
2176 // | |
2177 // methods_default_annotations_typeArray { | |
2178 // element_value default_value; | |
2179 // } | |
2180 // | |
2181 bool VM_RedefineClasses::rewrite_cp_refs_in_methods_default_annotations( | |
2182 instanceKlassHandle scratch_class, TRAPS) { | |
2183 | |
8031 | 2184 for (int i = 0; i < scratch_class->methods()->length(); i++) { |
2185 Method* m = scratch_class->methods()->at(i); | |
2186 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
|
2187 if (method_default_annotations == NULL |
0 | 2188 || method_default_annotations->length() == 0) { |
2189 // this method does not have any default annotations so skip it | |
2190 continue; | |
2191 } | |
2192 | |
2193 int byte_i = 0; // byte index into method_default_annotations | |
2194 | |
2195 if (!rewrite_cp_refs_in_element_value( | |
2196 method_default_annotations, byte_i, THREAD)) { | |
2197 RC_TRACE_WITH_THREAD(0x02000000, THREAD, | |
2198 ("bad default element_value at %d", i)); | |
605 | 2199 // propagate failure back to caller |
0 | 2200 return false; |
2201 } | |
2202 } | |
2203 | |
2204 return true; | |
2205 } // end rewrite_cp_refs_in_methods_default_annotations() | |
2206 | |
2207 | |
2208 // Rewrite constant pool references in the method's stackmap table. | |
2209 // These "structures" are adapted from the StackMapTable_attribute that | |
2210 // is described in section 4.8.4 of the 6.0 version of the VM spec | |
2211 // (dated 2005.10.26): | |
2212 // file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf | |
2213 // | |
2214 // stack_map { | |
2215 // u2 number_of_entries; | |
2216 // stack_map_frame entries[number_of_entries]; | |
2217 // } | |
2218 // | |
2219 void VM_RedefineClasses::rewrite_cp_refs_in_stack_map_table( | |
2220 methodHandle method, TRAPS) { | |
2221 | |
2222 if (!method->has_stackmap_table()) { | |
2223 return; | |
2224 } | |
2225 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2226 AnnotationArray* stackmap_data = method->stackmap_data(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2227 address stackmap_p = (address)stackmap_data->adr_at(0); |
0 | 2228 address stackmap_end = stackmap_p + stackmap_data->length(); |
2229 | |
2230 assert(stackmap_p + 2 <= stackmap_end, "no room for number_of_entries"); | |
2231 u2 number_of_entries = Bytes::get_Java_u2(stackmap_p); | |
2232 stackmap_p += 2; | |
2233 | |
2234 RC_TRACE_WITH_THREAD(0x04000000, THREAD, | |
2235 ("number_of_entries=%u", number_of_entries)); | |
2236 | |
2237 // walk through each stack_map_frame | |
2238 u2 calc_number_of_entries = 0; | |
2239 for (; calc_number_of_entries < number_of_entries; calc_number_of_entries++) { | |
2240 // The stack_map_frame structure is a u1 frame_type followed by | |
2241 // 0 or more bytes of data: | |
2242 // | |
2243 // union stack_map_frame { | |
2244 // same_frame; | |
2245 // same_locals_1_stack_item_frame; | |
2246 // same_locals_1_stack_item_frame_extended; | |
2247 // chop_frame; | |
2248 // same_frame_extended; | |
2249 // append_frame; | |
2250 // full_frame; | |
2251 // } | |
2252 | |
2253 assert(stackmap_p + 1 <= stackmap_end, "no room for frame_type"); | |
2254 // The Linux compiler does not like frame_type to be u1 or u2. It | |
2255 // issues the following warning for the first if-statement below: | |
2256 // | |
2257 // "warning: comparison is always true due to limited range of data type" | |
2258 // | |
2259 u4 frame_type = *stackmap_p; | |
2260 stackmap_p++; | |
2261 | |
2262 // same_frame { | |
2263 // u1 frame_type = SAME; /* 0-63 */ | |
2264 // } | |
2265 if (frame_type >= 0 && frame_type <= 63) { | |
2266 // nothing more to do for same_frame | |
2267 } | |
2268 | |
2269 // same_locals_1_stack_item_frame { | |
2270 // u1 frame_type = SAME_LOCALS_1_STACK_ITEM; /* 64-127 */ | |
2271 // verification_type_info stack[1]; | |
2272 // } | |
2273 else if (frame_type >= 64 && frame_type <= 127) { | |
2274 rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, | |
2275 calc_number_of_entries, frame_type, THREAD); | |
2276 } | |
2277 | |
2278 // reserved for future use | |
2279 else if (frame_type >= 128 && frame_type <= 246) { | |
2280 // nothing more to do for reserved frame_types | |
2281 } | |
2282 | |
2283 // same_locals_1_stack_item_frame_extended { | |
2284 // u1 frame_type = SAME_LOCALS_1_STACK_ITEM_EXTENDED; /* 247 */ | |
2285 // u2 offset_delta; | |
2286 // verification_type_info stack[1]; | |
2287 // } | |
2288 else if (frame_type == 247) { | |
2289 stackmap_p += 2; | |
2290 rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, | |
2291 calc_number_of_entries, frame_type, THREAD); | |
2292 } | |
2293 | |
2294 // chop_frame { | |
2295 // u1 frame_type = CHOP; /* 248-250 */ | |
2296 // u2 offset_delta; | |
2297 // } | |
2298 else if (frame_type >= 248 && frame_type <= 250) { | |
2299 stackmap_p += 2; | |
2300 } | |
2301 | |
2302 // same_frame_extended { | |
2303 // u1 frame_type = SAME_FRAME_EXTENDED; /* 251*/ | |
2304 // u2 offset_delta; | |
2305 // } | |
2306 else if (frame_type == 251) { | |
2307 stackmap_p += 2; | |
2308 } | |
2309 | |
2310 // append_frame { | |
2311 // u1 frame_type = APPEND; /* 252-254 */ | |
2312 // u2 offset_delta; | |
2313 // verification_type_info locals[frame_type - 251]; | |
2314 // } | |
2315 else if (frame_type >= 252 && frame_type <= 254) { | |
2316 assert(stackmap_p + 2 <= stackmap_end, | |
2317 "no room for offset_delta"); | |
2318 stackmap_p += 2; | |
2319 u1 len = frame_type - 251; | |
2320 for (u1 i = 0; i < len; i++) { | |
2321 rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, | |
2322 calc_number_of_entries, frame_type, THREAD); | |
2323 } | |
2324 } | |
2325 | |
2326 // full_frame { | |
2327 // u1 frame_type = FULL_FRAME; /* 255 */ | |
2328 // u2 offset_delta; | |
2329 // u2 number_of_locals; | |
2330 // verification_type_info locals[number_of_locals]; | |
2331 // u2 number_of_stack_items; | |
2332 // verification_type_info stack[number_of_stack_items]; | |
2333 // } | |
2334 else if (frame_type == 255) { | |
2335 assert(stackmap_p + 2 + 2 <= stackmap_end, | |
2336 "no room for smallest full_frame"); | |
2337 stackmap_p += 2; | |
2338 | |
2339 u2 number_of_locals = Bytes::get_Java_u2(stackmap_p); | |
2340 stackmap_p += 2; | |
2341 | |
2342 for (u2 locals_i = 0; locals_i < number_of_locals; locals_i++) { | |
2343 rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, | |
2344 calc_number_of_entries, frame_type, THREAD); | |
2345 } | |
2346 | |
2347 // Use the largest size for the number_of_stack_items, but only get | |
2348 // the right number of bytes. | |
2349 u2 number_of_stack_items = Bytes::get_Java_u2(stackmap_p); | |
2350 stackmap_p += 2; | |
2351 | |
2352 for (u2 stack_i = 0; stack_i < number_of_stack_items; stack_i++) { | |
2353 rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, | |
2354 calc_number_of_entries, frame_type, THREAD); | |
2355 } | |
2356 } | |
2357 } // end while there is a stack_map_frame | |
2358 assert(number_of_entries == calc_number_of_entries, "sanity check"); | |
2359 } // end rewrite_cp_refs_in_stack_map_table() | |
2360 | |
2361 | |
2362 // Rewrite constant pool references in the verification type info | |
2363 // portion of the method's stackmap table. These "structures" are | |
2364 // adapted from the StackMapTable_attribute that is described in | |
2365 // section 4.8.4 of the 6.0 version of the VM spec (dated 2005.10.26): | |
2366 // file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf | |
2367 // | |
2368 // The verification_type_info structure is a u1 tag followed by 0 or | |
2369 // more bytes of data: | |
2370 // | |
2371 // union verification_type_info { | |
2372 // Top_variable_info; | |
2373 // Integer_variable_info; | |
2374 // Float_variable_info; | |
2375 // Long_variable_info; | |
2376 // Double_variable_info; | |
2377 // Null_variable_info; | |
2378 // UninitializedThis_variable_info; | |
2379 // Object_variable_info; | |
2380 // Uninitialized_variable_info; | |
2381 // } | |
2382 // | |
2383 void VM_RedefineClasses::rewrite_cp_refs_in_verification_type_info( | |
2384 address& stackmap_p_ref, address stackmap_end, u2 frame_i, | |
2385 u1 frame_type, TRAPS) { | |
2386 | |
2387 assert(stackmap_p_ref + 1 <= stackmap_end, "no room for tag"); | |
2388 u1 tag = *stackmap_p_ref; | |
2389 stackmap_p_ref++; | |
2390 | |
2391 switch (tag) { | |
2392 // Top_variable_info { | |
2393 // u1 tag = ITEM_Top; /* 0 */ | |
2394 // } | |
2395 // verificationType.hpp has zero as ITEM_Bogus instead of ITEM_Top | |
2396 case 0: // fall through | |
2397 | |
2398 // Integer_variable_info { | |
2399 // u1 tag = ITEM_Integer; /* 1 */ | |
2400 // } | |
2401 case ITEM_Integer: // fall through | |
2402 | |
2403 // Float_variable_info { | |
2404 // u1 tag = ITEM_Float; /* 2 */ | |
2405 // } | |
2406 case ITEM_Float: // fall through | |
2407 | |
2408 // Double_variable_info { | |
2409 // u1 tag = ITEM_Double; /* 3 */ | |
2410 // } | |
2411 case ITEM_Double: // fall through | |
2412 | |
2413 // Long_variable_info { | |
2414 // u1 tag = ITEM_Long; /* 4 */ | |
2415 // } | |
2416 case ITEM_Long: // fall through | |
2417 | |
2418 // Null_variable_info { | |
2419 // u1 tag = ITEM_Null; /* 5 */ | |
2420 // } | |
2421 case ITEM_Null: // fall through | |
2422 | |
2423 // UninitializedThis_variable_info { | |
2424 // u1 tag = ITEM_UninitializedThis; /* 6 */ | |
2425 // } | |
2426 case ITEM_UninitializedThis: | |
2427 // nothing more to do for the above tag types | |
2428 break; | |
2429 | |
2430 // Object_variable_info { | |
2431 // u1 tag = ITEM_Object; /* 7 */ | |
2432 // u2 cpool_index; | |
2433 // } | |
2434 case ITEM_Object: | |
2435 { | |
2436 assert(stackmap_p_ref + 2 <= stackmap_end, "no room for cpool_index"); | |
2437 u2 cpool_index = Bytes::get_Java_u2(stackmap_p_ref); | |
2438 u2 new_cp_index = find_new_index(cpool_index); | |
2439 if (new_cp_index != 0) { | |
2440 RC_TRACE_WITH_THREAD(0x04000000, THREAD, | |
2441 ("mapped old cpool_index=%d", cpool_index)); | |
2442 Bytes::put_Java_u2(stackmap_p_ref, new_cp_index); | |
2443 cpool_index = new_cp_index; | |
2444 } | |
2445 stackmap_p_ref += 2; | |
2446 | |
2447 RC_TRACE_WITH_THREAD(0x04000000, THREAD, | |
2448 ("frame_i=%u, frame_type=%u, cpool_index=%d", frame_i, | |
2449 frame_type, cpool_index)); | |
2450 } break; | |
2451 | |
2452 // Uninitialized_variable_info { | |
2453 // u1 tag = ITEM_Uninitialized; /* 8 */ | |
2454 // u2 offset; | |
2455 // } | |
2456 case ITEM_Uninitialized: | |
2457 assert(stackmap_p_ref + 2 <= stackmap_end, "no room for offset"); | |
2458 stackmap_p_ref += 2; | |
2459 break; | |
2460 | |
2461 default: | |
2462 RC_TRACE_WITH_THREAD(0x04000000, THREAD, | |
2463 ("frame_i=%u, frame_type=%u, bad tag=0x%x", frame_i, frame_type, tag)); | |
2464 ShouldNotReachHere(); | |
2465 break; | |
2466 } // end switch (tag) | |
2467 } // end rewrite_cp_refs_in_verification_type_info() | |
2468 | |
2469 | |
2470 // Change the constant pool associated with klass scratch_class to | |
2471 // scratch_cp. If shrink is true, then scratch_cp_length elements | |
2472 // are copied from scratch_cp to a smaller constant pool and the | |
2473 // smaller constant pool is associated with scratch_class. | |
2474 void VM_RedefineClasses::set_new_constant_pool( | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2475 ClassLoaderData* loader_data, |
0 | 2476 instanceKlassHandle scratch_class, constantPoolHandle scratch_cp, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2477 int scratch_cp_length, TRAPS) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2478 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
|
2479 |
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2480 // 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
|
2481 // worst case merge situation. We want to associate the minimum |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2482 // sized constant pool with the klass to save space. |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2483 constantPoolHandle smaller_cp(THREAD, |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2484 ConstantPool::allocate(loader_data, scratch_cp_length, THREAD)); |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2485 |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2486 // preserve version() value in the smaller copy |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2487 int version = scratch_cp->version(); |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2488 assert(version != 0, "sanity check"); |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2489 smaller_cp->set_version(version); |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2490 |
7952
edd76a5856f7
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
7949
diff
changeset
|
2491 // 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
|
2492 // 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
|
2493 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
|
2494 |
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2495 scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD); |
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7459
diff
changeset
|
2496 scratch_cp = smaller_cp; |
0 | 2497 |
2498 // attach new constant pool to klass | |
2499 scratch_class->set_constants(scratch_cp()); | |
2500 | |
2501 int i; // for portability | |
2502 | |
2503 // update each field in klass to use new constant pool indices as needed | |
3938 | 2504 for (JavaFieldStream fs(scratch_class); !fs.done(); fs.next()) { |
2505 jshort cur_index = fs.name_index(); | |
0 | 2506 jshort new_index = find_new_index(cur_index); |
2507 if (new_index != 0) { | |
2508 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2509 ("field-name_index change: %d to %d", cur_index, new_index)); | |
3938 | 2510 fs.set_name_index(new_index); |
0 | 2511 } |
3938 | 2512 cur_index = fs.signature_index(); |
0 | 2513 new_index = find_new_index(cur_index); |
2514 if (new_index != 0) { | |
2515 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2516 ("field-signature_index change: %d to %d", cur_index, new_index)); | |
3938 | 2517 fs.set_signature_index(new_index); |
0 | 2518 } |
3938 | 2519 cur_index = fs.initval_index(); |
0 | 2520 new_index = find_new_index(cur_index); |
2521 if (new_index != 0) { | |
2522 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2523 ("field-initval_index change: %d to %d", cur_index, new_index)); | |
3938 | 2524 fs.set_initval_index(new_index); |
0 | 2525 } |
3938 | 2526 cur_index = fs.generic_signature_index(); |
0 | 2527 new_index = find_new_index(cur_index); |
2528 if (new_index != 0) { | |
2529 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2530 ("field-generic_signature change: %d to %d", cur_index, new_index)); | |
3938 | 2531 fs.set_generic_signature_index(new_index); |
0 | 2532 } |
2533 } // end for each field | |
2534 | |
2535 // Update constant pool indices in the inner classes info to use | |
2536 // new constant indices as needed. The inner classes info is a | |
2537 // quadruple: | |
2538 // (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
|
2539 InnerClassesIterator iter(scratch_class); |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2540 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
|
2541 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
|
2542 if (cur_index == 0) { |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2543 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
|
2544 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2545 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
|
2546 if (new_index != 0) { |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2547 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
|
2548 ("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
|
2549 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
|
2550 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2551 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
|
2552 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
|
2553 if (new_index != 0) { |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2554 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
|
2555 ("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
|
2556 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
|
2557 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2558 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
|
2559 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
|
2560 if (new_index != 0) { |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2561 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
|
2562 ("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
|
2563 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
|
2564 } |
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4731
diff
changeset
|
2565 } // end for each inner class |
0 | 2566 |
2567 // Attach each method in klass to the new constant pool and update | |
2568 // 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
|
2569 Array<Method*>* methods = scratch_class->methods(); |
0 | 2570 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
|
2571 methodHandle method(THREAD, methods->at(i)); |
0 | 2572 method->set_constants(scratch_cp()); |
2573 | |
2574 int new_index = find_new_index(method->name_index()); | |
2575 if (new_index != 0) { | |
2576 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2577 ("method-name_index change: %d to %d", method->name_index(), | |
2578 new_index)); | |
2579 method->set_name_index(new_index); | |
2580 } | |
2581 new_index = find_new_index(method->signature_index()); | |
2582 if (new_index != 0) { | |
2583 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2584 ("method-signature_index change: %d to %d", | |
2585 method->signature_index(), new_index)); | |
2586 method->set_signature_index(new_index); | |
2587 } | |
2588 new_index = find_new_index(method->generic_signature_index()); | |
2589 if (new_index != 0) { | |
2590 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2591 ("method-generic_signature_index change: %d to %d", | |
2592 method->generic_signature_index(), new_index)); | |
2593 method->set_generic_signature_index(new_index); | |
2594 } | |
2595 | |
2596 // Update constant pool indices in the method's checked exception | |
2597 // table to use new constant indices as needed. | |
2598 int cext_length = method->checked_exceptions_length(); | |
2599 if (cext_length > 0) { | |
2600 CheckedExceptionElement * cext_table = | |
2601 method->checked_exceptions_start(); | |
2602 for (int j = 0; j < cext_length; j++) { | |
2603 int cur_index = cext_table[j].class_cp_index; | |
2604 int new_index = find_new_index(cur_index); | |
2605 if (new_index != 0) { | |
2606 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2607 ("cext-class_cp_index change: %d to %d", cur_index, new_index)); | |
2608 cext_table[j].class_cp_index = (u2)new_index; | |
2609 } | |
2610 } // end for each checked exception table entry | |
2611 } // end if there are checked exception table entries | |
2612 | |
2613 // Update each catch type index in the method's exception table | |
2614 // to use new constant pool indices as needed. The exception table | |
2615 // holds quadruple entries of the form: | |
2616 // (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
|
2617 |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
5967
diff
changeset
|
2618 ExceptionTable ex_table(method()); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
5967
diff
changeset
|
2619 int ext_length = ex_table.length(); |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
5967
diff
changeset
|
2620 |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
5967
diff
changeset
|
2621 for (int j = 0; j < ext_length; j ++) { |
8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
5967
diff
changeset
|
2622 int cur_index = ex_table.catch_type_index(j); |
0 | 2623 int new_index = find_new_index(cur_index); |
2624 if (new_index != 0) { | |
2625 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2626 ("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
|
2627 ex_table.set_catch_type_index(j, new_index); |
0 | 2628 } |
2629 } // end for each exception table entry | |
2630 | |
2631 // Update constant pool indices in the method's local variable | |
2632 // table to use new constant indices as needed. The local variable | |
2633 // table hold sextuple entries of the form: | |
2634 // (start_pc, length, name_index, descriptor_index, signature_index, slot) | |
2635 int lvt_length = method->localvariable_table_length(); | |
2636 if (lvt_length > 0) { | |
2637 LocalVariableTableElement * lv_table = | |
2638 method->localvariable_table_start(); | |
2639 for (int j = 0; j < lvt_length; j++) { | |
2640 int cur_index = lv_table[j].name_cp_index; | |
2641 int new_index = find_new_index(cur_index); | |
2642 if (new_index != 0) { | |
2643 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2644 ("lvt-name_cp_index change: %d to %d", cur_index, new_index)); | |
2645 lv_table[j].name_cp_index = (u2)new_index; | |
2646 } | |
2647 cur_index = lv_table[j].descriptor_cp_index; | |
2648 new_index = find_new_index(cur_index); | |
2649 if (new_index != 0) { | |
2650 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2651 ("lvt-descriptor_cp_index change: %d to %d", cur_index, | |
2652 new_index)); | |
2653 lv_table[j].descriptor_cp_index = (u2)new_index; | |
2654 } | |
2655 cur_index = lv_table[j].signature_cp_index; | |
2656 new_index = find_new_index(cur_index); | |
2657 if (new_index != 0) { | |
2658 RC_TRACE_WITH_THREAD(0x00080000, THREAD, | |
2659 ("lvt-signature_cp_index change: %d to %d", cur_index, new_index)); | |
2660 lv_table[j].signature_cp_index = (u2)new_index; | |
2661 } | |
2662 } // end for each local variable table entry | |
2663 } // end if there are local variable table entries | |
2664 | |
2665 rewrite_cp_refs_in_stack_map_table(method, THREAD); | |
2666 } // end for each method | |
2667 } // end set_new_constant_pool() | |
2668 | |
2669 | |
2670 // Unevolving classes may point to methods of the_class directly | |
2671 // 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
|
2672 // use the ClassLoaderDataGraph::classes_do() facility and this helper |
0 | 2673 // to fix up these pointers. |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2674 |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2675 // Adjust cpools and vtables closure |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2676 void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) { |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2677 |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2678 // 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
|
2679 // printed out. |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2680 bool trace_name_printed = false; |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2681 |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2682 // 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
|
2683 // that a specific class gets found by this routine. |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2684 // RC_TRACE macro has an embedded ResourceMark |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2685 // RC_TRACE_WITH_THREAD(0x00100000, THREAD, |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2686 // ("adjust check: name=%s", k->external_name())); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2687 // trace_name_printed = true; |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2688 |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2689 // 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
|
2690 // array class vtables also |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2691 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
|
2692 k->vtable()->adjust_method_entries(_matching_old_methods, |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2693 _matching_new_methods, |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2694 _matching_methods_length, |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2695 &trace_name_printed); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2696 } else if (k->oop_is_instance()) { |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2697 HandleMark hm(_thread); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2698 InstanceKlass *ik = InstanceKlass::cast(k); |
0 | 2699 |
2700 // HotSpot specific optimization! HotSpot does not currently | |
2701 // support delegation from the bootstrap class loader to a | |
2702 // user-defined class loader. This means that if the bootstrap | |
2703 // class loader is the initiating class loader, then it will also | |
2704 // be the defining class loader. This also means that classes | |
2705 // loaded by the bootstrap class loader cannot refer to classes | |
2706 // loaded by a user-defined class loader. Note: a user-defined | |
2707 // class loader can delegate to the bootstrap class loader. | |
2708 // | |
2709 // If the current class being redefined has a user-defined class | |
2710 // loader as its defining class loader, then we can skip all | |
2711 // classes loaded by the bootstrap class loader. | |
2712 bool is_user_defined = | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2713 InstanceKlass::cast(_the_class_oop)->class_loader() != NULL; |
0 | 2714 if (is_user_defined && ik->class_loader() == NULL) { |
2715 return; | |
2716 } | |
2717 | |
2718 // Fix the vtable embedded in the_class and subclasses of the_class, | |
2719 // 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
|
2720 // 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
|
2721 // 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
|
2722 // holds the Method*s for virtual (but not final) methods. |
0 | 2723 if (ik->vtable_length() > 0 && ik->is_subtype_of(_the_class_oop)) { |
2724 // 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
|
2725 ResourceMark rm(_thread); |
0 | 2726 ik->vtable()->adjust_method_entries(_matching_old_methods, |
2727 _matching_new_methods, | |
2728 _matching_methods_length, | |
2729 &trace_name_printed); | |
2730 } | |
2731 | |
2732 // If the current class has an itable and we are either redefining an | |
2733 // interface or if the current class is a subclass of the_class, then | |
2734 // we potentially have to fix the itable. If we are redefining an | |
2735 // 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
|
2736 // 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
|
2737 // subclass relationship between an interface and an InstanceKlass. |
6983 | 2738 if (ik->itable_length() > 0 && (_the_class_oop->is_interface() |
0 | 2739 || ik->is_subclass_of(_the_class_oop))) { |
2740 // 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
|
2741 ResourceMark rm(_thread); |
0 | 2742 ik->itable()->adjust_method_entries(_matching_old_methods, |
2743 _matching_new_methods, | |
2744 _matching_methods_length, | |
2745 &trace_name_printed); | |
2746 } | |
2747 | |
2748 // The constant pools in other classes (other_cp) can refer to | |
2749 // methods in the_class. We have to update method information in | |
2750 // other_cp's cache. If other_cp has a previous version, then we | |
2751 // 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
|
2752 // constant pool cache holds the Method*s for non-virtual |
0 | 2753 // methods and for virtual, final methods. |
2754 // | |
2755 // Special case: if the current class is the_class, then new_cp | |
2756 // has already been attached to the_class and old_cp has already | |
2757 // been added as a previous version. The new_cp doesn't have any | |
2758 // cached references to old methods so it doesn't need to be | |
2759 // updated. We can simply start with the previous version(s) in | |
2760 // that case. | |
2761 constantPoolHandle other_cp; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2762 ConstantPoolCache* cp_cache; |
0 | 2763 |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2764 if (ik != _the_class_oop) { |
0 | 2765 // this klass' constant pool cache may need adjustment |
2766 other_cp = constantPoolHandle(ik->constants()); | |
2767 cp_cache = other_cp->cache(); | |
2768 if (cp_cache != NULL) { | |
2769 cp_cache->adjust_method_entries(_matching_old_methods, | |
2770 _matching_new_methods, | |
2771 _matching_methods_length, | |
2772 &trace_name_printed); | |
2773 } | |
2774 } | |
2775 { | |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
2776 ResourceMark rm(_thread); |
0 | 2777 // PreviousVersionInfo objects returned via PreviousVersionWalker |
2778 // contain a GrowableArray of handles. We have to clean up the | |
2779 // GrowableArray _after_ the PreviousVersionWalker destructor | |
2780 // has destroyed the handles. | |
2781 { | |
2782 // the previous versions' constant pool caches may need adjustment | |
2783 PreviousVersionWalker pvw(ik); | |
2784 for (PreviousVersionInfo * pv_info = pvw.next_previous_version(); | |
2785 pv_info != NULL; pv_info = pvw.next_previous_version()) { | |
2786 other_cp = pv_info->prev_constant_pool_handle(); | |
2787 cp_cache = other_cp->cache(); | |
2788 if (cp_cache != NULL) { | |
2789 cp_cache->adjust_method_entries(_matching_old_methods, | |
2790 _matching_new_methods, | |
2791 _matching_methods_length, | |
2792 &trace_name_printed); | |
2793 } | |
2794 } | |
2795 } // pvw is cleaned up | |
2796 } // rm is cleaned up | |
2797 } | |
2798 } | |
2799 | |
2800 void VM_RedefineClasses::update_jmethod_ids() { | |
2801 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
|
2802 Method* old_method = _matching_old_methods[j]; |
0 | 2803 jmethodID jmid = old_method->find_jmethod_id_or_null(); |
2804 if (jmid != NULL) { | |
2805 // There is a jmethodID, change it to point to the new method | |
2806 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
|
2807 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
|
2808 assert(Method::resolve_jmethod_id(jmid) == _matching_new_methods[j], |
0 | 2809 "should be replaced"); |
2810 } | |
2811 } | |
2812 } | |
2813 | |
2814 void VM_RedefineClasses::check_methods_and_mark_as_obsolete( | |
2815 BitMap *emcp_methods, int * emcp_method_count_p) { | |
2816 *emcp_method_count_p = 0; | |
2817 int obsolete_count = 0; | |
2818 int old_index = 0; | |
2819 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
|
2820 Method* old_method = _matching_old_methods[j]; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2821 Method* new_method = _matching_new_methods[j]; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2822 Method* old_array_method; |
0 | 2823 |
2824 // Maintain an old_index into the _old_methods array by skipping | |
2825 // deleted methods | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2826 while ((old_array_method = _old_methods->at(old_index)) != old_method) { |
0 | 2827 ++old_index; |
2828 } | |
2829 | |
2830 if (MethodComparator::methods_EMCP(old_method, new_method)) { | |
2831 // The EMCP definition from JSR-163 requires the bytecodes to be | |
2832 // the same with the exception of constant pool indices which may | |
2833 // differ. However, the constants referred to by those indices | |
2834 // must be the same. | |
2835 // | |
2836 // We use methods_EMCP() for comparison since constant pool | |
2837 // merging can remove duplicate constant pool entries that were | |
2838 // present in the old method and removed from the rewritten new | |
2839 // method. A faster binary comparison function would consider the | |
2840 // old and new methods to be different when they are actually | |
2841 // EMCP. | |
2842 // | |
2843 // The old and new methods are EMCP and you would think that we | |
2844 // could get rid of one of them here and now and save some space. | |
2845 // However, the concept of EMCP only considers the bytecodes and | |
2846 // the constant pool entries in the comparison. Other things, | |
2847 // e.g., the line number table (LNT) or the local variable table | |
2848 // (LVT) don't count in the comparison. So the new (and EMCP) | |
2849 // method can have a new LNT that we need so we can't just | |
2850 // overwrite the new method with the old method. | |
2851 // | |
2852 // When this routine is called, we have already attached the new | |
2853 // methods to the_class so the old methods are effectively | |
2854 // overwritten. However, if an old method is still executing, | |
2855 // then the old method cannot be collected until sometime after | |
2856 // the old method call has returned. So the overwriting of old | |
2857 // methods by new methods will save us space except for those | |
2858 // (hopefully few) old methods that are still executing. | |
2859 // | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2860 // 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
|
2861 // possible avenue to space savings. The ConstMethod* in the |
0 | 2862 // new method contains possibly new attributes (LNT, LVT, etc). |
2863 // 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
|
2864 // the ConstMethod* in the old method with the ConstMethod* |
0 | 2865 // 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
|
2866 // 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
|
2867 // the old ConstMethod*. However, the ConstMethod* contains |
0 | 2868 // 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
|
2869 // ConstMethod* between two methods could lead to confusion in |
0 | 2870 // the code that uses the back reference. This would lead to |
2871 // brittle code that could be broken in non-obvious ways now or | |
2872 // in the future. | |
2873 // | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2874 // Another possibility is to copy the ConstMethod* from the new |
0 | 2875 // 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
|
2876 // the old method. Since the ConstMethod* contains the bytecodes |
0 | 2877 // for the method embedded in the oop, this option would change |
2878 // the bytecodes out from under any threads executing the old | |
2879 // method and make the thread's bcp invalid. Since EMCP requires | |
2880 // that the bytecodes be the same modulo constant pool indices, it | |
2881 // 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
|
2882 // ConstMethod* from the old bcp in the old ConstMethod*. The |
0 | 2883 // time consuming part would be searching all the frames in all |
2884 // of the threads to find all of the calls to the old method. | |
2885 // | |
2886 // It looks like we will have to live with the limited savings | |
2887 // that we get from effectively overwriting the old methods | |
2888 // when the new methods are attached to the_class. | |
2889 | |
2890 // track which methods are EMCP for add_previous_version() call | |
2891 emcp_methods->set_bit(old_index); | |
2892 (*emcp_method_count_p)++; | |
2893 | |
2894 // An EMCP method is _not_ obsolete. An obsolete method has a | |
2895 // different jmethodID than the current method. An EMCP method | |
2896 // has the same jmethodID as the current method. Having the | |
2897 // same jmethodID for all EMCP versions of a method allows for | |
2898 // a consistent view of the EMCP methods regardless of which | |
2899 // EMCP method you happen to have in hand. For example, a | |
2900 // breakpoint set in one EMCP method will work for all EMCP | |
2901 // versions of the method including the current one. | |
2902 } else { | |
2903 // mark obsolete methods as such | |
2904 old_method->set_is_obsolete(); | |
2905 obsolete_count++; | |
2906 | |
2907 // obsolete methods need a unique idnum | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
2908 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
|
2909 if (num != ConstMethod::UNSET_IDNUM) { |
0 | 2910 // u2 old_num = old_method->method_idnum(); |
2911 old_method->set_method_idnum(num); | |
2912 // TO DO: attach obsolete annotations to obsolete method's new idnum | |
2913 } | |
2914 // With tracing we try not to "yack" too much. The position of | |
2915 // this trace assumes there are fewer obsolete methods than | |
2916 // EMCP methods. | |
2917 RC_TRACE(0x00000100, ("mark %s(%s) as obsolete", | |
2918 old_method->name()->as_C_string(), | |
2919 old_method->signature()->as_C_string())); | |
2920 } | |
2921 old_method->set_is_old(); | |
2922 } | |
2923 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
|
2924 Method* old_method = _deleted_methods[i]; |
0 | 2925 |
2926 assert(old_method->vtable_index() < 0, | |
2927 "cannot delete methods with vtable entries");; | |
2928 | |
2929 // Mark all deleted methods as old and obsolete | |
2930 old_method->set_is_old(); | |
2931 old_method->set_is_obsolete(); | |
2932 ++obsolete_count; | |
2933 // With tracing we try not to "yack" too much. The position of | |
2934 // this trace assumes there are fewer obsolete methods than | |
2935 // EMCP methods. | |
2936 RC_TRACE(0x00000100, ("mark deleted %s(%s) as obsolete", | |
2937 old_method->name()->as_C_string(), | |
2938 old_method->signature()->as_C_string())); | |
2939 } | |
2940 assert((*emcp_method_count_p + obsolete_count) == _old_methods->length(), | |
2941 "sanity check"); | |
2942 RC_TRACE(0x00000100, ("EMCP_cnt=%d, obsolete_cnt=%d", *emcp_method_count_p, | |
2943 obsolete_count)); | |
2944 } | |
2945 | |
2946 // This internal class transfers the native function registration from old methods | |
2947 // to new methods. It is designed to handle both the simple case of unchanged | |
2948 // native methods and the complex cases of native method prefixes being added and/or | |
2949 // removed. | |
2950 // It expects only to be used during the VM_RedefineClasses op (a safepoint). | |
2951 // | |
2952 // This class is used after the new methods have been installed in "the_class". | |
2953 // | |
2954 // So, for example, the following must be handled. Where 'm' is a method and | |
2955 // a number followed by an underscore is a prefix. | |
2956 // | |
2957 // Old Name New Name | |
2958 // Simple transfer to new method m -> m | |
2959 // Add prefix m -> 1_m | |
2960 // Remove prefix 1_m -> m | |
2961 // Simultaneous add of prefixes m -> 3_2_1_m | |
2962 // Simultaneous removal of prefixes 3_2_1_m -> m | |
2963 // Simultaneous add and remove 1_m -> 2_m | |
2964 // Same, caused by prefix removal only 3_2_1_m -> 3_2_m | |
2965 // | |
2966 class TransferNativeFunctionRegistration { | |
2967 private: | |
2968 instanceKlassHandle the_class; | |
2969 int prefix_count; | |
2970 char** prefixes; | |
2971 | |
2972 // Recursively search the binary tree of possibly prefixed method names. | |
2973 // Iteration could be used if all agents were well behaved. Full tree walk is | |
2974 // more resilent to agents not cleaning up intermediate methods. | |
2975 // Branch at each depth in the binary tree is: | |
2976 // (1) without the prefix. | |
2977 // (2) with the prefix. | |
2978 // 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
|
2979 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
|
2980 Symbol* signature) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2142
diff
changeset
|
2981 TempNewSymbol name_symbol = SymbolTable::probe(name_str, (int)name_len); |
0 | 2982 if (name_symbol != NULL) { |
6983 | 2983 Method* method = the_class()->lookup_method(name_symbol, signature); |
0 | 2984 if (method != NULL) { |
2985 // Even if prefixed, intermediate methods must exist. | |
2986 if (method->is_native()) { | |
2987 // Wahoo, we found a (possibly prefixed) version of the method, return it. | |
2988 return method; | |
2989 } | |
2990 if (depth < prefix_count) { | |
2991 // Try applying further prefixes (other than this one). | |
2992 method = search_prefix_name_space(depth+1, name_str, name_len, signature); | |
2993 if (method != NULL) { | |
2994 return method; // found | |
2995 } | |
2996 | |
2997 // Try adding this prefix to the method name and see if it matches | |
2998 // another method name. | |
2999 char* prefix = prefixes[depth]; | |
3000 size_t prefix_len = strlen(prefix); | |
3001 size_t trial_len = name_len + prefix_len; | |
3002 char* trial_name_str = NEW_RESOURCE_ARRAY(char, trial_len + 1); | |
3003 strcpy(trial_name_str, prefix); | |
3004 strcat(trial_name_str, name_str); | |
3005 method = search_prefix_name_space(depth+1, trial_name_str, trial_len, | |
3006 signature); | |
3007 if (method != NULL) { | |
3008 // If found along this branch, it was prefixed, mark as such | |
3009 method->set_is_prefixed_native(); | |
3010 return method; // found | |
3011 } | |
3012 } | |
3013 } | |
3014 } | |
3015 return NULL; // This whole branch bore nothing | |
3016 } | |
3017 | |
3018 // 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
|
3019 char* method_name_without_prefixes(Method* method) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2142
diff
changeset
|
3020 Symbol* name = method->name(); |
0 | 3021 char* name_str = name->as_utf8(); |
3022 | |
3023 // Old prefixing may be defunct, strip prefixes, if any. | |
3024 for (int i = prefix_count-1; i >= 0; i--) { | |
3025 char* prefix = prefixes[i]; | |
3026 size_t prefix_len = strlen(prefix); | |
3027 if (strncmp(prefix, name_str, prefix_len) == 0) { | |
3028 name_str += prefix_len; | |
3029 } | |
3030 } | |
3031 return name_str; | |
3032 } | |
3033 | |
3034 // Strip any prefixes off the old native method, then try to find a | |
3035 // (possibly prefixed) new native that matches it. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3036 Method* strip_and_search_for_new_native(Method* method) { |
0 | 3037 ResourceMark rm; |
3038 char* name_str = method_name_without_prefixes(method); | |
3039 return search_prefix_name_space(0, name_str, strlen(name_str), | |
3040 method->signature()); | |
3041 } | |
3042 | |
3043 public: | |
3044 | |
3045 // Construct a native method transfer processor for this class. | |
3046 TransferNativeFunctionRegistration(instanceKlassHandle _the_class) { | |
3047 assert(SafepointSynchronize::is_at_safepoint(), "sanity check"); | |
3048 | |
3049 the_class = _the_class; | |
3050 prefixes = JvmtiExport::get_all_native_method_prefixes(&prefix_count); | |
3051 } | |
3052 | |
3053 // 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
|
3054 void transfer_registrations(Method** old_methods, int methods_length) { |
0 | 3055 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
|
3056 Method* old_method = old_methods[j]; |
0 | 3057 |
3058 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
|
3059 Method* new_method = strip_and_search_for_new_native(old_method); |
0 | 3060 if (new_method != NULL) { |
3061 // Actually set the native function in the new method. | |
3062 // Redefine does not send events (except CFLH), certainly not this | |
3063 // behind the scenes re-registration. | |
3064 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
|
3065 !Method::native_bind_event_is_interesting); |
0 | 3066 } |
3067 } | |
3068 } | |
3069 } | |
3070 }; | |
3071 | |
3072 // Don't lose the association between a native method and its JNI function. | |
3073 void VM_RedefineClasses::transfer_old_native_function_registrations(instanceKlassHandle the_class) { | |
3074 TransferNativeFunctionRegistration transfer(the_class); | |
3075 transfer.transfer_registrations(_deleted_methods, _deleted_methods_length); | |
3076 transfer.transfer_registrations(_matching_old_methods, _matching_methods_length); | |
3077 } | |
3078 | |
3079 // Deoptimize all compiled code that depends on this class. | |
3080 // | |
3081 // If the can_redefine_classes capability is obtained in the onload | |
3082 // phase then the compiler has recorded all dependencies from startup. | |
3083 // In that case we need only deoptimize and throw away all compiled code | |
3084 // that depends on the class. | |
3085 // | |
3086 // If can_redefine_classes is obtained sometime after the onload | |
3087 // phase then the dependency information may be incomplete. In that case | |
3088 // the first call to RedefineClasses causes all compiled code to be | |
3089 // thrown away. As can_redefine_classes has been obtained then | |
3090 // all future compilations will record dependencies so second and | |
3091 // subsequent calls to RedefineClasses need only throw away code | |
3092 // that depends on the class. | |
3093 // | |
3094 void VM_RedefineClasses::flush_dependent_code(instanceKlassHandle k_h, TRAPS) { | |
3095 assert_locked_or_safepoint(Compile_lock); | |
3096 | |
3097 // All dependencies have been recorded from startup or this is a second or | |
3098 // subsequent use of RedefineClasses | |
3099 if (JvmtiExport::all_dependencies_are_recorded()) { | |
3100 Universe::flush_evol_dependents_on(k_h); | |
3101 } else { | |
3102 CodeCache::mark_all_nmethods_for_deoptimization(); | |
3103 | |
3104 ResourceMark rm(THREAD); | |
3105 DeoptimizationMarker dm; | |
3106 | |
3107 // Deoptimize all activations depending on marked nmethods | |
3108 Deoptimization::deoptimize_dependents(); | |
3109 | |
3110 // Make the dependent methods not entrant (in VM_Deoptimize they are made zombies) | |
3111 CodeCache::make_marked_nmethods_not_entrant(); | |
3112 | |
3113 // From now on we know that the dependency information is complete | |
3114 JvmtiExport::set_all_dependencies_are_recorded(true); | |
3115 } | |
3116 } | |
3117 | |
3118 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
|
3119 Method* old_method; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3120 Method* new_method; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3121 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3122 _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
|
3123 _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
|
3124 _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
|
3125 _deleted_methods = NEW_RESOURCE_ARRAY(Method*, _old_methods->length()); |
0 | 3126 |
3127 _matching_methods_length = 0; | |
3128 _deleted_methods_length = 0; | |
3129 _added_methods_length = 0; | |
3130 | |
3131 int nj = 0; | |
3132 int oj = 0; | |
3133 while (true) { | |
3134 if (oj >= _old_methods->length()) { | |
3135 if (nj >= _new_methods->length()) { | |
3136 break; // we've looked at everything, done | |
3137 } | |
3138 // New method at the end | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3139 new_method = _new_methods->at(nj); |
0 | 3140 _added_methods[_added_methods_length++] = new_method; |
3141 ++nj; | |
3142 } else if (nj >= _new_methods->length()) { | |
3143 // Old method, at the end, is deleted | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3144 old_method = _old_methods->at(oj); |
0 | 3145 _deleted_methods[_deleted_methods_length++] = old_method; |
3146 ++oj; | |
3147 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3148 old_method = _old_methods->at(oj); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3149 new_method = _new_methods->at(nj); |
0 | 3150 if (old_method->name() == new_method->name()) { |
3151 if (old_method->signature() == new_method->signature()) { | |
3152 _matching_old_methods[_matching_methods_length ] = old_method; | |
3153 _matching_new_methods[_matching_methods_length++] = new_method; | |
3154 ++nj; | |
3155 ++oj; | |
3156 } else { | |
3157 // added overloaded have already been moved to the end, | |
3158 // so this is a deleted overloaded method | |
3159 _deleted_methods[_deleted_methods_length++] = old_method; | |
3160 ++oj; | |
3161 } | |
3162 } else { // names don't match | |
3163 if (old_method->name()->fast_compare(new_method->name()) > 0) { | |
3164 // new method | |
3165 _added_methods[_added_methods_length++] = new_method; | |
3166 ++nj; | |
3167 } else { | |
3168 // deleted method | |
3169 _deleted_methods[_deleted_methods_length++] = old_method; | |
3170 ++oj; | |
3171 } | |
3172 } | |
3173 } | |
3174 } | |
3175 assert(_matching_methods_length + _deleted_methods_length == _old_methods->length(), "sanity"); | |
3176 assert(_matching_methods_length + _added_methods_length == _new_methods->length(), "sanity"); | |
3177 } | |
3178 | |
3179 | |
8031 | 3180 void VM_RedefineClasses::swap_annotations(instanceKlassHandle the_class, |
3181 instanceKlassHandle scratch_class) { | |
3182 // Since there is currently no rewriting of type annotations indexes | |
3183 // into the CP, we null out type annotations on scratch_class before | |
3184 // we swap annotations with the_class rather than facing the | |
3185 // possibility of shipping annotations with broken indexes to | |
3186 // Java-land. | |
3187 ClassLoaderData* loader_data = scratch_class->class_loader_data(); | |
3188 AnnotationArray* new_class_type_annotations = scratch_class->class_type_annotations(); | |
3189 if (new_class_type_annotations != NULL) { | |
3190 MetadataFactory::free_array<u1>(loader_data, new_class_type_annotations); | |
3191 scratch_class->annotations()->set_class_type_annotations(NULL); | |
3192 } | |
3193 Array<AnnotationArray*>* new_field_type_annotations = scratch_class->fields_type_annotations(); | |
3194 if (new_field_type_annotations != NULL) { | |
3195 Annotations::free_contents(loader_data, new_field_type_annotations); | |
3196 scratch_class->annotations()->set_fields_type_annotations(NULL); | |
3197 } | |
3198 | |
3199 // Swap annotation fields values | |
3200 Annotations* old_annotations = the_class->annotations(); | |
3201 the_class->set_annotations(scratch_class->annotations()); | |
3202 scratch_class->set_annotations(old_annotations); | |
3203 } | |
3204 | |
0 | 3205 |
3206 // Install the redefinition of a class: | |
3207 // - house keeping (flushing breakpoints and caches, deoptimizing | |
3208 // dependent compiled code) | |
3209 // - replacing parts in the_class with parts from scratch_class | |
3210 // - adding a weak reference to track the obsolete but interesting | |
3211 // parts of the_class | |
3212 // - adjusting constant pool caches and vtables in other classes | |
3213 // 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
|
3214 // ClassLoaderDataGraph::classes_do() facility which only allows |
0 | 3215 // a helper method to be specified. The interesting parameters |
3216 // that we would like to pass to the helper method are saved in | |
3217 // static global fields in the VM operation. | |
3218 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
|
3219 Klass* scratch_class_oop, TRAPS) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3220 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3221 HandleMark hm(THREAD); // make sure handles from this call are freed |
0 | 3222 RC_TIMER_START(_timer_rsc_phase1); |
3223 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3224 instanceKlassHandle scratch_class(scratch_class_oop); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3225 |
0 | 3226 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
|
3227 Klass* the_class_oop = java_lang_Class::as_Klass(the_class_mirror); |
0 | 3228 instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop); |
3229 | |
3230 // Remove all breakpoints in methods of this class | |
3231 JvmtiBreakpoints& jvmti_breakpoints = JvmtiCurrentBreakpoints::get_jvmti_breakpoints(); | |
3232 jvmti_breakpoints.clearall_in_class_at_safepoint(the_class_oop); | |
3233 | |
3234 // Deoptimize all compiled code that depends on this class | |
3235 flush_dependent_code(the_class, THREAD); | |
3236 | |
3237 _old_methods = the_class->methods(); | |
3238 _new_methods = scratch_class->methods(); | |
3239 _the_class_oop = the_class_oop; | |
3240 compute_added_deleted_matching_methods(); | |
3241 update_jmethod_ids(); | |
3242 | |
3243 // Attach new constant pool to the original klass. The original | |
3244 // klass still refers to the old constant pool (for now). | |
3245 scratch_class->constants()->set_pool_holder(the_class()); | |
3246 | |
3247 #if 0 | |
3248 // In theory, with constant pool merging in place we should be able | |
3249 // to save space by using the new, merged constant pool in place of | |
3250 // the old constant pool(s). By "pool(s)" I mean the constant pool in | |
3251 // the klass version we are replacing now and any constant pool(s) in | |
3252 // previous versions of klass. Nice theory, doesn't work in practice. | |
3253 // When this code is enabled, even simple programs throw NullPointer | |
3254 // exceptions. I'm guessing that this is caused by some constant pool | |
3255 // cache difference between the new, merged constant pool and the | |
3256 // constant pool that was just being used by the klass. I'm keeping | |
3257 // this code around to archive the idea, but the code has to remain | |
3258 // disabled for now. | |
3259 | |
3260 // Attach each old method to the new constant pool. This can be | |
3261 // done here since we are past the bytecode verification and | |
3262 // constant pool optimization phases. | |
3263 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
|
3264 Method* method = _old_methods->at(i); |
0 | 3265 method->set_constants(scratch_class->constants()); |
3266 } | |
3267 | |
3268 { | |
3269 // walk all previous versions of the klass | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3270 InstanceKlass *ik = (InstanceKlass *)the_class(); |
0 | 3271 PreviousVersionWalker pvw(ik); |
3272 instanceKlassHandle ikh; | |
3273 do { | |
3274 ikh = pvw.next_previous_version(); | |
3275 if (!ikh.is_null()) { | |
3276 ik = ikh(); | |
3277 | |
3278 // attach previous version of klass to the new constant pool | |
3279 ik->set_constants(scratch_class->constants()); | |
3280 | |
3281 // Attach each method in the previous version of klass to the | |
3282 // new constant pool | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3283 Array<Method*>* prev_methods = ik->methods(); |
0 | 3284 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
|
3285 Method* method = prev_methods->at(i); |
0 | 3286 method->set_constants(scratch_class->constants()); |
3287 } | |
3288 } | |
3289 } while (!ikh.is_null()); | |
3290 } | |
3291 #endif | |
3292 | |
3293 // Replace methods and constantpool | |
3294 the_class->set_methods(_new_methods); | |
3295 scratch_class->set_methods(_old_methods); // To prevent potential GCing of the old methods, | |
3296 // and to be able to undo operation easily. | |
3297 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3298 ConstantPool* old_constants = the_class->constants(); |
0 | 3299 the_class->set_constants(scratch_class->constants()); |
3300 scratch_class->set_constants(old_constants); // See the previous comment. | |
3301 #if 0 | |
3302 // We are swapping the guts of "the new class" with the guts of "the | |
3303 // class". Since the old constant pool has just been attached to "the | |
3304 // new class", it seems logical to set the pool holder in the old | |
3305 // constant pool also. However, doing this will change the observable | |
3306 // class hierarchy for any old methods that are still executing. A | |
3307 // method can query the identity of its "holder" and this query uses | |
3308 // the method's constant pool link to find the holder. The change in | |
3309 // holding class from "the class" to "the new class" can confuse | |
3310 // things. | |
3311 // | |
3312 // Setting the old constant pool's holder will also cause | |
3313 // verification done during vtable initialization below to fail. | |
3314 // During vtable initialization, the vtable's class is verified to be | |
3315 // a subtype of the method's holder. The vtable's class is "the | |
3316 // class" and the method's holder is gotten from the constant pool | |
3317 // link in the method itself. For "the class"'s directly implemented | |
3318 // methods, the method holder is "the class" itself (as gotten from | |
3319 // the new constant pool). The check works fine in this case. The | |
3320 // check also works fine for methods inherited from super classes. | |
3321 // | |
3322 // Miranda methods are a little more complicated. A miranda method is | |
3323 // provided by an interface when the class implementing the interface | |
3324 // 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
|
3325 // internally as an InstanceKlass. These special instanceKlasses |
0 | 3326 // share the constant pool of the class that "implements" the |
3327 // interface. By sharing the constant pool, the method holder of a | |
3328 // miranda method is the class that "implements" the interface. In a | |
3329 // non-redefine situation, the subtype check works fine. However, if | |
3330 // the old constant pool's pool holder is modified, then the check | |
3331 // fails because there is no class hierarchy relationship between the | |
3332 // vtable's class and "the new class". | |
3333 | |
3334 old_constants->set_pool_holder(scratch_class()); | |
3335 #endif | |
3336 | |
3337 // track which methods are EMCP for add_previous_version() call below | |
3338 BitMap emcp_methods(_old_methods->length()); | |
3339 int emcp_method_count = 0; | |
3340 emcp_methods.clear(); // clears 0..(length() - 1) | |
3341 check_methods_and_mark_as_obsolete(&emcp_methods, &emcp_method_count); | |
3342 transfer_old_native_function_registrations(the_class); | |
3343 | |
3344 // The class file bytes from before any retransformable agents mucked | |
3345 // with them was cached on the scratch class, move to the_class. | |
3346 // Note: we still want to do this if nothing needed caching since it | |
3347 // should get cleared in the_class too. | |
4731
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3348 if (the_class->get_cached_class_file_bytes() == 0) { |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3349 // 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
|
3350 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
|
3351 } |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3352 #ifndef PRODUCT |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3353 else { |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3354 assert(the_class->get_cached_class_file_bytes() == |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3355 scratch_class->get_cached_class_file_bytes(), "cache ptrs must match"); |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3356 assert(the_class->get_cached_class_file_len() == |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3357 scratch_class->get_cached_class_file_len(), "cache lens must match"); |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3358 } |
4ceaf61479fc
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
3938
diff
changeset
|
3359 #endif |
0 | 3360 |
10252
712a1e9c91f3
8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents:
10151
diff
changeset
|
3361 // 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
|
3362 // always owns these bytes. |
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
10382
diff
changeset
|
3363 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
|
3364 |
0 | 3365 // Replace inner_classes |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3366 Array<u2>* old_inner_classes = the_class->inner_classes(); |
0 | 3367 the_class->set_inner_classes(scratch_class->inner_classes()); |
3368 scratch_class->set_inner_classes(old_inner_classes); | |
3369 | |
3370 // Initialize the vtable and interface table after | |
3371 // methods have been rewritten | |
3372 { | |
3373 ResourceMark rm(THREAD); | |
3374 // no exception should happen here since we explicitly | |
3375 // do not check loader constraints. | |
3376 // compare_and_normalize_class_versions has already checked: | |
3377 // - classloaders unchanged, signatures unchanged | |
3378 // - all instanceKlasses for redefined classes reused & contents updated | |
3379 the_class->vtable()->initialize_vtable(false, THREAD); | |
3380 the_class->itable()->initialize_itable(false, THREAD); | |
1142 | 3381 assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())), "redefine exception"); |
0 | 3382 } |
3383 | |
3384 // Leave arrays of jmethodIDs and itable index cache unchanged | |
3385 | |
3386 // 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
|
3387 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
|
3388 scratch_class->source_file_name_index()); |
0 | 3389 |
3390 // Copy the "source debug extension" attribute from new class version | |
3391 the_class->set_source_debug_extension( | |
6203
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
3392 scratch_class->source_debug_extension(), |
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
3393 scratch_class->source_debug_extension() == NULL ? 0 : |
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
3394 (int)strlen(scratch_class->source_debug_extension())); |
0 | 3395 |
3396 // Use of javac -g could be different in the old and the new | |
3397 if (scratch_class->access_flags().has_localvariable_table() != | |
3398 the_class->access_flags().has_localvariable_table()) { | |
3399 | |
3400 AccessFlags flags = the_class->access_flags(); | |
3401 if (scratch_class->access_flags().has_localvariable_table()) { | |
3402 flags.set_has_localvariable_table(); | |
3403 } else { | |
3404 flags.clear_has_localvariable_table(); | |
3405 } | |
3406 the_class->set_access_flags(flags); | |
3407 } | |
3408 | |
8031 | 3409 swap_annotations(the_class, scratch_class); |
0 | 3410 |
3411 // Replace minor version number of class file | |
3412 u2 old_minor_version = the_class->minor_version(); | |
3413 the_class->set_minor_version(scratch_class->minor_version()); | |
3414 scratch_class->set_minor_version(old_minor_version); | |
3415 | |
3416 // Replace major version number of class file | |
3417 u2 old_major_version = the_class->major_version(); | |
3418 the_class->set_major_version(scratch_class->major_version()); | |
3419 scratch_class->set_major_version(old_major_version); | |
3420 | |
3421 // Replace CP indexes for class and name+type of enclosing method | |
3422 u2 old_class_idx = the_class->enclosing_method_class_index(); | |
3423 u2 old_method_idx = the_class->enclosing_method_method_index(); | |
3424 the_class->set_enclosing_method_indices( | |
3425 scratch_class->enclosing_method_class_index(), | |
3426 scratch_class->enclosing_method_method_index()); | |
3427 scratch_class->set_enclosing_method_indices(old_class_idx, old_method_idx); | |
3428 | |
3429 // keep track of previous versions of this class | |
3430 the_class->add_previous_version(scratch_class, &emcp_methods, | |
3431 emcp_method_count); | |
3432 | |
3433 RC_TIMER_STOP(_timer_rsc_phase1); | |
3434 RC_TIMER_START(_timer_rsc_phase2); | |
3435 | |
3436 // Adjust constantpool caches and vtables for all classes | |
3437 // that reference methods of the evolved class. | |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3438 AdjustCpoolCacheAndVtable adjust_cpool_cache_and_vtable(THREAD); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3439 ClassLoaderDataGraph::classes_do(&adjust_cpool_cache_and_vtable); |
0 | 3440 |
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
8068
diff
changeset
|
3441 // JSR-292 support |
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
8068
diff
changeset
|
3442 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
|
3443 if (mnt != NULL) { |
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
8068
diff
changeset
|
3444 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
|
3445 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
|
3446 _matching_new_methods, |
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
8068
diff
changeset
|
3447 _matching_methods_length, |
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
8068
diff
changeset
|
3448 &trace_name_printed); |
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
8068
diff
changeset
|
3449 } |
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
8068
diff
changeset
|
3450 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3451 // 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
|
3452 SystemDictionary::delete_resolution_error(old_constants); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3453 |
0 | 3454 if (the_class->oop_map_cache() != NULL) { |
3455 // Flush references to any obsolete methods from the oop map cache | |
3456 // so that obsolete methods are not pinned. | |
3457 the_class->oop_map_cache()->flush_obsolete_entries(); | |
3458 } | |
3459 | |
3460 // increment the classRedefinedCount field in the_class and in any | |
3461 // direct and indirect subclasses of the_class | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3462 increment_class_counter((InstanceKlass *)the_class(), THREAD); |
0 | 3463 |
3464 // RC_TRACE macro has an embedded ResourceMark | |
3465 RC_TRACE_WITH_THREAD(0x00000001, THREAD, | |
3466 ("redefined name=%s, count=%d (avail_mem=" UINT64_FORMAT "K)", | |
3467 the_class->external_name(), | |
3468 java_lang_Class::classRedefinedCount(the_class_mirror), | |
3469 os::available_memory() >> 10)); | |
3470 | |
3471 RC_TIMER_STOP(_timer_rsc_phase2); | |
3472 } // end redefine_single_class() | |
3473 | |
3474 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3475 // Increment the classRedefinedCount field in the specific InstanceKlass |
0 | 3476 // and in all direct and indirect subclasses. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3477 void VM_RedefineClasses::increment_class_counter(InstanceKlass *ik, TRAPS) { |
0 | 3478 oop class_mirror = ik->java_mirror(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3479 Klass* class_oop = java_lang_Class::as_Klass(class_mirror); |
0 | 3480 int new_count = java_lang_Class::classRedefinedCount(class_mirror) + 1; |
3481 java_lang_Class::set_classRedefinedCount(class_mirror, new_count); | |
3482 | |
3483 if (class_oop != _the_class_oop) { | |
3484 // _the_class_oop count is printed at end of redefine_single_class() | |
3485 RC_TRACE_WITH_THREAD(0x00000008, THREAD, | |
3486 ("updated count in subclass=%s to %d", ik->external_name(), new_count)); | |
3487 } | |
3488 | |
3489 for (Klass *subk = ik->subklass(); subk != NULL; | |
3490 subk = subk->next_sibling()) { | |
2377
57552dca1708
7029509: nightly failures after static fields in Class
never
parents:
2332
diff
changeset
|
3491 if (subk->oop_is_instance()) { |
57552dca1708
7029509: nightly failures after static fields in Class
never
parents:
2332
diff
changeset
|
3492 // Only update instanceKlasses |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3493 InstanceKlass *subik = (InstanceKlass*)subk; |
2377
57552dca1708
7029509: nightly failures after static fields in Class
never
parents:
2332
diff
changeset
|
3494 // recursively do subclasses of the current subclass |
57552dca1708
7029509: nightly failures after static fields in Class
never
parents:
2332
diff
changeset
|
3495 increment_class_counter(subik, THREAD); |
57552dca1708
7029509: nightly failures after static fields in Class
never
parents:
2332
diff
changeset
|
3496 } |
0 | 3497 } |
3498 } | |
3499 | |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3500 void VM_RedefineClasses::CheckClass::do_klass(Klass* k) { |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3501 bool no_old_methods = true; // be optimistic |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3502 |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3503 // Both array and instance classes have vtables. |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3504 // a vtable should never contain old or obsolete methods |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3505 ResourceMark rm(_thread); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3506 if (k->vtable_length() > 0 && |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3507 !k->vtable()->check_no_old_or_obsolete_entries()) { |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3508 if (RC_TRACE_ENABLED(0x00004000)) { |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3509 RC_TRACE_WITH_THREAD(0x00004000, _thread, |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3510 ("klassVtable::check_no_old_or_obsolete_entries failure" |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3511 " -- OLD or OBSOLETE method found -- class: %s", |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3512 k->signature_name())); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3513 k->vtable()->dump_vtable(); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3514 } |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3515 no_old_methods = false; |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3516 } |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3517 |
0 | 3518 if (k->oop_is_instance()) { |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3519 HandleMark hm(_thread); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3520 InstanceKlass *ik = InstanceKlass::cast(k); |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3521 |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3522 // an itable should never contain old or obsolete methods |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3523 if (ik->itable_length() > 0 && |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3524 !ik->itable()->check_no_old_or_obsolete_entries()) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3525 if (RC_TRACE_ENABLED(0x00004000)) { |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3526 RC_TRACE_WITH_THREAD(0x00004000, _thread, |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3527 ("klassItable::check_no_old_or_obsolete_entries failure" |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3528 " -- OLD or OBSOLETE method found -- class: %s", |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3529 ik->signature_name())); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3530 ik->itable()->dump_itable(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3531 } |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3532 no_old_methods = false; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3533 } |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3534 |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3535 // 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
|
3536 if (ik->constants() != NULL && |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6217
diff
changeset
|
3537 ik->constants()->cache() != NULL && |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3538 !ik->constants()->cache()->check_no_old_or_obsolete_entries()) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3539 if (RC_TRACE_ENABLED(0x00004000)) { |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3540 RC_TRACE_WITH_THREAD(0x00004000, _thread, |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3541 ("cp-cache::check_no_old_or_obsolete_entries failure" |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3542 " -- OLD or OBSOLETE method found -- class: %s", |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3543 ik->signature_name())); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3544 ik->constants()->cache()->dump_cache(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3545 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3546 no_old_methods = false; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3547 } |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3548 } |
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 // print and fail guarantee if old methods are found. |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3551 if (!no_old_methods) { |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3552 if (RC_TRACE_ENABLED(0x00004000)) { |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3553 dump_methods(); |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3554 } else { |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3555 tty->print_cr("INFO: use the '-XX:TraceRedefineClasses=16384' option " |
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3556 "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
|
3557 } |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3558 guarantee(false, "OLD and/or OBSOLETE method(s) found"); |
0 | 3559 } |
3560 } | |
3561 | |
10268
43083e670adf
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
10252
diff
changeset
|
3562 |
0 | 3563 void VM_RedefineClasses::dump_methods() { |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3564 int j; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3565 RC_TRACE(0x00004000, ("_old_methods --")); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3566 for (j = 0; j < _old_methods->length(); ++j) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3567 Method* m = _old_methods->at(j); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3568 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
|
3569 m->access_flags().print_on(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3570 tty->print(" -- "); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3571 m->print_name(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3572 tty->cr(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3573 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3574 RC_TRACE(0x00004000, ("_new_methods --")); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3575 for (j = 0; j < _new_methods->length(); ++j) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3576 Method* m = _new_methods->at(j); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3577 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
|
3578 m->access_flags().print_on(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3579 tty->print(" -- "); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3580 m->print_name(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3581 tty->cr(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3582 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3583 RC_TRACE(0x00004000, ("_matching_(old/new)_methods --")); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3584 for (j = 0; j < _matching_methods_length; ++j) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3585 Method* m = _matching_old_methods[j]; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3586 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
|
3587 m->access_flags().print_on(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3588 tty->print(" -- "); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3589 m->print_name(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3590 tty->cr(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3591 m = _matching_new_methods[j]; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3592 RC_TRACE_NO_CR(0x00004000, (" (%5d) ", m->vtable_index())); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3593 m->access_flags().print_on(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3594 tty->cr(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3595 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3596 RC_TRACE(0x00004000, ("_deleted_methods --")); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3597 for (j = 0; j < _deleted_methods_length; ++j) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3598 Method* m = _deleted_methods[j]; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3599 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
|
3600 m->access_flags().print_on(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3601 tty->print(" -- "); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3602 m->print_name(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3603 tty->cr(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3604 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3605 RC_TRACE(0x00004000, ("_added_methods --")); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3606 for (j = 0; j < _added_methods_length; ++j) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3607 Method* m = _added_methods[j]; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3608 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
|
3609 m->access_flags().print_on(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3610 tty->print(" -- "); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3611 m->print_name(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3612 tty->cr(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
7965
diff
changeset
|
3613 } |
0 | 3614 } |