author | jiangli |
Wed, 17 Jul 2013 18:06:29 -0400 | |
changeset 18940 | d39d4765e6cb |
parent 17864 | 29aa71317b51 |
child 19278 | c4355bebb414 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2 |
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. |
1 | 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 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4571
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4571
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4571
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
15430
7c35f12cf1e5
8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents:
15229
diff
changeset
|
26 |
#include "classfile/metadataOnStackMark.hpp" |
7397 | 27 |
#include "classfile/systemDictionary.hpp" |
28 |
#include "classfile/verifier.hpp" |
|
29 |
#include "code/codeCache.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
30 |
#include "compiler/compileBroker.hpp" |
7397 | 31 |
#include "interpreter/oopMapCache.hpp" |
32 |
#include "interpreter/rewriter.hpp" |
|
33 |
#include "memory/gcLocker.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
34 |
#include "memory/metadataFactory.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
35 |
#include "memory/metaspaceShared.hpp" |
7397 | 36 |
#include "memory/universe.inline.hpp" |
10546 | 37 |
#include "oops/fieldStreams.hpp" |
7397 | 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" |
|
1 | 45 |
|
46 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
47 |
Array<Method*>* VM_RedefineClasses::_old_methods = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
48 |
Array<Method*>* VM_RedefineClasses::_new_methods = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
49 |
Method** VM_RedefineClasses::_matching_old_methods = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
50 |
Method** VM_RedefineClasses::_matching_new_methods = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
51 |
Method** VM_RedefineClasses::_deleted_methods = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
52 |
Method** VM_RedefineClasses::_added_methods = NULL; |
1 | 53 |
int VM_RedefineClasses::_matching_methods_length = 0; |
54 |
int VM_RedefineClasses::_deleted_methods_length = 0; |
|
55 |
int VM_RedefineClasses::_added_methods_length = 0; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
56 |
Klass* VM_RedefineClasses::_the_class_oop = NULL; |
1 | 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) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
100 |
// free any successfully created classes, since none are redefined |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
101 |
for (int i = 0; i < _class_count; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
102 |
if (_scratch_classes[i] != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
103 |
ClassLoaderData* cld = _scratch_classes[i]->class_loader_data(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
104 |
// Free the memory for this class at class unloading time. Not before |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
105 |
// because CMS might think this is still live. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
106 |
cld->add_to_deallocate_list((InstanceKlass*)_scratch_classes[i]); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
107 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
108 |
} |
1 | 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. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
127 |
if (!MetaspaceShared::remap_shared_readonly_as_readwrite()) { |
1 | 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 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
135 |
// Mark methods seen on stack and everywhere else so old methods are not |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
136 |
// cleaned up if they're on the stack. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
137 |
MetadataOnStackMark md_on_stack; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
138 |
HandleMark hm(thread); // make sure any handles created are deleted |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
139 |
// before the stack walk again. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
140 |
|
1 | 141 |
for (int i = 0; i < _class_count; i++) { |
142 |
redefine_single_class(_class_defs[i].klass, _scratch_classes[i], thread); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
143 |
ClassLoaderData* cld = _scratch_classes[i]->class_loader_data(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
144 |
// Free the memory for this class at class unloading time. Not before |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
145 |
// because CMS might think this is still live. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
146 |
cld->add_to_deallocate_list((InstanceKlass*)_scratch_classes[i]); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
147 |
_scratch_classes[i] = NULL; |
1 | 148 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
149 |
|
1 | 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 |
||
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
157 |
// check_class() is optionally called for product bits, but is |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
158 |
// always called for non-product bits. |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
159 |
#ifdef PRODUCT |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
160 |
if (RC_TRACE_ENABLED(0x00004000)) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
161 |
#endif |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
162 |
RC_TRACE_WITH_THREAD(0x00004000, thread, ("calling check_class")); |
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
163 |
CheckClass check_class(thread); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
164 |
ClassLoaderDataGraph::classes_do(&check_class); |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
165 |
#ifdef PRODUCT |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
166 |
} |
1 | 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 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
195 |
Klass* the_class_oop = java_lang_Class::as_Klass(klass_mirror); |
1 | 196 |
// classes for arrays cannot be redefined |
14488 | 197 |
if (the_class_oop == NULL || !the_class_oop->oop_is_instance()) { |
1 | 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 |
{ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
250 |
ConstantPool::copy_entry_to(scratch_cp, scratch_i, *merge_cp_p, *merge_cp_length_p, |
1 | 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 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
267 |
// Symbol*s so this entry can be directly appended. |
1 | 268 |
case JVM_CONSTANT_String: // fall through |
269 |
||
270 |
// These were indirect CP entries, but they have been changed into |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7913
diff
changeset
|
271 |
// Symbol*s so these entries can be directly appended. |
1 | 272 |
case JVM_CONSTANT_UnresolvedClass: // fall through |
273 |
{ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
274 |
ConstantPool::copy_entry_to(scratch_cp, scratch_i, *merge_cp_p, *merge_cp_length_p, |
1 | 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); |
|
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
289 |
int new_name_ref_i = find_or_append_indirect_entry(scratch_cp, name_ref_i, merge_cp_p, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
290 |
merge_cp_length_p, THREAD); |
1 | 291 |
|
292 |
int signature_ref_i = scratch_cp->signature_ref_index_at(scratch_i); |
|
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
293 |
int new_signature_ref_i = find_or_append_indirect_entry(scratch_cp, signature_ref_i, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
294 |
merge_cp_p, merge_cp_length_p, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
295 |
THREAD); |
1 | 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. |
|
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
300 |
if (new_name_ref_i != name_ref_i) { |
1 | 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 |
} |
|
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
305 |
if (new_signature_ref_i != signature_ref_i) { |
1 | 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); |
|
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
327 |
int new_klass_ref_i = find_or_append_indirect_entry(scratch_cp, klass_ref_i, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
328 |
merge_cp_p, merge_cp_length_p, THREAD); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
329 |
|
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
330 |
int name_and_type_ref_i = scratch_cp->uncached_name_and_type_ref_index_at(scratch_i); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
331 |
int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
332 |
merge_cp_p, merge_cp_length_p, THREAD); |
1 | 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 |
||
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
375 |
// this is an indirect CP entry so it needs special handling |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
376 |
case JVM_CONSTANT_MethodType: |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
377 |
{ |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
378 |
int ref_i = scratch_cp->method_type_index_at(scratch_i); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
379 |
int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
380 |
merge_cp_length_p, THREAD); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
381 |
if (new_ref_i != ref_i) { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
382 |
RC_TRACE(0x00080000, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
383 |
("MethodType entry@%d ref_index change: %d to %d", |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
384 |
*merge_cp_length_p, ref_i, new_ref_i)); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
385 |
} |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
386 |
(*merge_cp_p)->method_type_index_at_put(*merge_cp_length_p, new_ref_i); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
387 |
if (scratch_i != *merge_cp_length_p) { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
388 |
// The new entry in *merge_cp_p is at a different index than |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
389 |
// the new entry in scratch_cp so we need to map the index values. |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
390 |
map_index(scratch_cp, scratch_i, *merge_cp_length_p); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
391 |
} |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
392 |
(*merge_cp_length_p)++; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
393 |
} break; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
394 |
|
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
395 |
// this is an indirect CP entry so it needs special handling |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
396 |
case JVM_CONSTANT_MethodHandle: |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
397 |
{ |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
398 |
int ref_kind = scratch_cp->method_handle_ref_kind_at(scratch_i); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
399 |
int ref_i = scratch_cp->method_handle_index_at(scratch_i); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
400 |
int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
401 |
merge_cp_length_p, THREAD); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
402 |
if (new_ref_i != ref_i) { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
403 |
RC_TRACE(0x00080000, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
404 |
("MethodHandle entry@%d ref_index change: %d to %d", |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
405 |
*merge_cp_length_p, ref_i, new_ref_i)); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
406 |
} |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
407 |
(*merge_cp_p)->method_handle_index_at_put(*merge_cp_length_p, ref_kind, new_ref_i); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
408 |
if (scratch_i != *merge_cp_length_p) { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
409 |
// The new entry in *merge_cp_p is at a different index than |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
410 |
// the new entry in scratch_cp so we need to map the index values. |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
411 |
map_index(scratch_cp, scratch_i, *merge_cp_length_p); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
412 |
} |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
413 |
(*merge_cp_length_p)++; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
414 |
} break; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
415 |
|
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
416 |
// this is an indirect CP entry so it needs special handling |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
417 |
case JVM_CONSTANT_InvokeDynamic: |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
418 |
{ |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
419 |
// Index of the bootstrap specifier in the operands array |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
420 |
int old_bs_i = scratch_cp->invoke_dynamic_bootstrap_specifier_index(scratch_i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
421 |
int new_bs_i = find_or_append_operand(scratch_cp, old_bs_i, merge_cp_p, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
422 |
merge_cp_length_p, THREAD); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
423 |
// The bootstrap method NameAndType_info index |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
424 |
int old_ref_i = scratch_cp->invoke_dynamic_name_and_type_ref_index_at(scratch_i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
425 |
int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p, |
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
426 |
merge_cp_length_p, THREAD); |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
427 |
if (new_bs_i != old_bs_i) { |
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
428 |
RC_TRACE(0x00080000, |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
429 |
("InvokeDynamic entry@%d bootstrap_method_attr_index change: %d to %d", |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
430 |
*merge_cp_length_p, old_bs_i, new_bs_i)); |
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
431 |
} |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
432 |
if (new_ref_i != old_ref_i) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
433 |
RC_TRACE(0x00080000, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
434 |
("InvokeDynamic entry@%d name_and_type_index change: %d to %d", |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
435 |
*merge_cp_length_p, old_ref_i, new_ref_i)); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
436 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
437 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
438 |
(*merge_cp_p)->invoke_dynamic_at_put(*merge_cp_length_p, new_bs_i, new_ref_i); |
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
439 |
if (scratch_i != *merge_cp_length_p) { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
440 |
// The new entry in *merge_cp_p is at a different index than |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
441 |
// the new entry in scratch_cp so we need to map the index values. |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
442 |
map_index(scratch_cp, scratch_i, *merge_cp_length_p); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
443 |
} |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
444 |
(*merge_cp_length_p)++; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
445 |
} break; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
446 |
|
1 | 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 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
456 |
// At this stage, String could be here, but not StringIndex |
1 | 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 |
||
15444
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
473 |
int VM_RedefineClasses::find_or_append_indirect_entry(constantPoolHandle scratch_cp, |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
474 |
int ref_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
475 |
|
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
476 |
int new_ref_i = ref_i; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
477 |
bool match = (ref_i < *merge_cp_length_p) && |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
478 |
scratch_cp->compare_entry_to(ref_i, *merge_cp_p, ref_i, THREAD); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
479 |
|
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
480 |
if (!match) { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
481 |
// forward reference in *merge_cp_p or not a direct match |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
482 |
int found_i = scratch_cp->find_matching_entry(ref_i, *merge_cp_p, THREAD); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
483 |
if (found_i != 0) { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
484 |
guarantee(found_i != ref_i, "compare_entry_to() and find_matching_entry() do not agree"); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
485 |
// Found a matching entry somewhere else in *merge_cp_p so just need a mapping entry. |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
486 |
new_ref_i = found_i; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
487 |
map_index(scratch_cp, ref_i, found_i); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
488 |
} else { |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
489 |
// no match found so we have to append this entry to *merge_cp_p |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
490 |
append_entry(scratch_cp, ref_i, merge_cp_p, merge_cp_length_p, THREAD); |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
491 |
// The above call to append_entry() can only append one entry |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
492 |
// so the post call query of *merge_cp_length_p is only for |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
493 |
// the sake of consistency. |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
494 |
new_ref_i = *merge_cp_length_p - 1; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
495 |
} |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
496 |
} |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
497 |
|
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
498 |
return new_ref_i; |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
499 |
} // end find_or_append_indirect_entry() |
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
500 |
|
ab03781780dc
8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents:
15435
diff
changeset
|
501 |
|
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
502 |
// Append a bootstrap specifier into the merge_cp operands that is semantically equal |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
503 |
// to the scratch_cp operands bootstrap specifier passed by the old_bs_i index. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
504 |
// Recursively append new merge_cp entries referenced by the new bootstrap specifier. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
505 |
void VM_RedefineClasses::append_operand(constantPoolHandle scratch_cp, int old_bs_i, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
506 |
constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
507 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
508 |
int old_ref_i = scratch_cp->operand_bootstrap_method_ref_index_at(old_bs_i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
509 |
int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
510 |
merge_cp_length_p, THREAD); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
511 |
if (new_ref_i != old_ref_i) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
512 |
RC_TRACE(0x00080000, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
513 |
("operands entry@%d bootstrap method ref_index change: %d to %d", |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
514 |
_operands_cur_length, old_ref_i, new_ref_i)); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
515 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
516 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
517 |
Array<u2>* merge_ops = (*merge_cp_p)->operands(); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
518 |
int new_bs_i = _operands_cur_length; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
519 |
// We have _operands_cur_length == 0 when the merge_cp operands is empty yet. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
520 |
// However, the operand_offset_at(0) was set in the extend_operands() call. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
521 |
int new_base = (new_bs_i == 0) ? (*merge_cp_p)->operand_offset_at(0) |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
522 |
: (*merge_cp_p)->operand_next_offset_at(new_bs_i - 1); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
523 |
int argc = scratch_cp->operand_argument_count_at(old_bs_i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
524 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
525 |
ConstantPool::operand_offset_at_put(merge_ops, _operands_cur_length, new_base); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
526 |
merge_ops->at_put(new_base++, new_ref_i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
527 |
merge_ops->at_put(new_base++, argc); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
528 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
529 |
for (int i = 0; i < argc; i++) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
530 |
int old_arg_ref_i = scratch_cp->operand_argument_index_at(old_bs_i, i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
531 |
int new_arg_ref_i = find_or_append_indirect_entry(scratch_cp, old_arg_ref_i, merge_cp_p, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
532 |
merge_cp_length_p, THREAD); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
533 |
merge_ops->at_put(new_base++, new_arg_ref_i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
534 |
if (new_arg_ref_i != old_arg_ref_i) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
535 |
RC_TRACE(0x00080000, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
536 |
("operands entry@%d bootstrap method argument ref_index change: %d to %d", |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
537 |
_operands_cur_length, old_arg_ref_i, new_arg_ref_i)); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
538 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
539 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
540 |
if (old_bs_i != _operands_cur_length) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
541 |
// The bootstrap specifier in *merge_cp_p is at a different index than |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
542 |
// that in scratch_cp so we need to map the index values. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
543 |
map_operand_index(old_bs_i, new_bs_i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
544 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
545 |
_operands_cur_length++; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
546 |
} // end append_operand() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
547 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
548 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
549 |
int VM_RedefineClasses::find_or_append_operand(constantPoolHandle scratch_cp, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
550 |
int old_bs_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
551 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
552 |
int new_bs_i = old_bs_i; // bootstrap specifier index |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
553 |
bool match = (old_bs_i < _operands_cur_length) && |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
554 |
scratch_cp->compare_operand_to(old_bs_i, *merge_cp_p, old_bs_i, THREAD); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
555 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
556 |
if (!match) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
557 |
// forward reference in *merge_cp_p or not a direct match |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
558 |
int found_i = scratch_cp->find_matching_operand(old_bs_i, *merge_cp_p, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
559 |
_operands_cur_length, THREAD); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
560 |
if (found_i != -1) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
561 |
guarantee(found_i != old_bs_i, "compare_operand_to() and find_matching_operand() disagree"); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
562 |
// found a matching operand somewhere else in *merge_cp_p so just need a mapping |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
563 |
new_bs_i = found_i; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
564 |
map_operand_index(old_bs_i, found_i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
565 |
} else { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
566 |
// no match found so we have to append this bootstrap specifier to *merge_cp_p |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
567 |
append_operand(scratch_cp, old_bs_i, merge_cp_p, merge_cp_length_p, THREAD); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
568 |
new_bs_i = _operands_cur_length - 1; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
569 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
570 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
571 |
return new_bs_i; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
572 |
} // end find_or_append_operand() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
573 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
574 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
575 |
void VM_RedefineClasses::finalize_operands_merge(constantPoolHandle merge_cp, TRAPS) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
576 |
if (merge_cp->operands() == NULL) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
577 |
return; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
578 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
579 |
// Shrink the merge_cp operands |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
580 |
merge_cp->shrink_operands(_operands_cur_length, CHECK); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
581 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
582 |
if (RC_TRACE_ENABLED(0x00040000)) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
583 |
// don't want to loop unless we are tracing |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
584 |
int count = 0; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
585 |
for (int i = 1; i < _operands_index_map_p->length(); i++) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
586 |
int value = _operands_index_map_p->at(i); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
587 |
if (value != -1) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
588 |
RC_TRACE_WITH_THREAD(0x00040000, THREAD, |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
589 |
("operands_index_map[%d]: old=%d new=%d", count, i, value)); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
590 |
count++; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
591 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
592 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
593 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
594 |
// Clean-up |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
595 |
_operands_index_map_p = NULL; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
596 |
_operands_cur_length = 0; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
597 |
_operands_index_map_count = 0; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
598 |
} // end finalize_operands_merge() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
599 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
600 |
|
1 | 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 || |
|
14488 | 611 |
the_class->super()->name() != |
612 |
scratch_class->super()->name())) { |
|
1 | 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. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
623 |
Array<Klass*>* k_interfaces = the_class->local_interfaces(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
624 |
Array<Klass*>* k_new_interfaces = scratch_class->local_interfaces(); |
1 | 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++) { |
|
14488 | 630 |
if (k_interfaces->at(i)->name() != |
631 |
k_new_interfaces->at(i)->name()) { |
|
1 | 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. |
|
10546 | 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()) { |
|
1 | 654 |
// access |
10546 | 655 |
old_flags = old_fs.access_flags().as_short(); |
656 |
new_flags = new_fs.access_flags().as_short(); |
|
1 | 657 |
if ((old_flags ^ new_flags) & JVM_RECOGNIZED_FIELD_MODIFIERS) { |
658 |
return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; |
|
659 |
} |
|
660 |
// offset |
|
10546 | 661 |
if (old_fs.offset() != new_fs.offset()) { |
1 | 662 |
return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; |
663 |
} |
|
664 |
// name and signature |
|
10546 | 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()); |
|
1 | 669 |
if (name_sym1 != name_sym2 || sig_sym1 != sig_sym2) { |
670 |
return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED; |
|
671 |
} |
|
672 |
} |
|
673 |
||
10546 | 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 |
||
1 | 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 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
690 |
// from the algorithm used in InstanceKlass::find_method(). |
1 | 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. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
697 |
Array<Method*>* k_old_methods(the_class->methods()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
698 |
Array<Method*>* k_new_methods(scratch_class->methods()); |
1 | 699 |
int n_old_methods = k_old_methods->length(); |
700 |
int n_new_methods = k_new_methods->length(); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
701 |
Thread* thread = Thread::current(); |
1 | 702 |
|
703 |
int ni = 0; |
|
704 |
int oi = 0; |
|
705 |
while (true) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
706 |
Method* k_old_method; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
707 |
Method* k_new_method; |
1 | 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 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
715 |
k_new_method = k_new_methods->at(ni); |
1 | 716 |
method_was = added; |
717 |
} else if (ni >= n_new_methods) { |
|
718 |
// Old method, at the end, is deleted |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
719 |
k_old_method = k_old_methods->at(oi); |
1 | 720 |
method_was = deleted; |
721 |
} else { |
|
722 |
// There are more methods in both the old and new lists |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
723 |
k_old_method = k_old_methods->at(oi); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
724 |
k_new_method = k_new_methods->at(ni); |
1 | 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++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
741 |
Method* m = k_new_methods->at(nj); |
1 | 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 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
749 |
k_new_methods->at_put(ni, m); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
750 |
k_new_methods->at_put(nj, k_new_method); |
1 | 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) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
776 |
Method* idnum_owner = scratch_class->method_with_idnum(old_num); |
1 | 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); |
|
15601 | 782 |
if (thread->has_pending_exception()) { |
783 |
return JVMTI_ERROR_OUT_OF_MEMORY; |
|
784 |
} |
|
1 | 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(); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
806 |
if (num == ConstMethod::UNSET_IDNUM) { |
1 | 807 |
// cannot add any more methods |
808 |
return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_ADDED; |
|
809 |
} |
|
810 |
u2 new_num = k_new_method->method_idnum(); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
811 |
Method* idnum_owner = scratch_class->method_with_idnum(num); |
1 | 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); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
817 |
if (thread->has_pending_exception()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
818 |
return JVMTI_ERROR_OUT_OF_MEMORY; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
819 |
} |
1 | 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 |
||
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
874 |
// Find new bootstrap specifier index value for old bootstrap specifier index |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
875 |
// value by seaching the index map. Returns unused index (-1) if there is |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
876 |
// no mapped value for the old bootstrap specifier index. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
877 |
int VM_RedefineClasses::find_new_operand_index(int old_index) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
878 |
if (_operands_index_map_count == 0) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
879 |
// map is empty so nothing can be found |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
880 |
return -1; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
881 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
882 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
883 |
if (old_index == -1 || old_index >= _operands_index_map_p->length()) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
884 |
// The old_index is out of range so it is not mapped. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
885 |
// This should not happen in regular constant pool merging use. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
886 |
return -1; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
887 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
888 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
889 |
int value = _operands_index_map_p->at(old_index); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
890 |
if (value == -1) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
891 |
// the old_index is not mapped |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
892 |
return -1; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
893 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
894 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
895 |
return value; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
896 |
} // end find_new_operand_index() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
897 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
898 |
|
1 | 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) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
929 |
|
1 | 930 |
// For consistency allocate memory using os::malloc wrapper. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
931 |
_scratch_classes = (Klass**) |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
932 |
os::malloc(sizeof(Klass*) * _class_count, mtClass); |
1 | 933 |
if (_scratch_classes == NULL) { |
934 |
return JVMTI_ERROR_OUT_OF_MEMORY; |
|
935 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
936 |
// Zero initialize the _scratch_classes array. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
937 |
for (int i = 0; i < _class_count; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
938 |
_scratch_classes[i] = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
939 |
} |
1 | 940 |
|
941 |
ResourceMark rm(THREAD); |
|
942 |
||
943 |
JvmtiThreadState *state = JvmtiThreadState::state_for(JavaThread::current()); |
|
2135
f82c3012ec86
6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents:
1
diff
changeset
|
944 |
// state can only be NULL if the current thread is exiting which |
f82c3012ec86
6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents:
1
diff
changeset
|
945 |
// should not happen since we're trying to do a RedefineClasses |
f82c3012ec86
6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents:
1
diff
changeset
|
946 |
guarantee(state != NULL, "exiting thread calling load_new_class_versions"); |
1 | 947 |
for (int i = 0; i < _class_count; i++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
948 |
// Create HandleMark so that any handles created while loading new class |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
949 |
// versions are deleted. Constant pools are deallocated while merging |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
950 |
// constant pools |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
951 |
HandleMark hm(THREAD); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
952 |
|
1 | 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 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
958 |
Klass* the_class_oop = java_lang_Class::as_Klass(mirror); |
1 | 959 |
instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7913
diff
changeset
|
960 |
Symbol* the_class_sym = the_class->name(); |
1 | 961 |
|
962 |
// RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
|
963 |
RC_TRACE_WITH_THREAD(0x00000001, THREAD, |
|
11399
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
964 |
("loading name=%s kind=%d (avail_mem=" UINT64_FORMAT "K)", |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
965 |
the_class->external_name(), _class_load_kind, |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
966 |
os::available_memory() >> 10)); |
1 | 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 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
979 |
Klass* k = SystemDictionary::parse_stream(the_class_sym, |
1 | 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 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
991 |
// Need to clean up allocated InstanceKlass if there's an error so assign |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
992 |
// the result here. Caller deallocates all the scratch classes in case of |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
993 |
// an error. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
994 |
_scratch_classes[i] = k; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
995 |
|
1 | 996 |
if (HAS_PENDING_EXCEPTION) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
997 |
Symbol* ex_name = PENDING_EXCEPTION->klass()->name(); |
1 | 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) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1023 |
Symbol* ex_name = PENDING_EXCEPTION->klass()->name(); |
1 | 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( |
|
3820
0a8fbbe180db
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
2154
diff
changeset
|
1057 |
scratch_class, Verifier::ThrowException, true, THREAD); |
1 | 1058 |
} |
1059 |
||
1060 |
if (HAS_PENDING_EXCEPTION) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1061 |
Symbol* ex_name = PENDING_EXCEPTION->klass()->name(); |
1 | 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); |
|
3820
0a8fbbe180db
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
2154
diff
changeset
|
1083 |
Verifier::verify(scratch_class, Verifier::ThrowException, true, THREAD); |
1 | 1084 |
} |
1085 |
||
1086 |
if (HAS_PENDING_EXCEPTION) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1087 |
Symbol* ex_name = PENDING_EXCEPTION->klass()->name(); |
1 | 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); |
|
9971 | 1103 |
if (!HAS_PENDING_EXCEPTION) { |
15099
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
15097
diff
changeset
|
1104 |
scratch_class->link_methods(THREAD); |
9971 | 1105 |
} |
1 | 1106 |
if (HAS_PENDING_EXCEPTION) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1107 |
Symbol* ex_name = PENDING_EXCEPTION->klass()->name(); |
1 | 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 |
||
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1148 |
// Map old_index to new_index as needed. |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1149 |
void VM_RedefineClasses::map_operand_index(int old_index, int new_index) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1150 |
if (find_new_operand_index(old_index) != -1) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1151 |
// old_index is already mapped |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1152 |
return; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1153 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1154 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1155 |
if (old_index == new_index) { |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1156 |
// no mapping is needed |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1157 |
return; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1158 |
} |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1159 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1160 |
_operands_index_map_p->at_put(old_index, new_index); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1161 |
_operands_index_map_count++; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1162 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1163 |
RC_TRACE(0x00040000, ("mapped bootstrap specifier at index %d to %d", old_index, new_index)); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1164 |
} // end map_index() |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1165 |
|
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1166 |
|
1 | 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) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1179 |
assert(false, "caller must provide scratch constantPool"); |
1 | 1180 |
return false; // robustness |
1181 |
} |
|
1182 |
if (merge_cp_length_p == NULL) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1183 |
assert(false, "caller must provide scratch CP length"); |
1 | 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 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1202 |
// perfect fit for ConstantPool*::copy_cp_to(), but we need to |
1 | 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: |
|
8651
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8296
diff
changeset
|
1215 |
case JVM_CONSTANT_UnresolvedClass: |
1 | 1216 |
// revert the copy to JVM_CONSTANT_UnresolvedClass |
8651
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8296
diff
changeset
|
1217 |
// May be resolving while calling this so do the same for |
81b517a9249f
6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents:
8296
diff
changeset
|
1218 |
// JVM_CONSTANT_UnresolvedClass (klass_name_at() deals with transition) |
1 | 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 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1227 |
ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i, CHECK_0); |
1 | 1228 |
old_i++; |
1229 |
break; |
|
1230 |
||
1231 |
default: |
|
1232 |
// just copy the entry to *merge_cp_p |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1233 |
ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i, CHECK_0); |
1 | 1234 |
break; |
1235 |
} |
|
1236 |
} // end for each old_cp entry |
|
1237 |
||
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1238 |
ConstantPool::copy_operands(old_cp, *merge_cp_p, CHECK_0); |
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1239 |
(*merge_cp_p)->extend_operands(scratch_cp, CHECK_0); |
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1240 |
|
1 | 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 |
} |
|
17864
29aa71317b51
8014052: JSR292: assert(end_offset == next_offset) failed: matched ending
sspitsyn
parents:
17373
diff
changeset
|
1356 |
finalize_operands_merge(*merge_cp_p, THREAD); |
1 | 1357 |
|
1358 |
return true; |
|
1359 |
} // end merge_constant_pools() |
|
1360 |
||
1361 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1362 |
// Scoped object to clean up the constant pool(s) created for merging |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1363 |
class MergeCPCleaner { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1364 |
ClassLoaderData* _loader_data; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1365 |
ConstantPool* _cp; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1366 |
ConstantPool* _scratch_cp; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1367 |
public: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1368 |
MergeCPCleaner(ClassLoaderData* loader_data, ConstantPool* merge_cp) : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1369 |
_loader_data(loader_data), _cp(merge_cp), _scratch_cp(NULL) {} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1370 |
~MergeCPCleaner() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1371 |
_loader_data->add_to_deallocate_list(_cp); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1372 |
if (_scratch_cp != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1373 |
_loader_data->add_to_deallocate_list(_scratch_cp); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1374 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1375 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1376 |
void add_scratch_cp(ConstantPool* scratch_cp) { _scratch_cp = scratch_cp; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1377 |
}; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1378 |
|
1 | 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. |
|
1894
5c343868d071
6692899: CMS: many vm.parallel_class_loading tests fail with assert "missing Printezis mark"
jmasa
parents:
1
diff
changeset
|
1391 |
// merge_cp is created unsafe for concurrent GC processing. It |
8296
b1c2163e4e59
6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents:
8076
diff
changeset
|
1392 |
// should be marked safe before discarding it. Even though |
b1c2163e4e59
6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents:
8076
diff
changeset
|
1393 |
// garbage, if it crosses a card boundary, it may be scanned |
1894
5c343868d071
6692899: CMS: many vm.parallel_class_loading tests fail with assert "missing Printezis mark"
jmasa
parents:
1
diff
changeset
|
1394 |
// in order to find the start of the first complete object on the card. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1395 |
ClassLoaderData* loader_data = the_class->class_loader_data(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1396 |
ConstantPool* merge_cp_oop = |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1397 |
ConstantPool::allocate(loader_data, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1398 |
merge_cp_length, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1399 |
THREAD); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1400 |
MergeCPCleaner cp_cleaner(loader_data, merge_cp_oop); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1401 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1402 |
HandleMark hm(THREAD); // make sure handles are cleared before |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1403 |
// MergeCPCleaner clears out merge_cp_oop |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1404 |
constantPoolHandle merge_cp(THREAD, merge_cp_oop); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1405 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1406 |
// Get constants() from the old class because it could have been rewritten |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1407 |
// while we were at a safepoint allocating a new constant pool. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1408 |
constantPoolHandle old_cp(THREAD, the_class->constants()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1409 |
constantPoolHandle scratch_cp(THREAD, scratch_class->constants()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1410 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1411 |
// If the length changed, the class was redefined out from under us. Return |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1412 |
// an error. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1413 |
if (merge_cp_length != the_class->constants()->length() |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1414 |
+ scratch_class->constants()->length()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1415 |
return JVMTI_ERROR_INTERNAL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1416 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1417 |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
1418 |
// Update the version number of the constant pool |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
1419 |
merge_cp->increment_and_save_version(old_cp->version()); |
1 | 1420 |
|
1421 |
ResourceMark rm(THREAD); |
|
1422 |
_index_map_count = 0; |
|
1423 |
_index_map_p = new intArray(scratch_cp->length(), -1); |
|
1424 |
||
17077
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1425 |
_operands_cur_length = ConstantPool::operand_array_length(old_cp->operands()); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1426 |
_operands_index_map_count = 0; |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1427 |
_operands_index_map_p = new intArray( |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1428 |
ConstantPool::operand_array_length(scratch_cp->operands()), -1); |
8607f7c33310
8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents:
17029
diff
changeset
|
1429 |
|
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1430 |
// reference to the cp holder is needed for copy_operands() |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1431 |
merge_cp->set_pool_holder(scratch_class()); |
1 | 1432 |
bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp, |
1433 |
&merge_cp_length, THREAD); |
|
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1434 |
merge_cp->set_pool_holder(NULL); |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
1435 |
|
1 | 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 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1457 |
// toss the merged constant pool at return |
1 | 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 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1466 |
// toss the merged constant pool at return |
1 | 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 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1474 |
// merged constant pool |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1475 |
set_new_constant_pool(loader_data, scratch_class, merge_cp, merge_cp_length, THREAD); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1476 |
// The new constant pool replaces scratch_cp so have cleaner clean it up. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1477 |
// It can't be cleaned up while there are handles to it. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1478 |
cp_cleaner.add_scratch_cp(scratch_cp()); |
1 | 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. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1505 |
set_new_constant_pool(loader_data, scratch_class, merge_cp, merge_cp_length, THREAD); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1506 |
// The new constant pool replaces scratch_cp so have cleaner clean it up. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1507 |
// It can't be cleaned up while there are handles to it. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1508 |
cp_cleaner.add_scratch_cp(scratch_cp()); |
1 | 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)) { |
|
2131 | 1521 |
// propagate failure back to caller |
1 | 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)) { |
|
2131 | 1527 |
// propagate failure back to caller |
1 | 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)) { |
|
2131 | 1533 |
// propagate failure back to caller |
1 | 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)) { |
|
2131 | 1539 |
// propagate failure back to caller |
1 | 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)) { |
|
2131 | 1546 |
// propagate failure back to caller |
1 | 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)) { |
|
2131 | 1553 |
// propagate failure back to caller |
1 | 1554 |
return false; |
1555 |
} |
|
1556 |
||
1557 |
return true; |
|
1558 |
} // end rewrite_cp_refs() |
|
1559 |
||
1560 |
// Rewrite constant pool references in the methods. |
|
1561 |
bool VM_RedefineClasses::rewrite_cp_refs_in_methods( |
|
1562 |
instanceKlassHandle scratch_class, TRAPS) { |
|
1563 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1564 |
Array<Method*>* methods = scratch_class->methods(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1565 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1566 |
if (methods == NULL || methods->length() == 0) { |
1 | 1567 |
// no methods so nothing to do |
1568 |
return true; |
|
1569 |
} |
|
1570 |
||
1571 |
// rewrite constant pool references in the methods: |
|
1572 |
for (int i = methods->length() - 1; i >= 0; i--) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1573 |
methodHandle method(THREAD, methods->at(i)); |
1 | 1574 |
methodHandle new_method; |
1575 |
rewrite_cp_refs_in_method(method, &new_method, CHECK_false); |
|
1576 |
if (!new_method.is_null()) { |
|
1577 |
// the method has been replaced so save the new method version |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1578 |
methods->at_put(i, new_method()); |
1 | 1579 |
} |
1580 |
} |
|
1581 |
||
1582 |
return true; |
|
1583 |
} |
|
1584 |
||
1585 |
||
1586 |
// Rewrite constant pool references in the specific method. This code |
|
1587 |
// was adapted from Rewriter::rewrite_method(). |
|
1588 |
void VM_RedefineClasses::rewrite_cp_refs_in_method(methodHandle method, |
|
1589 |
methodHandle *new_method_p, TRAPS) { |
|
1590 |
||
1591 |
*new_method_p = methodHandle(); // default is no new method |
|
1592 |
||
1593 |
// We cache a pointer to the bytecodes here in code_base. If GC |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1594 |
// moves the Method*, then the bytecodes will also move which |
1 | 1595 |
// will likely cause a crash. We create a No_Safepoint_Verifier |
1596 |
// object to detect whether we pass a possible safepoint in this |
|
1597 |
// code block. |
|
1598 |
No_Safepoint_Verifier nsv; |
|
1599 |
||
1600 |
// Bytecodes and their length |
|
1601 |
address code_base = method->code_base(); |
|
1602 |
int code_length = method->code_size(); |
|
1603 |
||
1604 |
int bc_length; |
|
1605 |
for (int bci = 0; bci < code_length; bci += bc_length) { |
|
1606 |
address bcp = code_base + bci; |
|
1607 |
Bytecodes::Code c = (Bytecodes::Code)(*bcp); |
|
1608 |
||
1609 |
bc_length = Bytecodes::length_for(c); |
|
1610 |
if (bc_length == 0) { |
|
1611 |
// More complicated bytecodes report a length of zero so |
|
1612 |
// we have to try again a slightly different way. |
|
7913 | 1613 |
bc_length = Bytecodes::length_at(method(), bcp); |
1 | 1614 |
} |
1615 |
||
1616 |
assert(bc_length != 0, "impossible bytecode length"); |
|
1617 |
||
1618 |
switch (c) { |
|
1619 |
case Bytecodes::_ldc: |
|
1620 |
{ |
|
1621 |
int cp_index = *(bcp + 1); |
|
1622 |
int new_index = find_new_index(cp_index); |
|
1623 |
||
1624 |
if (StressLdcRewrite && new_index == 0) { |
|
1625 |
// If we are stressing ldc -> ldc_w rewriting, then we |
|
1626 |
// always need a new_index value. |
|
1627 |
new_index = cp_index; |
|
1628 |
} |
|
1629 |
if (new_index != 0) { |
|
1630 |
// the original index is mapped so we have more work to do |
|
1631 |
if (!StressLdcRewrite && new_index <= max_jubyte) { |
|
1632 |
// The new value can still use ldc instead of ldc_w |
|
1633 |
// unless we are trying to stress ldc -> ldc_w rewriting |
|
1634 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
1635 |
("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c), |
|
1636 |
bcp, cp_index, new_index)); |
|
1637 |
*(bcp + 1) = new_index; |
|
1638 |
} else { |
|
1639 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
1640 |
("%s->ldc_w@" INTPTR_FORMAT " old=%d, new=%d", |
|
1641 |
Bytecodes::name(c), bcp, cp_index, new_index)); |
|
1642 |
// the new value needs ldc_w instead of ldc |
|
1643 |
u_char inst_buffer[4]; // max instruction size is 4 bytes |
|
1644 |
bcp = (address)inst_buffer; |
|
1645 |
// construct new instruction sequence |
|
1646 |
*bcp = Bytecodes::_ldc_w; |
|
1647 |
bcp++; |
|
1648 |
// Rewriter::rewrite_method() does not rewrite ldc -> ldc_w. |
|
1649 |
// See comment below for difference between put_Java_u2() |
|
1650 |
// and put_native_u2(). |
|
1651 |
Bytes::put_Java_u2(bcp, new_index); |
|
1652 |
||
1653 |
Relocator rc(method, NULL /* no RelocatorListener needed */); |
|
1654 |
methodHandle m; |
|
1655 |
{ |
|
1656 |
Pause_No_Safepoint_Verifier pnsv(&nsv); |
|
1657 |
||
1658 |
// ldc is 2 bytes and ldc_w is 3 bytes |
|
1659 |
m = rc.insert_space_at(bci, 3, inst_buffer, THREAD); |
|
1660 |
if (m.is_null() || HAS_PENDING_EXCEPTION) { |
|
1661 |
guarantee(false, "insert_space_at() failed"); |
|
1662 |
} |
|
1663 |
} |
|
1664 |
||
1665 |
// return the new method so that the caller can update |
|
1666 |
// the containing class |
|
1667 |
*new_method_p = method = m; |
|
1668 |
// switch our bytecode processing loop from the old method |
|
1669 |
// to the new method |
|
1670 |
code_base = method->code_base(); |
|
1671 |
code_length = method->code_size(); |
|
1672 |
bcp = code_base + bci; |
|
1673 |
c = (Bytecodes::Code)(*bcp); |
|
1674 |
bc_length = Bytecodes::length_for(c); |
|
1675 |
assert(bc_length != 0, "sanity check"); |
|
1676 |
} // end we need ldc_w instead of ldc |
|
1677 |
} // end if there is a mapped index |
|
1678 |
} break; |
|
1679 |
||
1680 |
// these bytecodes have a two-byte constant pool index |
|
1681 |
case Bytecodes::_anewarray : // fall through |
|
1682 |
case Bytecodes::_checkcast : // fall through |
|
1683 |
case Bytecodes::_getfield : // fall through |
|
1684 |
case Bytecodes::_getstatic : // fall through |
|
1685 |
case Bytecodes::_instanceof : // fall through |
|
15446
5ea56212959f
8006731: JSR 292: the VM_RedefineClasses::rewrite_cp_refs_in_method() must support invokedynamic
sspitsyn
parents:
15444
diff
changeset
|
1686 |
case Bytecodes::_invokedynamic : // fall through |
1 | 1687 |
case Bytecodes::_invokeinterface: // fall through |
1688 |
case Bytecodes::_invokespecial : // fall through |
|
1689 |
case Bytecodes::_invokestatic : // fall through |
|
1690 |
case Bytecodes::_invokevirtual : // fall through |
|
1691 |
case Bytecodes::_ldc_w : // fall through |
|
1692 |
case Bytecodes::_ldc2_w : // fall through |
|
1693 |
case Bytecodes::_multianewarray : // fall through |
|
1694 |
case Bytecodes::_new : // fall through |
|
1695 |
case Bytecodes::_putfield : // fall through |
|
1696 |
case Bytecodes::_putstatic : |
|
1697 |
{ |
|
1698 |
address p = bcp + 1; |
|
1699 |
int cp_index = Bytes::get_Java_u2(p); |
|
1700 |
int new_index = find_new_index(cp_index); |
|
1701 |
if (new_index != 0) { |
|
1702 |
// the original index is mapped so update w/ new value |
|
1703 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
1704 |
("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c), |
|
1705 |
bcp, cp_index, new_index)); |
|
1706 |
// Rewriter::rewrite_method() uses put_native_u2() in this |
|
1707 |
// situation because it is reusing the constant pool index |
|
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
1708 |
// location for a native index into the ConstantPoolCache. |
1 | 1709 |
// Since we are updating the constant pool index prior to |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
1710 |
// verification and ConstantPoolCache initialization, we |
1 | 1711 |
// need to keep the new index in Java byte order. |
1712 |
Bytes::put_Java_u2(p, new_index); |
|
1713 |
} |
|
1714 |
} break; |
|
1715 |
} |
|
1716 |
} // end for each bytecode |
|
15744
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1717 |
|
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1718 |
// We also need to rewrite the parameter name indexes, if there is |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1719 |
// method parameter data present |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1720 |
if(method->has_method_parameters()) { |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1721 |
const int len = method->method_parameters_length(); |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1722 |
MethodParametersElement* elem = method->method_parameters_start(); |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1723 |
|
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1724 |
for (int i = 0; i < len; i++) { |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1725 |
const u2 cp_index = elem[i].name_cp_index; |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1726 |
elem[i].name_cp_index = find_new_index(cp_index); |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1727 |
} |
fd58c7e770b3
8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents:
15601
diff
changeset
|
1728 |
} |
1 | 1729 |
} // end rewrite_cp_refs_in_method() |
1730 |
||
1731 |
||
1732 |
// Rewrite constant pool references in the class_annotations field. |
|
1733 |
bool VM_RedefineClasses::rewrite_cp_refs_in_class_annotations( |
|
1734 |
instanceKlassHandle scratch_class, TRAPS) { |
|
1735 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1736 |
AnnotationArray* class_annotations = scratch_class->class_annotations(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1737 |
if (class_annotations == NULL || class_annotations->length() == 0) { |
1 | 1738 |
// no class_annotations so nothing to do |
1739 |
return true; |
|
1740 |
} |
|
1741 |
||
1742 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1743 |
("class_annotations length=%d", class_annotations->length())); |
|
1744 |
||
1745 |
int byte_i = 0; // byte index into class_annotations |
|
1746 |
return rewrite_cp_refs_in_annotations_typeArray(class_annotations, byte_i, |
|
1747 |
THREAD); |
|
1748 |
} |
|
1749 |
||
1750 |
||
1751 |
// Rewrite constant pool references in an annotations typeArray. This |
|
1752 |
// "structure" is adapted from the RuntimeVisibleAnnotations_attribute |
|
1753 |
// that is described in section 4.8.15 of the 2nd-edition of the VM spec: |
|
1754 |
// |
|
1755 |
// annotations_typeArray { |
|
1756 |
// u2 num_annotations; |
|
1757 |
// annotation annotations[num_annotations]; |
|
1758 |
// } |
|
1759 |
// |
|
1760 |
bool VM_RedefineClasses::rewrite_cp_refs_in_annotations_typeArray( |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1761 |
AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) { |
1 | 1762 |
|
1763 |
if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
|
1764 |
// not enough room for num_annotations field |
|
1765 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1766 |
("length() is too small for num_annotations field")); |
|
1767 |
return false; |
|
1768 |
} |
|
1769 |
||
1770 |
u2 num_annotations = Bytes::get_Java_u2((address) |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1771 |
annotations_typeArray->adr_at(byte_i_ref)); |
1 | 1772 |
byte_i_ref += 2; |
1773 |
||
1774 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1775 |
("num_annotations=%d", num_annotations)); |
|
1776 |
||
1777 |
int calc_num_annotations = 0; |
|
1778 |
for (; calc_num_annotations < num_annotations; calc_num_annotations++) { |
|
1779 |
if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray, |
|
1780 |
byte_i_ref, THREAD)) { |
|
1781 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1782 |
("bad annotation_struct at %d", calc_num_annotations)); |
|
2131 | 1783 |
// propagate failure back to caller |
1 | 1784 |
return false; |
1785 |
} |
|
1786 |
} |
|
1787 |
assert(num_annotations == calc_num_annotations, "sanity check"); |
|
1788 |
||
1789 |
return true; |
|
1790 |
} // end rewrite_cp_refs_in_annotations_typeArray() |
|
1791 |
||
1792 |
||
1793 |
// Rewrite constant pool references in the annotation struct portion of |
|
1794 |
// an annotations_typeArray. This "structure" is from section 4.8.15 of |
|
1795 |
// the 2nd-edition of the VM spec: |
|
1796 |
// |
|
1797 |
// struct annotation { |
|
1798 |
// u2 type_index; |
|
1799 |
// u2 num_element_value_pairs; |
|
1800 |
// { |
|
1801 |
// u2 element_name_index; |
|
1802 |
// element_value value; |
|
1803 |
// } element_value_pairs[num_element_value_pairs]; |
|
1804 |
// } |
|
1805 |
// |
|
1806 |
bool VM_RedefineClasses::rewrite_cp_refs_in_annotation_struct( |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1807 |
AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) { |
1 | 1808 |
if ((byte_i_ref + 2 + 2) > annotations_typeArray->length()) { |
1809 |
// not enough room for smallest annotation_struct |
|
1810 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1811 |
("length() is too small for annotation_struct")); |
|
1812 |
return false; |
|
1813 |
} |
|
1814 |
||
1815 |
u2 type_index = rewrite_cp_ref_in_annotation_data(annotations_typeArray, |
|
1816 |
byte_i_ref, "mapped old type_index=%d", THREAD); |
|
1817 |
||
1818 |
u2 num_element_value_pairs = Bytes::get_Java_u2((address) |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1819 |
annotations_typeArray->adr_at(byte_i_ref)); |
1 | 1820 |
byte_i_ref += 2; |
1821 |
||
1822 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1823 |
("type_index=%d num_element_value_pairs=%d", type_index, |
|
1824 |
num_element_value_pairs)); |
|
1825 |
||
1826 |
int calc_num_element_value_pairs = 0; |
|
1827 |
for (; calc_num_element_value_pairs < num_element_value_pairs; |
|
1828 |
calc_num_element_value_pairs++) { |
|
1829 |
if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
|
1830 |
// not enough room for another element_name_index, let alone |
|
1831 |
// the rest of another component |
|
1832 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1833 |
("length() is too small for element_name_index")); |
|
1834 |
return false; |
|
1835 |
} |
|
1836 |
||
1837 |
u2 element_name_index = rewrite_cp_ref_in_annotation_data( |
|
1838 |
annotations_typeArray, byte_i_ref, |
|
1839 |
"mapped old element_name_index=%d", THREAD); |
|
1840 |
||
1841 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1842 |
("element_name_index=%d", element_name_index)); |
|
1843 |
||
1844 |
if (!rewrite_cp_refs_in_element_value(annotations_typeArray, |
|
1845 |
byte_i_ref, THREAD)) { |
|
1846 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1847 |
("bad element_value at %d", calc_num_element_value_pairs)); |
|
2131 | 1848 |
// propagate failure back to caller |
1 | 1849 |
return false; |
1850 |
} |
|
1851 |
} // end for each component |
|
1852 |
assert(num_element_value_pairs == calc_num_element_value_pairs, |
|
1853 |
"sanity check"); |
|
1854 |
||
1855 |
return true; |
|
1856 |
} // end rewrite_cp_refs_in_annotation_struct() |
|
1857 |
||
1858 |
||
1859 |
// Rewrite a constant pool reference at the current position in |
|
1860 |
// annotations_typeArray if needed. Returns the original constant |
|
1861 |
// pool reference if a rewrite was not needed or the new constant |
|
1862 |
// pool reference if a rewrite was needed. |
|
1863 |
u2 VM_RedefineClasses::rewrite_cp_ref_in_annotation_data( |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1864 |
AnnotationArray* annotations_typeArray, int &byte_i_ref, |
1 | 1865 |
const char * trace_mesg, TRAPS) { |
1866 |
||
1867 |
address cp_index_addr = (address) |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1868 |
annotations_typeArray->adr_at(byte_i_ref); |
1 | 1869 |
u2 old_cp_index = Bytes::get_Java_u2(cp_index_addr); |
1870 |
u2 new_cp_index = find_new_index(old_cp_index); |
|
1871 |
if (new_cp_index != 0) { |
|
1872 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, (trace_mesg, old_cp_index)); |
|
1873 |
Bytes::put_Java_u2(cp_index_addr, new_cp_index); |
|
1874 |
old_cp_index = new_cp_index; |
|
1875 |
} |
|
1876 |
byte_i_ref += 2; |
|
1877 |
return old_cp_index; |
|
1878 |
} |
|
1879 |
||
1880 |
||
1881 |
// Rewrite constant pool references in the element_value portion of an |
|
1882 |
// annotations_typeArray. This "structure" is from section 4.8.15.1 of |
|
1883 |
// the 2nd-edition of the VM spec: |
|
1884 |
// |
|
1885 |
// struct element_value { |
|
1886 |
// u1 tag; |
|
1887 |
// union { |
|
1888 |
// u2 const_value_index; |
|
1889 |
// { |
|
1890 |
// u2 type_name_index; |
|
1891 |
// u2 const_name_index; |
|
1892 |
// } enum_const_value; |
|
1893 |
// u2 class_info_index; |
|
1894 |
// annotation annotation_value; |
|
1895 |
// struct { |
|
1896 |
// u2 num_values; |
|
1897 |
// element_value values[num_values]; |
|
1898 |
// } array_value; |
|
1899 |
// } value; |
|
1900 |
// } |
|
1901 |
// |
|
1902 |
bool VM_RedefineClasses::rewrite_cp_refs_in_element_value( |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1903 |
AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) { |
1 | 1904 |
|
1905 |
if ((byte_i_ref + 1) > annotations_typeArray->length()) { |
|
1906 |
// not enough room for a tag let alone the rest of an element_value |
|
1907 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1908 |
("length() is too small for a tag")); |
|
1909 |
return false; |
|
1910 |
} |
|
1911 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
1912 |
u1 tag = annotations_typeArray->at(byte_i_ref); |
1 | 1913 |
byte_i_ref++; |
1914 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("tag='%c'", tag)); |
|
1915 |
||
1916 |
switch (tag) { |
|
1917 |
// These BaseType tag values are from Table 4.2 in VM spec: |
|
1918 |
case 'B': // byte |
|
1919 |
case 'C': // char |
|
1920 |
case 'D': // double |
|
1921 |
case 'F': // float |
|
1922 |
case 'I': // int |
|
1923 |
case 'J': // long |
|
1924 |
case 'S': // short |
|
1925 |
case 'Z': // boolean |
|
1926 |
||
1927 |
// The remaining tag values are from Table 4.8 in the 2nd-edition of |
|
1928 |
// the VM spec: |
|
1929 |
case 's': |
|
1930 |
{ |
|
1931 |
// For the above tag values (including the BaseType values), |
|
1932 |
// value.const_value_index is right union field. |
|
1933 |
||
1934 |
if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
|
1935 |
// not enough room for a const_value_index |
|
1936 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1937 |
("length() is too small for a const_value_index")); |
|
1938 |
return false; |
|
1939 |
} |
|
1940 |
||
1941 |
u2 const_value_index = rewrite_cp_ref_in_annotation_data( |
|
1942 |
annotations_typeArray, byte_i_ref, |
|
1943 |
"mapped old const_value_index=%d", THREAD); |
|
1944 |
||
1945 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1946 |
("const_value_index=%d", const_value_index)); |
|
1947 |
} break; |
|
1948 |
||
1949 |
case 'e': |
|
1950 |
{ |
|
1951 |
// for the above tag value, value.enum_const_value is right union field |
|
1952 |
||
1953 |
if ((byte_i_ref + 4) > annotations_typeArray->length()) { |
|
1954 |
// not enough room for a enum_const_value |
|
1955 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1956 |
("length() is too small for a enum_const_value")); |
|
1957 |
return false; |
|
1958 |
} |
|
1959 |
||
1960 |
u2 type_name_index = rewrite_cp_ref_in_annotation_data( |
|
1961 |
annotations_typeArray, byte_i_ref, |
|
1962 |
"mapped old type_name_index=%d", THREAD); |
|
1963 |
||
1964 |
u2 const_name_index = rewrite_cp_ref_in_annotation_data( |
|
1965 |
annotations_typeArray, byte_i_ref, |
|
1966 |
"mapped old const_name_index=%d", THREAD); |
|
1967 |
||
1968 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1969 |
("type_name_index=%d const_name_index=%d", type_name_index, |
|
1970 |
const_name_index)); |
|
1971 |
} break; |
|
1972 |
||
1973 |
case 'c': |
|
1974 |
{ |
|
1975 |
// for the above tag value, value.class_info_index is right union field |
|
1976 |
||
1977 |
if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
|
1978 |
// not enough room for a class_info_index |
|
1979 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1980 |
("length() is too small for a class_info_index")); |
|
1981 |
return false; |
|
1982 |
} |
|
1983 |
||
1984 |
u2 class_info_index = rewrite_cp_ref_in_annotation_data( |
|
1985 |
annotations_typeArray, byte_i_ref, |
|
1986 |
"mapped old class_info_index=%d", THREAD); |
|
1987 |
||
1988 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
1989 |
("class_info_index=%d", class_info_index)); |
|
1990 |
} break; |
|
1991 |
||
1992 |
case '@': |
|
1993 |
// For the above tag value, value.attr_value is the right union |
|
1994 |
// field. This is a nested annotation. |
|
1995 |
if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray, |
|
1996 |
byte_i_ref, THREAD)) { |
|
2131 | 1997 |
// propagate failure back to caller |
1 | 1998 |
return false; |
1999 |
} |
|
2000 |
break; |
|
2001 |
||
2002 |
case '[': |
|
2003 |
{ |
|
2004 |
if ((byte_i_ref + 2) > annotations_typeArray->length()) { |
|
2005 |
// not enough room for a num_values field |
|
2006 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2007 |
("length() is too small for a num_values field")); |
|
2008 |
return false; |
|
2009 |
} |
|
2010 |
||
2011 |
// For the above tag value, value.array_value is the right union |
|
2012 |
// field. This is an array of nested element_value. |
|
2013 |
u2 num_values = Bytes::get_Java_u2((address) |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2014 |
annotations_typeArray->adr_at(byte_i_ref)); |
1 | 2015 |
byte_i_ref += 2; |
2016 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("num_values=%d", num_values)); |
|
2017 |
||
2018 |
int calc_num_values = 0; |
|
2019 |
for (; calc_num_values < num_values; calc_num_values++) { |
|
2020 |
if (!rewrite_cp_refs_in_element_value( |
|
2021 |
annotations_typeArray, byte_i_ref, THREAD)) { |
|
2022 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2023 |
("bad nested element_value at %d", calc_num_values)); |
|
2131 | 2024 |
// propagate failure back to caller |
1 | 2025 |
return false; |
2026 |
} |
|
2027 |
} |
|
2028 |
assert(num_values == calc_num_values, "sanity check"); |
|
2029 |
} break; |
|
2030 |
||
2031 |
default: |
|
2032 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("bad tag=0x%x", tag)); |
|
2033 |
return false; |
|
2034 |
} // end decode tag field |
|
2035 |
||
2036 |
return true; |
|
2037 |
} // end rewrite_cp_refs_in_element_value() |
|
2038 |
||
2039 |
||
2040 |
// Rewrite constant pool references in a fields_annotations field. |
|
2041 |
bool VM_RedefineClasses::rewrite_cp_refs_in_fields_annotations( |
|
2042 |
instanceKlassHandle scratch_class, TRAPS) { |
|
2043 |
||
15601 | 2044 |
Array<AnnotationArray*>* fields_annotations = scratch_class->fields_annotations(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2045 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2046 |
if (fields_annotations == NULL || fields_annotations->length() == 0) { |
1 | 2047 |
// no fields_annotations so nothing to do |
2048 |
return true; |
|
2049 |
} |
|
2050 |
||
2051 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2052 |
("fields_annotations length=%d", fields_annotations->length())); |
|
2053 |
||
2054 |
for (int i = 0; i < fields_annotations->length(); i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2055 |
AnnotationArray* field_annotations = fields_annotations->at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2056 |
if (field_annotations == NULL || field_annotations->length() == 0) { |
1 | 2057 |
// this field does not have any annotations so skip it |
2058 |
continue; |
|
2059 |
} |
|
2060 |
||
2061 |
int byte_i = 0; // byte index into field_annotations |
|
2062 |
if (!rewrite_cp_refs_in_annotations_typeArray(field_annotations, byte_i, |
|
2063 |
THREAD)) { |
|
2064 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2065 |
("bad field_annotations at %d", i)); |
|
2131 | 2066 |
// propagate failure back to caller |
1 | 2067 |
return false; |
2068 |
} |
|
2069 |
} |
|
2070 |
||
2071 |
return true; |
|
2072 |
} // end rewrite_cp_refs_in_fields_annotations() |
|
2073 |
||
2074 |
||
2075 |
// Rewrite constant pool references in a methods_annotations field. |
|
2076 |
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_annotations( |
|
2077 |
instanceKlassHandle scratch_class, TRAPS) { |
|
2078 |
||
15601 | 2079 |
for (int i = 0; i < scratch_class->methods()->length(); i++) { |
2080 |
Method* m = scratch_class->methods()->at(i); |
|
2081 |
AnnotationArray* method_annotations = m->constMethod()->method_annotations(); |
|
2082 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2083 |
if (method_annotations == NULL || method_annotations->length() == 0) { |
1 | 2084 |
// this method does not have any annotations so skip it |
2085 |
continue; |
|
2086 |
} |
|
2087 |
||
2088 |
int byte_i = 0; // byte index into method_annotations |
|
2089 |
if (!rewrite_cp_refs_in_annotations_typeArray(method_annotations, byte_i, |
|
2090 |
THREAD)) { |
|
2091 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2092 |
("bad method_annotations at %d", i)); |
|
2131 | 2093 |
// propagate failure back to caller |
1 | 2094 |
return false; |
2095 |
} |
|
2096 |
} |
|
2097 |
||
2098 |
return true; |
|
2099 |
} // end rewrite_cp_refs_in_methods_annotations() |
|
2100 |
||
2101 |
||
2102 |
// Rewrite constant pool references in a methods_parameter_annotations |
|
2103 |
// field. This "structure" is adapted from the |
|
2104 |
// RuntimeVisibleParameterAnnotations_attribute described in section |
|
2105 |
// 4.8.17 of the 2nd-edition of the VM spec: |
|
2106 |
// |
|
2107 |
// methods_parameter_annotations_typeArray { |
|
2108 |
// u1 num_parameters; |
|
2109 |
// { |
|
2110 |
// u2 num_annotations; |
|
2111 |
// annotation annotations[num_annotations]; |
|
2112 |
// } parameter_annotations[num_parameters]; |
|
2113 |
// } |
|
2114 |
// |
|
2115 |
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_parameter_annotations( |
|
2116 |
instanceKlassHandle scratch_class, TRAPS) { |
|
2117 |
||
15601 | 2118 |
for (int i = 0; i < scratch_class->methods()->length(); i++) { |
2119 |
Method* m = scratch_class->methods()->at(i); |
|
2120 |
AnnotationArray* method_parameter_annotations = m->constMethod()->parameter_annotations(); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2121 |
if (method_parameter_annotations == NULL |
1 | 2122 |
|| method_parameter_annotations->length() == 0) { |
2123 |
// this method does not have any parameter annotations so skip it |
|
2124 |
continue; |
|
2125 |
} |
|
2126 |
||
2127 |
if (method_parameter_annotations->length() < 1) { |
|
2128 |
// not enough room for a num_parameters field |
|
2129 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2130 |
("length() is too small for a num_parameters field at %d", i)); |
|
2131 |
return false; |
|
2132 |
} |
|
2133 |
||
2134 |
int byte_i = 0; // byte index into method_parameter_annotations |
|
2135 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2136 |
u1 num_parameters = method_parameter_annotations->at(byte_i); |
1 | 2137 |
byte_i++; |
2138 |
||
2139 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2140 |
("num_parameters=%d", num_parameters)); |
|
2141 |
||
2142 |
int calc_num_parameters = 0; |
|
2143 |
for (; calc_num_parameters < num_parameters; calc_num_parameters++) { |
|
2144 |
if (!rewrite_cp_refs_in_annotations_typeArray( |
|
2145 |
method_parameter_annotations, byte_i, THREAD)) { |
|
2146 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2147 |
("bad method_parameter_annotations at %d", calc_num_parameters)); |
|
2131 | 2148 |
// propagate failure back to caller |
1 | 2149 |
return false; |
2150 |
} |
|
2151 |
} |
|
2152 |
assert(num_parameters == calc_num_parameters, "sanity check"); |
|
2153 |
} |
|
2154 |
||
2155 |
return true; |
|
2156 |
} // end rewrite_cp_refs_in_methods_parameter_annotations() |
|
2157 |
||
2158 |
||
2159 |
// Rewrite constant pool references in a methods_default_annotations |
|
2160 |
// field. This "structure" is adapted from the AnnotationDefault_attribute |
|
2161 |
// that is described in section 4.8.19 of the 2nd-edition of the VM spec: |
|
2162 |
// |
|
2163 |
// methods_default_annotations_typeArray { |
|
2164 |
// element_value default_value; |
|
2165 |
// } |
|
2166 |
// |
|
2167 |
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_default_annotations( |
|
2168 |
instanceKlassHandle scratch_class, TRAPS) { |
|
2169 |
||
15601 | 2170 |
for (int i = 0; i < scratch_class->methods()->length(); i++) { |
2171 |
Method* m = scratch_class->methods()->at(i); |
|
2172 |
AnnotationArray* method_default_annotations = m->constMethod()->default_annotations(); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2173 |
if (method_default_annotations == NULL |
1 | 2174 |
|| method_default_annotations->length() == 0) { |
2175 |
// this method does not have any default annotations so skip it |
|
2176 |
continue; |
|
2177 |
} |
|
2178 |
||
2179 |
int byte_i = 0; // byte index into method_default_annotations |
|
2180 |
||
2181 |
if (!rewrite_cp_refs_in_element_value( |
|
2182 |
method_default_annotations, byte_i, THREAD)) { |
|
2183 |
RC_TRACE_WITH_THREAD(0x02000000, THREAD, |
|
2184 |
("bad default element_value at %d", i)); |
|
2131 | 2185 |
// propagate failure back to caller |
1 | 2186 |
return false; |
2187 |
} |
|
2188 |
} |
|
2189 |
||
2190 |
return true; |
|
2191 |
} // end rewrite_cp_refs_in_methods_default_annotations() |
|
2192 |
||
2193 |
||
2194 |
// Rewrite constant pool references in the method's stackmap table. |
|
2195 |
// These "structures" are adapted from the StackMapTable_attribute that |
|
2196 |
// is described in section 4.8.4 of the 6.0 version of the VM spec |
|
2197 |
// (dated 2005.10.26): |
|
2198 |
// file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf |
|
2199 |
// |
|
2200 |
// stack_map { |
|
2201 |
// u2 number_of_entries; |
|
2202 |
// stack_map_frame entries[number_of_entries]; |
|
2203 |
// } |
|
2204 |
// |
|
2205 |
void VM_RedefineClasses::rewrite_cp_refs_in_stack_map_table( |
|
2206 |
methodHandle method, TRAPS) { |
|
2207 |
||
2208 |
if (!method->has_stackmap_table()) { |
|
2209 |
return; |
|
2210 |
} |
|
2211 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2212 |
AnnotationArray* stackmap_data = method->stackmap_data(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2213 |
address stackmap_p = (address)stackmap_data->adr_at(0); |
1 | 2214 |
address stackmap_end = stackmap_p + stackmap_data->length(); |
2215 |
||
2216 |
assert(stackmap_p + 2 <= stackmap_end, "no room for number_of_entries"); |
|
2217 |
u2 number_of_entries = Bytes::get_Java_u2(stackmap_p); |
|
2218 |
stackmap_p += 2; |
|
2219 |
||
2220 |
RC_TRACE_WITH_THREAD(0x04000000, THREAD, |
|
2221 |
("number_of_entries=%u", number_of_entries)); |
|
2222 |
||
2223 |
// walk through each stack_map_frame |
|
2224 |
u2 calc_number_of_entries = 0; |
|
2225 |
for (; calc_number_of_entries < number_of_entries; calc_number_of_entries++) { |
|
2226 |
// The stack_map_frame structure is a u1 frame_type followed by |
|
2227 |
// 0 or more bytes of data: |
|
2228 |
// |
|
2229 |
// union stack_map_frame { |
|
2230 |
// same_frame; |
|
2231 |
// same_locals_1_stack_item_frame; |
|
2232 |
// same_locals_1_stack_item_frame_extended; |
|
2233 |
// chop_frame; |
|
2234 |
// same_frame_extended; |
|
2235 |
// append_frame; |
|
2236 |
// full_frame; |
|
2237 |
// } |
|
2238 |
||
2239 |
assert(stackmap_p + 1 <= stackmap_end, "no room for frame_type"); |
|
2240 |
// The Linux compiler does not like frame_type to be u1 or u2. It |
|
2241 |
// issues the following warning for the first if-statement below: |
|
2242 |
// |
|
2243 |
// "warning: comparison is always true due to limited range of data type" |
|
2244 |
// |
|
2245 |
u4 frame_type = *stackmap_p; |
|
2246 |
stackmap_p++; |
|
2247 |
||
2248 |
// same_frame { |
|
2249 |
// u1 frame_type = SAME; /* 0-63 */ |
|
2250 |
// } |
|
2251 |
if (frame_type >= 0 && frame_type <= 63) { |
|
2252 |
// nothing more to do for same_frame |
|
2253 |
} |
|
2254 |
||
2255 |
// same_locals_1_stack_item_frame { |
|
2256 |
// u1 frame_type = SAME_LOCALS_1_STACK_ITEM; /* 64-127 */ |
|
2257 |
// verification_type_info stack[1]; |
|
2258 |
// } |
|
2259 |
else if (frame_type >= 64 && frame_type <= 127) { |
|
2260 |
rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
|
2261 |
calc_number_of_entries, frame_type, THREAD); |
|
2262 |
} |
|
2263 |
||
2264 |
// reserved for future use |
|
2265 |
else if (frame_type >= 128 && frame_type <= 246) { |
|
2266 |
// nothing more to do for reserved frame_types |
|
2267 |
} |
|
2268 |
||
2269 |
// same_locals_1_stack_item_frame_extended { |
|
2270 |
// u1 frame_type = SAME_LOCALS_1_STACK_ITEM_EXTENDED; /* 247 */ |
|
2271 |
// u2 offset_delta; |
|
2272 |
// verification_type_info stack[1]; |
|
2273 |
// } |
|
2274 |
else if (frame_type == 247) { |
|
2275 |
stackmap_p += 2; |
|
2276 |
rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
|
2277 |
calc_number_of_entries, frame_type, THREAD); |
|
2278 |
} |
|
2279 |
||
2280 |
// chop_frame { |
|
2281 |
// u1 frame_type = CHOP; /* 248-250 */ |
|
2282 |
// u2 offset_delta; |
|
2283 |
// } |
|
2284 |
else if (frame_type >= 248 && frame_type <= 250) { |
|
2285 |
stackmap_p += 2; |
|
2286 |
} |
|
2287 |
||
2288 |
// same_frame_extended { |
|
2289 |
// u1 frame_type = SAME_FRAME_EXTENDED; /* 251*/ |
|
2290 |
// u2 offset_delta; |
|
2291 |
// } |
|
2292 |
else if (frame_type == 251) { |
|
2293 |
stackmap_p += 2; |
|
2294 |
} |
|
2295 |
||
2296 |
// append_frame { |
|
2297 |
// u1 frame_type = APPEND; /* 252-254 */ |
|
2298 |
// u2 offset_delta; |
|
2299 |
// verification_type_info locals[frame_type - 251]; |
|
2300 |
// } |
|
2301 |
else if (frame_type >= 252 && frame_type <= 254) { |
|
2302 |
assert(stackmap_p + 2 <= stackmap_end, |
|
2303 |
"no room for offset_delta"); |
|
2304 |
stackmap_p += 2; |
|
2305 |
u1 len = frame_type - 251; |
|
2306 |
for (u1 i = 0; i < len; i++) { |
|
2307 |
rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
|
2308 |
calc_number_of_entries, frame_type, THREAD); |
|
2309 |
} |
|
2310 |
} |
|
2311 |
||
2312 |
// full_frame { |
|
2313 |
// u1 frame_type = FULL_FRAME; /* 255 */ |
|
2314 |
// u2 offset_delta; |
|
2315 |
// u2 number_of_locals; |
|
2316 |
// verification_type_info locals[number_of_locals]; |
|
2317 |
// u2 number_of_stack_items; |
|
2318 |
// verification_type_info stack[number_of_stack_items]; |
|
2319 |
// } |
|
2320 |
else if (frame_type == 255) { |
|
2321 |
assert(stackmap_p + 2 + 2 <= stackmap_end, |
|
2322 |
"no room for smallest full_frame"); |
|
2323 |
stackmap_p += 2; |
|
2324 |
||
2325 |
u2 number_of_locals = Bytes::get_Java_u2(stackmap_p); |
|
2326 |
stackmap_p += 2; |
|
2327 |
||
2328 |
for (u2 locals_i = 0; locals_i < number_of_locals; locals_i++) { |
|
2329 |
rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
|
2330 |
calc_number_of_entries, frame_type, THREAD); |
|
2331 |
} |
|
2332 |
||
2333 |
// Use the largest size for the number_of_stack_items, but only get |
|
2334 |
// the right number of bytes. |
|
2335 |
u2 number_of_stack_items = Bytes::get_Java_u2(stackmap_p); |
|
2336 |
stackmap_p += 2; |
|
2337 |
||
2338 |
for (u2 stack_i = 0; stack_i < number_of_stack_items; stack_i++) { |
|
2339 |
rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end, |
|
2340 |
calc_number_of_entries, frame_type, THREAD); |
|
2341 |
} |
|
2342 |
} |
|
2343 |
} // end while there is a stack_map_frame |
|
2344 |
assert(number_of_entries == calc_number_of_entries, "sanity check"); |
|
2345 |
} // end rewrite_cp_refs_in_stack_map_table() |
|
2346 |
||
2347 |
||
2348 |
// Rewrite constant pool references in the verification type info |
|
2349 |
// portion of the method's stackmap table. These "structures" are |
|
2350 |
// adapted from the StackMapTable_attribute that is described in |
|
2351 |
// section 4.8.4 of the 6.0 version of the VM spec (dated 2005.10.26): |
|
2352 |
// file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf |
|
2353 |
// |
|
2354 |
// The verification_type_info structure is a u1 tag followed by 0 or |
|
2355 |
// more bytes of data: |
|
2356 |
// |
|
2357 |
// union verification_type_info { |
|
2358 |
// Top_variable_info; |
|
2359 |
// Integer_variable_info; |
|
2360 |
// Float_variable_info; |
|
2361 |
// Long_variable_info; |
|
2362 |
// Double_variable_info; |
|
2363 |
// Null_variable_info; |
|
2364 |
// UninitializedThis_variable_info; |
|
2365 |
// Object_variable_info; |
|
2366 |
// Uninitialized_variable_info; |
|
2367 |
// } |
|
2368 |
// |
|
2369 |
void VM_RedefineClasses::rewrite_cp_refs_in_verification_type_info( |
|
2370 |
address& stackmap_p_ref, address stackmap_end, u2 frame_i, |
|
2371 |
u1 frame_type, TRAPS) { |
|
2372 |
||
2373 |
assert(stackmap_p_ref + 1 <= stackmap_end, "no room for tag"); |
|
2374 |
u1 tag = *stackmap_p_ref; |
|
2375 |
stackmap_p_ref++; |
|
2376 |
||
2377 |
switch (tag) { |
|
2378 |
// Top_variable_info { |
|
2379 |
// u1 tag = ITEM_Top; /* 0 */ |
|
2380 |
// } |
|
2381 |
// verificationType.hpp has zero as ITEM_Bogus instead of ITEM_Top |
|
2382 |
case 0: // fall through |
|
2383 |
||
2384 |
// Integer_variable_info { |
|
2385 |
// u1 tag = ITEM_Integer; /* 1 */ |
|
2386 |
// } |
|
2387 |
case ITEM_Integer: // fall through |
|
2388 |
||
2389 |
// Float_variable_info { |
|
2390 |
// u1 tag = ITEM_Float; /* 2 */ |
|
2391 |
// } |
|
2392 |
case ITEM_Float: // fall through |
|
2393 |
||
2394 |
// Double_variable_info { |
|
2395 |
// u1 tag = ITEM_Double; /* 3 */ |
|
2396 |
// } |
|
2397 |
case ITEM_Double: // fall through |
|
2398 |
||
2399 |
// Long_variable_info { |
|
2400 |
// u1 tag = ITEM_Long; /* 4 */ |
|
2401 |
// } |
|
2402 |
case ITEM_Long: // fall through |
|
2403 |
||
2404 |
// Null_variable_info { |
|
2405 |
// u1 tag = ITEM_Null; /* 5 */ |
|
2406 |
// } |
|
2407 |
case ITEM_Null: // fall through |
|
2408 |
||
2409 |
// UninitializedThis_variable_info { |
|
2410 |
// u1 tag = ITEM_UninitializedThis; /* 6 */ |
|
2411 |
// } |
|
2412 |
case ITEM_UninitializedThis: |
|
2413 |
// nothing more to do for the above tag types |
|
2414 |
break; |
|
2415 |
||
2416 |
// Object_variable_info { |
|
2417 |
// u1 tag = ITEM_Object; /* 7 */ |
|
2418 |
// u2 cpool_index; |
|
2419 |
// } |
|
2420 |
case ITEM_Object: |
|
2421 |
{ |
|
2422 |
assert(stackmap_p_ref + 2 <= stackmap_end, "no room for cpool_index"); |
|
2423 |
u2 cpool_index = Bytes::get_Java_u2(stackmap_p_ref); |
|
2424 |
u2 new_cp_index = find_new_index(cpool_index); |
|
2425 |
if (new_cp_index != 0) { |
|
2426 |
RC_TRACE_WITH_THREAD(0x04000000, THREAD, |
|
2427 |
("mapped old cpool_index=%d", cpool_index)); |
|
2428 |
Bytes::put_Java_u2(stackmap_p_ref, new_cp_index); |
|
2429 |
cpool_index = new_cp_index; |
|
2430 |
} |
|
2431 |
stackmap_p_ref += 2; |
|
2432 |
||
2433 |
RC_TRACE_WITH_THREAD(0x04000000, THREAD, |
|
2434 |
("frame_i=%u, frame_type=%u, cpool_index=%d", frame_i, |
|
2435 |
frame_type, cpool_index)); |
|
2436 |
} break; |
|
2437 |
||
2438 |
// Uninitialized_variable_info { |
|
2439 |
// u1 tag = ITEM_Uninitialized; /* 8 */ |
|
2440 |
// u2 offset; |
|
2441 |
// } |
|
2442 |
case ITEM_Uninitialized: |
|
2443 |
assert(stackmap_p_ref + 2 <= stackmap_end, "no room for offset"); |
|
2444 |
stackmap_p_ref += 2; |
|
2445 |
break; |
|
2446 |
||
2447 |
default: |
|
2448 |
RC_TRACE_WITH_THREAD(0x04000000, THREAD, |
|
2449 |
("frame_i=%u, frame_type=%u, bad tag=0x%x", frame_i, frame_type, tag)); |
|
2450 |
ShouldNotReachHere(); |
|
2451 |
break; |
|
2452 |
} // end switch (tag) |
|
2453 |
} // end rewrite_cp_refs_in_verification_type_info() |
|
2454 |
||
2455 |
||
2456 |
// Change the constant pool associated with klass scratch_class to |
|
2457 |
// scratch_cp. If shrink is true, then scratch_cp_length elements |
|
2458 |
// are copied from scratch_cp to a smaller constant pool and the |
|
2459 |
// smaller constant pool is associated with scratch_class. |
|
2460 |
void VM_RedefineClasses::set_new_constant_pool( |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2461 |
ClassLoaderData* loader_data, |
1 | 2462 |
instanceKlassHandle scratch_class, constantPoolHandle scratch_cp, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2463 |
int scratch_cp_length, TRAPS) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2464 |
assert(scratch_cp->length() >= scratch_cp_length, "sanity check"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2465 |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2466 |
// scratch_cp is a merged constant pool and has enough space for a |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2467 |
// worst case merge situation. We want to associate the minimum |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2468 |
// sized constant pool with the klass to save space. |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2469 |
constantPoolHandle smaller_cp(THREAD, |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2470 |
ConstantPool::allocate(loader_data, scratch_cp_length, THREAD)); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2471 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2472 |
// preserve version() value in the smaller copy |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2473 |
int version = scratch_cp->version(); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2474 |
assert(version != 0, "sanity check"); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2475 |
smaller_cp->set_version(version); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2476 |
|
15433
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
2477 |
// attach klass to new constant pool |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
2478 |
// reference to the cp holder is needed for copy_operands() |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
2479 |
smaller_cp->set_pool_holder(scratch_class()); |
0f53fd973576
8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents:
15430
diff
changeset
|
2480 |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2481 |
scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15099
diff
changeset
|
2482 |
scratch_cp = smaller_cp; |
1 | 2483 |
|
2484 |
// attach new constant pool to klass |
|
2485 |
scratch_class->set_constants(scratch_cp()); |
|
2486 |
||
2487 |
int i; // for portability |
|
2488 |
||
2489 |
// update each field in klass to use new constant pool indices as needed |
|
10546 | 2490 |
for (JavaFieldStream fs(scratch_class); !fs.done(); fs.next()) { |
2491 |
jshort cur_index = fs.name_index(); |
|
1 | 2492 |
jshort new_index = find_new_index(cur_index); |
2493 |
if (new_index != 0) { |
|
2494 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2495 |
("field-name_index change: %d to %d", cur_index, new_index)); |
|
10546 | 2496 |
fs.set_name_index(new_index); |
1 | 2497 |
} |
10546 | 2498 |
cur_index = fs.signature_index(); |
1 | 2499 |
new_index = find_new_index(cur_index); |
2500 |
if (new_index != 0) { |
|
2501 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2502 |
("field-signature_index change: %d to %d", cur_index, new_index)); |
|
10546 | 2503 |
fs.set_signature_index(new_index); |
1 | 2504 |
} |
10546 | 2505 |
cur_index = fs.initval_index(); |
1 | 2506 |
new_index = find_new_index(cur_index); |
2507 |
if (new_index != 0) { |
|
2508 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2509 |
("field-initval_index change: %d to %d", cur_index, new_index)); |
|
10546 | 2510 |
fs.set_initval_index(new_index); |
1 | 2511 |
} |
10546 | 2512 |
cur_index = fs.generic_signature_index(); |
1 | 2513 |
new_index = find_new_index(cur_index); |
2514 |
if (new_index != 0) { |
|
2515 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2516 |
("field-generic_signature change: %d to %d", cur_index, new_index)); |
|
10546 | 2517 |
fs.set_generic_signature_index(new_index); |
1 | 2518 |
} |
2519 |
} // end for each field |
|
2520 |
||
2521 |
// Update constant pool indices in the inner classes info to use |
|
2522 |
// new constant indices as needed. The inner classes info is a |
|
2523 |
// quadruple: |
|
2524 |
// (inner_class_info, outer_class_info, inner_name, inner_access_flags) |
|
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2525 |
InnerClassesIterator iter(scratch_class); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2526 |
for (; !iter.done(); iter.next()) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2527 |
int cur_index = iter.inner_class_info_index(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2528 |
if (cur_index == 0) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2529 |
continue; // JVM spec. allows null inner class refs so skip it |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2530 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2531 |
int new_index = find_new_index(cur_index); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2532 |
if (new_index != 0) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2533 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2534 |
("inner_class_info change: %d to %d", cur_index, new_index)); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2535 |
iter.set_inner_class_info_index(new_index); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2536 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2537 |
cur_index = iter.outer_class_info_index(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2538 |
new_index = find_new_index(cur_index); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2539 |
if (new_index != 0) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2540 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2541 |
("outer_class_info change: %d to %d", cur_index, new_index)); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2542 |
iter.set_outer_class_info_index(new_index); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2543 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2544 |
cur_index = iter.inner_name_index(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2545 |
new_index = find_new_index(cur_index); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2546 |
if (new_index != 0) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2547 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2548 |
("inner_name change: %d to %d", cur_index, new_index)); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2549 |
iter.set_inner_name_index(new_index); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2550 |
} |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
11399
diff
changeset
|
2551 |
} // end for each inner class |
1 | 2552 |
|
2553 |
// Attach each method in klass to the new constant pool and update |
|
2554 |
// to use new constant pool indices as needed: |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2555 |
Array<Method*>* methods = scratch_class->methods(); |
1 | 2556 |
for (i = methods->length() - 1; i >= 0; i--) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2557 |
methodHandle method(THREAD, methods->at(i)); |
1 | 2558 |
method->set_constants(scratch_cp()); |
2559 |
||
2560 |
int new_index = find_new_index(method->name_index()); |
|
2561 |
if (new_index != 0) { |
|
2562 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2563 |
("method-name_index change: %d to %d", method->name_index(), |
|
2564 |
new_index)); |
|
2565 |
method->set_name_index(new_index); |
|
2566 |
} |
|
2567 |
new_index = find_new_index(method->signature_index()); |
|
2568 |
if (new_index != 0) { |
|
2569 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2570 |
("method-signature_index change: %d to %d", |
|
2571 |
method->signature_index(), new_index)); |
|
2572 |
method->set_signature_index(new_index); |
|
2573 |
} |
|
2574 |
new_index = find_new_index(method->generic_signature_index()); |
|
2575 |
if (new_index != 0) { |
|
2576 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2577 |
("method-generic_signature_index change: %d to %d", |
|
2578 |
method->generic_signature_index(), new_index)); |
|
2579 |
method->set_generic_signature_index(new_index); |
|
2580 |
} |
|
2581 |
||
2582 |
// Update constant pool indices in the method's checked exception |
|
2583 |
// table to use new constant indices as needed. |
|
2584 |
int cext_length = method->checked_exceptions_length(); |
|
2585 |
if (cext_length > 0) { |
|
2586 |
CheckedExceptionElement * cext_table = |
|
2587 |
method->checked_exceptions_start(); |
|
2588 |
for (int j = 0; j < cext_length; j++) { |
|
2589 |
int cur_index = cext_table[j].class_cp_index; |
|
2590 |
int new_index = find_new_index(cur_index); |
|
2591 |
if (new_index != 0) { |
|
2592 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2593 |
("cext-class_cp_index change: %d to %d", cur_index, new_index)); |
|
2594 |
cext_table[j].class_cp_index = (u2)new_index; |
|
2595 |
} |
|
2596 |
} // end for each checked exception table entry |
|
2597 |
} // end if there are checked exception table entries |
|
2598 |
||
2599 |
// Update each catch type index in the method's exception table |
|
2600 |
// to use new constant pool indices as needed. The exception table |
|
2601 |
// holds quadruple entries of the form: |
|
2602 |
// (beg_bci, end_bci, handler_bci, klass_index) |
|
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12231
diff
changeset
|
2603 |
|
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12231
diff
changeset
|
2604 |
ExceptionTable ex_table(method()); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12231
diff
changeset
|
2605 |
int ext_length = ex_table.length(); |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12231
diff
changeset
|
2606 |
|
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12231
diff
changeset
|
2607 |
for (int j = 0; j < ext_length; j ++) { |
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12231
diff
changeset
|
2608 |
int cur_index = ex_table.catch_type_index(j); |
1 | 2609 |
int new_index = find_new_index(cur_index); |
2610 |
if (new_index != 0) { |
|
2611 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2612 |
("ext-klass_index change: %d to %d", cur_index, new_index)); |
|
13282
9872915dd78d
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents:
12231
diff
changeset
|
2613 |
ex_table.set_catch_type_index(j, new_index); |
1 | 2614 |
} |
2615 |
} // end for each exception table entry |
|
2616 |
||
2617 |
// Update constant pool indices in the method's local variable |
|
2618 |
// table to use new constant indices as needed. The local variable |
|
2619 |
// table hold sextuple entries of the form: |
|
2620 |
// (start_pc, length, name_index, descriptor_index, signature_index, slot) |
|
2621 |
int lvt_length = method->localvariable_table_length(); |
|
2622 |
if (lvt_length > 0) { |
|
2623 |
LocalVariableTableElement * lv_table = |
|
2624 |
method->localvariable_table_start(); |
|
2625 |
for (int j = 0; j < lvt_length; j++) { |
|
2626 |
int cur_index = lv_table[j].name_cp_index; |
|
2627 |
int new_index = find_new_index(cur_index); |
|
2628 |
if (new_index != 0) { |
|
2629 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2630 |
("lvt-name_cp_index change: %d to %d", cur_index, new_index)); |
|
2631 |
lv_table[j].name_cp_index = (u2)new_index; |
|
2632 |
} |
|
2633 |
cur_index = lv_table[j].descriptor_cp_index; |
|
2634 |
new_index = find_new_index(cur_index); |
|
2635 |
if (new_index != 0) { |
|
2636 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2637 |
("lvt-descriptor_cp_index change: %d to %d", cur_index, |
|
2638 |
new_index)); |
|
2639 |
lv_table[j].descriptor_cp_index = (u2)new_index; |
|
2640 |
} |
|
2641 |
cur_index = lv_table[j].signature_cp_index; |
|
2642 |
new_index = find_new_index(cur_index); |
|
2643 |
if (new_index != 0) { |
|
2644 |
RC_TRACE_WITH_THREAD(0x00080000, THREAD, |
|
2645 |
("lvt-signature_cp_index change: %d to %d", cur_index, new_index)); |
|
2646 |
lv_table[j].signature_cp_index = (u2)new_index; |
|
2647 |
} |
|
2648 |
} // end for each local variable table entry |
|
2649 |
} // end if there are local variable table entries |
|
2650 |
||
2651 |
rewrite_cp_refs_in_stack_map_table(method, THREAD); |
|
2652 |
} // end for each method |
|
2653 |
} // end set_new_constant_pool() |
|
2654 |
||
2655 |
||
2656 |
// Unevolving classes may point to methods of the_class directly |
|
2657 |
// from their constant pool caches, itables, and/or vtables. We |
|
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2658 |
// use the ClassLoaderDataGraph::classes_do() facility and this helper |
1 | 2659 |
// to fix up these pointers. |
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2660 |
|
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2661 |
// Adjust cpools and vtables closure |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2662 |
void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2663 |
|
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2664 |
// This is a very busy routine. We don't want too much tracing |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2665 |
// printed out. |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2666 |
bool trace_name_printed = false; |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2667 |
|
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2668 |
// Very noisy: only enable this call if you are trying to determine |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2669 |
// that a specific class gets found by this routine. |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2670 |
// RC_TRACE macro has an embedded ResourceMark |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2671 |
// RC_TRACE_WITH_THREAD(0x00100000, THREAD, |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2672 |
// ("adjust check: name=%s", k->external_name())); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2673 |
// trace_name_printed = true; |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2674 |
|
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2675 |
// If the class being redefined is java.lang.Object, we need to fix all |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2676 |
// array class vtables also |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2677 |
if (k->oop_is_array() && _the_class_oop == SystemDictionary::Object_klass()) { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2678 |
k->vtable()->adjust_method_entries(_matching_old_methods, |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2679 |
_matching_new_methods, |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2680 |
_matching_methods_length, |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2681 |
&trace_name_printed); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2682 |
} else if (k->oop_is_instance()) { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2683 |
HandleMark hm(_thread); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2684 |
InstanceKlass *ik = InstanceKlass::cast(k); |
1 | 2685 |
|
2686 |
// HotSpot specific optimization! HotSpot does not currently |
|
2687 |
// support delegation from the bootstrap class loader to a |
|
2688 |
// user-defined class loader. This means that if the bootstrap |
|
2689 |
// class loader is the initiating class loader, then it will also |
|
2690 |
// be the defining class loader. This also means that classes |
|
2691 |
// loaded by the bootstrap class loader cannot refer to classes |
|
2692 |
// loaded by a user-defined class loader. Note: a user-defined |
|
2693 |
// class loader can delegate to the bootstrap class loader. |
|
2694 |
// |
|
2695 |
// If the current class being redefined has a user-defined class |
|
2696 |
// loader as its defining class loader, then we can skip all |
|
2697 |
// classes loaded by the bootstrap class loader. |
|
2698 |
bool is_user_defined = |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2699 |
InstanceKlass::cast(_the_class_oop)->class_loader() != NULL; |
1 | 2700 |
if (is_user_defined && ik->class_loader() == NULL) { |
2701 |
return; |
|
2702 |
} |
|
2703 |
||
2704 |
// Fix the vtable embedded in the_class and subclasses of the_class, |
|
2705 |
// if one exists. We discard scratch_class and we don't keep an |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2706 |
// InstanceKlass around to hold obsolete methods so we don't have |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2707 |
// any other InstanceKlass embedded vtables to update. The vtable |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2708 |
// holds the Method*s for virtual (but not final) methods. |
1 | 2709 |
if (ik->vtable_length() > 0 && ik->is_subtype_of(_the_class_oop)) { |
2710 |
// ik->vtable() creates a wrapper object; rm cleans it up |
|
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2711 |
ResourceMark rm(_thread); |
1 | 2712 |
ik->vtable()->adjust_method_entries(_matching_old_methods, |
2713 |
_matching_new_methods, |
|
2714 |
_matching_methods_length, |
|
2715 |
&trace_name_printed); |
|
2716 |
} |
|
2717 |
||
2718 |
// If the current class has an itable and we are either redefining an |
|
2719 |
// interface or if the current class is a subclass of the_class, then |
|
2720 |
// we potentially have to fix the itable. If we are redefining an |
|
2721 |
// interface, then we have to call adjust_method_entries() for |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2722 |
// every InstanceKlass that has an itable since there isn't a |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2723 |
// subclass relationship between an interface and an InstanceKlass. |
14488 | 2724 |
if (ik->itable_length() > 0 && (_the_class_oop->is_interface() |
1 | 2725 |
|| ik->is_subclass_of(_the_class_oop))) { |
2726 |
// ik->itable() creates a wrapper object; rm cleans it up |
|
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2727 |
ResourceMark rm(_thread); |
1 | 2728 |
ik->itable()->adjust_method_entries(_matching_old_methods, |
2729 |
_matching_new_methods, |
|
2730 |
_matching_methods_length, |
|
2731 |
&trace_name_printed); |
|
2732 |
} |
|
2733 |
||
2734 |
// The constant pools in other classes (other_cp) can refer to |
|
2735 |
// methods in the_class. We have to update method information in |
|
2736 |
// other_cp's cache. If other_cp has a previous version, then we |
|
2737 |
// have to repeat the process for each previous version. The |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2738 |
// constant pool cache holds the Method*s for non-virtual |
1 | 2739 |
// methods and for virtual, final methods. |
2740 |
// |
|
2741 |
// Special case: if the current class is the_class, then new_cp |
|
2742 |
// has already been attached to the_class and old_cp has already |
|
2743 |
// been added as a previous version. The new_cp doesn't have any |
|
2744 |
// cached references to old methods so it doesn't need to be |
|
2745 |
// updated. We can simply start with the previous version(s) in |
|
2746 |
// that case. |
|
2747 |
constantPoolHandle other_cp; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2748 |
ConstantPoolCache* cp_cache; |
1 | 2749 |
|
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2750 |
if (ik != _the_class_oop) { |
1 | 2751 |
// this klass' constant pool cache may need adjustment |
2752 |
other_cp = constantPoolHandle(ik->constants()); |
|
2753 |
cp_cache = other_cp->cache(); |
|
2754 |
if (cp_cache != NULL) { |
|
2755 |
cp_cache->adjust_method_entries(_matching_old_methods, |
|
2756 |
_matching_new_methods, |
|
2757 |
_matching_methods_length, |
|
2758 |
&trace_name_printed); |
|
2759 |
} |
|
2760 |
} |
|
2761 |
{ |
|
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
2762 |
ResourceMark rm(_thread); |
1 | 2763 |
// PreviousVersionInfo objects returned via PreviousVersionWalker |
2764 |
// contain a GrowableArray of handles. We have to clean up the |
|
2765 |
// GrowableArray _after_ the PreviousVersionWalker destructor |
|
2766 |
// has destroyed the handles. |
|
2767 |
{ |
|
2768 |
// the previous versions' constant pool caches may need adjustment |
|
2769 |
PreviousVersionWalker pvw(ik); |
|
2770 |
for (PreviousVersionInfo * pv_info = pvw.next_previous_version(); |
|
2771 |
pv_info != NULL; pv_info = pvw.next_previous_version()) { |
|
2772 |
other_cp = pv_info->prev_constant_pool_handle(); |
|
2773 |
cp_cache = other_cp->cache(); |
|
2774 |
if (cp_cache != NULL) { |
|
2775 |
cp_cache->adjust_method_entries(_matching_old_methods, |
|
2776 |
_matching_new_methods, |
|
2777 |
_matching_methods_length, |
|
2778 |
&trace_name_printed); |
|
2779 |
} |
|
2780 |
} |
|
2781 |
} // pvw is cleaned up |
|
2782 |
} // rm is cleaned up |
|
2783 |
} |
|
2784 |
} |
|
2785 |
||
2786 |
void VM_RedefineClasses::update_jmethod_ids() { |
|
2787 |
for (int j = 0; j < _matching_methods_length; ++j) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2788 |
Method* old_method = _matching_old_methods[j]; |
1 | 2789 |
jmethodID jmid = old_method->find_jmethod_id_or_null(); |
2790 |
if (jmid != NULL) { |
|
2791 |
// There is a jmethodID, change it to point to the new method |
|
2792 |
methodHandle new_method_h(_matching_new_methods[j]); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2793 |
Method::change_method_associated_with_jmethod_id(jmid, new_method_h()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2794 |
assert(Method::resolve_jmethod_id(jmid) == _matching_new_methods[j], |
1 | 2795 |
"should be replaced"); |
2796 |
} |
|
2797 |
} |
|
2798 |
} |
|
2799 |
||
2800 |
void VM_RedefineClasses::check_methods_and_mark_as_obsolete( |
|
2801 |
BitMap *emcp_methods, int * emcp_method_count_p) { |
|
2802 |
*emcp_method_count_p = 0; |
|
2803 |
int obsolete_count = 0; |
|
2804 |
int old_index = 0; |
|
2805 |
for (int j = 0; j < _matching_methods_length; ++j, ++old_index) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2806 |
Method* old_method = _matching_old_methods[j]; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2807 |
Method* new_method = _matching_new_methods[j]; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2808 |
Method* old_array_method; |
1 | 2809 |
|
2810 |
// Maintain an old_index into the _old_methods array by skipping |
|
2811 |
// deleted methods |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2812 |
while ((old_array_method = _old_methods->at(old_index)) != old_method) { |
1 | 2813 |
++old_index; |
2814 |
} |
|
2815 |
||
2816 |
if (MethodComparator::methods_EMCP(old_method, new_method)) { |
|
2817 |
// The EMCP definition from JSR-163 requires the bytecodes to be |
|
2818 |
// the same with the exception of constant pool indices which may |
|
2819 |
// differ. However, the constants referred to by those indices |
|
2820 |
// must be the same. |
|
2821 |
// |
|
2822 |
// We use methods_EMCP() for comparison since constant pool |
|
2823 |
// merging can remove duplicate constant pool entries that were |
|
2824 |
// present in the old method and removed from the rewritten new |
|
2825 |
// method. A faster binary comparison function would consider the |
|
2826 |
// old and new methods to be different when they are actually |
|
2827 |
// EMCP. |
|
2828 |
// |
|
2829 |
// The old and new methods are EMCP and you would think that we |
|
2830 |
// could get rid of one of them here and now and save some space. |
|
2831 |
// However, the concept of EMCP only considers the bytecodes and |
|
2832 |
// the constant pool entries in the comparison. Other things, |
|
2833 |
// e.g., the line number table (LNT) or the local variable table |
|
2834 |
// (LVT) don't count in the comparison. So the new (and EMCP) |
|
2835 |
// method can have a new LNT that we need so we can't just |
|
2836 |
// overwrite the new method with the old method. |
|
2837 |
// |
|
2838 |
// When this routine is called, we have already attached the new |
|
2839 |
// methods to the_class so the old methods are effectively |
|
2840 |
// overwritten. However, if an old method is still executing, |
|
2841 |
// then the old method cannot be collected until sometime after |
|
2842 |
// the old method call has returned. So the overwriting of old |
|
2843 |
// methods by new methods will save us space except for those |
|
2844 |
// (hopefully few) old methods that are still executing. |
|
2845 |
// |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2846 |
// A method refers to a ConstMethod* and this presents another |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2847 |
// possible avenue to space savings. The ConstMethod* in the |
1 | 2848 |
// new method contains possibly new attributes (LNT, LVT, etc). |
2849 |
// At first glance, it seems possible to save space by replacing |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2850 |
// the ConstMethod* in the old method with the ConstMethod* |
1 | 2851 |
// from the new method. The old and new methods would share the |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2852 |
// same ConstMethod* and we would save the space occupied by |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2853 |
// the old ConstMethod*. However, the ConstMethod* contains |
1 | 2854 |
// a back reference to the containing method. Sharing the |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2855 |
// ConstMethod* between two methods could lead to confusion in |
1 | 2856 |
// the code that uses the back reference. This would lead to |
2857 |
// brittle code that could be broken in non-obvious ways now or |
|
2858 |
// in the future. |
|
2859 |
// |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2860 |
// Another possibility is to copy the ConstMethod* from the new |
1 | 2861 |
// method to the old method and then overwrite the new method with |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2862 |
// the old method. Since the ConstMethod* contains the bytecodes |
1 | 2863 |
// for the method embedded in the oop, this option would change |
2864 |
// the bytecodes out from under any threads executing the old |
|
2865 |
// method and make the thread's bcp invalid. Since EMCP requires |
|
2866 |
// that the bytecodes be the same modulo constant pool indices, it |
|
2867 |
// is straight forward to compute the correct new bcp in the new |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2868 |
// ConstMethod* from the old bcp in the old ConstMethod*. The |
1 | 2869 |
// time consuming part would be searching all the frames in all |
2870 |
// of the threads to find all of the calls to the old method. |
|
2871 |
// |
|
2872 |
// It looks like we will have to live with the limited savings |
|
2873 |
// that we get from effectively overwriting the old methods |
|
2874 |
// when the new methods are attached to the_class. |
|
2875 |
||
2876 |
// track which methods are EMCP for add_previous_version() call |
|
2877 |
emcp_methods->set_bit(old_index); |
|
2878 |
(*emcp_method_count_p)++; |
|
2879 |
||
2880 |
// An EMCP method is _not_ obsolete. An obsolete method has a |
|
2881 |
// different jmethodID than the current method. An EMCP method |
|
2882 |
// has the same jmethodID as the current method. Having the |
|
2883 |
// same jmethodID for all EMCP versions of a method allows for |
|
2884 |
// a consistent view of the EMCP methods regardless of which |
|
2885 |
// EMCP method you happen to have in hand. For example, a |
|
2886 |
// breakpoint set in one EMCP method will work for all EMCP |
|
2887 |
// versions of the method including the current one. |
|
2888 |
} else { |
|
2889 |
// mark obsolete methods as such |
|
2890 |
old_method->set_is_obsolete(); |
|
2891 |
obsolete_count++; |
|
2892 |
||
2893 |
// obsolete methods need a unique idnum |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2894 |
u2 num = InstanceKlass::cast(_the_class_oop)->next_method_idnum(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2895 |
if (num != ConstMethod::UNSET_IDNUM) { |
1 | 2896 |
// u2 old_num = old_method->method_idnum(); |
2897 |
old_method->set_method_idnum(num); |
|
2898 |
// TO DO: attach obsolete annotations to obsolete method's new idnum |
|
2899 |
} |
|
2900 |
// With tracing we try not to "yack" too much. The position of |
|
2901 |
// this trace assumes there are fewer obsolete methods than |
|
2902 |
// EMCP methods. |
|
2903 |
RC_TRACE(0x00000100, ("mark %s(%s) as obsolete", |
|
2904 |
old_method->name()->as_C_string(), |
|
2905 |
old_method->signature()->as_C_string())); |
|
2906 |
} |
|
2907 |
old_method->set_is_old(); |
|
2908 |
} |
|
2909 |
for (int i = 0; i < _deleted_methods_length; ++i) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2910 |
Method* old_method = _deleted_methods[i]; |
1 | 2911 |
|
2912 |
assert(old_method->vtable_index() < 0, |
|
2913 |
"cannot delete methods with vtable entries");; |
|
2914 |
||
2915 |
// Mark all deleted methods as old and obsolete |
|
2916 |
old_method->set_is_old(); |
|
2917 |
old_method->set_is_obsolete(); |
|
2918 |
++obsolete_count; |
|
2919 |
// With tracing we try not to "yack" too much. The position of |
|
2920 |
// this trace assumes there are fewer obsolete methods than |
|
2921 |
// EMCP methods. |
|
2922 |
RC_TRACE(0x00000100, ("mark deleted %s(%s) as obsolete", |
|
2923 |
old_method->name()->as_C_string(), |
|
2924 |
old_method->signature()->as_C_string())); |
|
2925 |
} |
|
2926 |
assert((*emcp_method_count_p + obsolete_count) == _old_methods->length(), |
|
2927 |
"sanity check"); |
|
2928 |
RC_TRACE(0x00000100, ("EMCP_cnt=%d, obsolete_cnt=%d", *emcp_method_count_p, |
|
2929 |
obsolete_count)); |
|
2930 |
} |
|
2931 |
||
2932 |
// This internal class transfers the native function registration from old methods |
|
2933 |
// to new methods. It is designed to handle both the simple case of unchanged |
|
2934 |
// native methods and the complex cases of native method prefixes being added and/or |
|
2935 |
// removed. |
|
2936 |
// It expects only to be used during the VM_RedefineClasses op (a safepoint). |
|
2937 |
// |
|
2938 |
// This class is used after the new methods have been installed in "the_class". |
|
2939 |
// |
|
2940 |
// So, for example, the following must be handled. Where 'm' is a method and |
|
2941 |
// a number followed by an underscore is a prefix. |
|
2942 |
// |
|
2943 |
// Old Name New Name |
|
2944 |
// Simple transfer to new method m -> m |
|
2945 |
// Add prefix m -> 1_m |
|
2946 |
// Remove prefix 1_m -> m |
|
2947 |
// Simultaneous add of prefixes m -> 3_2_1_m |
|
2948 |
// Simultaneous removal of prefixes 3_2_1_m -> m |
|
2949 |
// Simultaneous add and remove 1_m -> 2_m |
|
2950 |
// Same, caused by prefix removal only 3_2_1_m -> 3_2_m |
|
2951 |
// |
|
2952 |
class TransferNativeFunctionRegistration { |
|
2953 |
private: |
|
2954 |
instanceKlassHandle the_class; |
|
2955 |
int prefix_count; |
|
2956 |
char** prefixes; |
|
2957 |
||
2958 |
// Recursively search the binary tree of possibly prefixed method names. |
|
2959 |
// Iteration could be used if all agents were well behaved. Full tree walk is |
|
2960 |
// more resilent to agents not cleaning up intermediate methods. |
|
2961 |
// Branch at each depth in the binary tree is: |
|
2962 |
// (1) without the prefix. |
|
2963 |
// (2) with the prefix. |
|
2964 |
// where 'prefix' is the prefix at that 'depth' (first prefix, second prefix,...) |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
2965 |
Method* search_prefix_name_space(int depth, char* name_str, size_t name_len, |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7913
diff
changeset
|
2966 |
Symbol* signature) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7913
diff
changeset
|
2967 |
TempNewSymbol name_symbol = SymbolTable::probe(name_str, (int)name_len); |
1 | 2968 |
if (name_symbol != NULL) { |
14488 | 2969 |
Method* method = the_class()->lookup_method(name_symbol, signature); |
1 | 2970 |
if (method != NULL) { |
2971 |
// Even if prefixed, intermediate methods must exist. |
|
2972 |
if (method->is_native()) { |
|
2973 |
// Wahoo, we found a (possibly prefixed) version of the method, return it. |
|
2974 |
return method; |
|
2975 |
} |
|
2976 |
if (depth < prefix_count) { |
|
2977 |
// Try applying further prefixes (other than this one). |
|
2978 |
method = search_prefix_name_space(depth+1, name_str, name_len, signature); |
|
2979 |
if (method != NULL) { |
|
2980 |
return method; // found |
|
2981 |
} |
|
2982 |
||
2983 |
// Try adding this prefix to the method name and see if it matches |
|
2984 |
// another method name. |
|
2985 |
char* prefix = prefixes[depth]; |
|
2986 |
size_t prefix_len = strlen(prefix); |
|
2987 |
size_t trial_len = name_len + prefix_len; |
|
2988 |
char* trial_name_str = NEW_RESOURCE_ARRAY(char, trial_len + 1); |
|
2989 |
strcpy(trial_name_str, prefix); |
|
2990 |
strcat(trial_name_str, name_str); |
|
2991 |
method = search_prefix_name_space(depth+1, trial_name_str, trial_len, |
|
2992 |
signature); |
|
2993 |
if (method != NULL) { |
|
2994 |
// If found along this branch, it was prefixed, mark as such |
|
2995 |
method->set_is_prefixed_native(); |
|
2996 |
return method; // found |
|
2997 |
} |
|
2998 |
} |
|
2999 |
} |
|
3000 |
} |
|
3001 |
return NULL; // This whole branch bore nothing |
|
3002 |
} |
|
3003 |
||
3004 |
// Return the method name with old prefixes stripped away. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3005 |
char* method_name_without_prefixes(Method* method) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7913
diff
changeset
|
3006 |
Symbol* name = method->name(); |
1 | 3007 |
char* name_str = name->as_utf8(); |
3008 |
||
3009 |
// Old prefixing may be defunct, strip prefixes, if any. |
|
3010 |
for (int i = prefix_count-1; i >= 0; i--) { |
|
3011 |
char* prefix = prefixes[i]; |
|
3012 |
size_t prefix_len = strlen(prefix); |
|
3013 |
if (strncmp(prefix, name_str, prefix_len) == 0) { |
|
3014 |
name_str += prefix_len; |
|
3015 |
} |
|
3016 |
} |
|
3017 |
return name_str; |
|
3018 |
} |
|
3019 |
||
3020 |
// Strip any prefixes off the old native method, then try to find a |
|
3021 |
// (possibly prefixed) new native that matches it. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3022 |
Method* strip_and_search_for_new_native(Method* method) { |
1 | 3023 |
ResourceMark rm; |
3024 |
char* name_str = method_name_without_prefixes(method); |
|
3025 |
return search_prefix_name_space(0, name_str, strlen(name_str), |
|
3026 |
method->signature()); |
|
3027 |
} |
|
3028 |
||
3029 |
public: |
|
3030 |
||
3031 |
// Construct a native method transfer processor for this class. |
|
3032 |
TransferNativeFunctionRegistration(instanceKlassHandle _the_class) { |
|
3033 |
assert(SafepointSynchronize::is_at_safepoint(), "sanity check"); |
|
3034 |
||
3035 |
the_class = _the_class; |
|
3036 |
prefixes = JvmtiExport::get_all_native_method_prefixes(&prefix_count); |
|
3037 |
} |
|
3038 |
||
3039 |
// Attempt to transfer any of the old or deleted methods that are native |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3040 |
void transfer_registrations(Method** old_methods, int methods_length) { |
1 | 3041 |
for (int j = 0; j < methods_length; j++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3042 |
Method* old_method = old_methods[j]; |
1 | 3043 |
|
3044 |
if (old_method->is_native() && old_method->has_native_function()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3045 |
Method* new_method = strip_and_search_for_new_native(old_method); |
1 | 3046 |
if (new_method != NULL) { |
3047 |
// Actually set the native function in the new method. |
|
3048 |
// Redefine does not send events (except CFLH), certainly not this |
|
3049 |
// behind the scenes re-registration. |
|
3050 |
new_method->set_native_function(old_method->native_function(), |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3051 |
!Method::native_bind_event_is_interesting); |
1 | 3052 |
} |
3053 |
} |
|
3054 |
} |
|
3055 |
} |
|
3056 |
}; |
|
3057 |
||
3058 |
// Don't lose the association between a native method and its JNI function. |
|
3059 |
void VM_RedefineClasses::transfer_old_native_function_registrations(instanceKlassHandle the_class) { |
|
3060 |
TransferNativeFunctionRegistration transfer(the_class); |
|
3061 |
transfer.transfer_registrations(_deleted_methods, _deleted_methods_length); |
|
3062 |
transfer.transfer_registrations(_matching_old_methods, _matching_methods_length); |
|
3063 |
} |
|
3064 |
||
3065 |
// Deoptimize all compiled code that depends on this class. |
|
3066 |
// |
|
3067 |
// If the can_redefine_classes capability is obtained in the onload |
|
3068 |
// phase then the compiler has recorded all dependencies from startup. |
|
3069 |
// In that case we need only deoptimize and throw away all compiled code |
|
3070 |
// that depends on the class. |
|
3071 |
// |
|
3072 |
// If can_redefine_classes is obtained sometime after the onload |
|
3073 |
// phase then the dependency information may be incomplete. In that case |
|
3074 |
// the first call to RedefineClasses causes all compiled code to be |
|
3075 |
// thrown away. As can_redefine_classes has been obtained then |
|
3076 |
// all future compilations will record dependencies so second and |
|
3077 |
// subsequent calls to RedefineClasses need only throw away code |
|
3078 |
// that depends on the class. |
|
3079 |
// |
|
3080 |
void VM_RedefineClasses::flush_dependent_code(instanceKlassHandle k_h, TRAPS) { |
|
3081 |
assert_locked_or_safepoint(Compile_lock); |
|
3082 |
||
3083 |
// All dependencies have been recorded from startup or this is a second or |
|
3084 |
// subsequent use of RedefineClasses |
|
3085 |
if (JvmtiExport::all_dependencies_are_recorded()) { |
|
3086 |
Universe::flush_evol_dependents_on(k_h); |
|
3087 |
} else { |
|
3088 |
CodeCache::mark_all_nmethods_for_deoptimization(); |
|
3089 |
||
3090 |
ResourceMark rm(THREAD); |
|
3091 |
DeoptimizationMarker dm; |
|
3092 |
||
3093 |
// Deoptimize all activations depending on marked nmethods |
|
3094 |
Deoptimization::deoptimize_dependents(); |
|
3095 |
||
3096 |
// Make the dependent methods not entrant (in VM_Deoptimize they are made zombies) |
|
3097 |
CodeCache::make_marked_nmethods_not_entrant(); |
|
3098 |
||
3099 |
// From now on we know that the dependency information is complete |
|
3100 |
JvmtiExport::set_all_dependencies_are_recorded(true); |
|
3101 |
} |
|
3102 |
} |
|
3103 |
||
3104 |
void VM_RedefineClasses::compute_added_deleted_matching_methods() { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3105 |
Method* old_method; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3106 |
Method* new_method; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3107 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3108 |
_matching_old_methods = NEW_RESOURCE_ARRAY(Method*, _old_methods->length()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3109 |
_matching_new_methods = NEW_RESOURCE_ARRAY(Method*, _old_methods->length()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3110 |
_added_methods = NEW_RESOURCE_ARRAY(Method*, _new_methods->length()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3111 |
_deleted_methods = NEW_RESOURCE_ARRAY(Method*, _old_methods->length()); |
1 | 3112 |
|
3113 |
_matching_methods_length = 0; |
|
3114 |
_deleted_methods_length = 0; |
|
3115 |
_added_methods_length = 0; |
|
3116 |
||
3117 |
int nj = 0; |
|
3118 |
int oj = 0; |
|
3119 |
while (true) { |
|
3120 |
if (oj >= _old_methods->length()) { |
|
3121 |
if (nj >= _new_methods->length()) { |
|
3122 |
break; // we've looked at everything, done |
|
3123 |
} |
|
3124 |
// New method at the end |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3125 |
new_method = _new_methods->at(nj); |
1 | 3126 |
_added_methods[_added_methods_length++] = new_method; |
3127 |
++nj; |
|
3128 |
} else if (nj >= _new_methods->length()) { |
|
3129 |
// Old method, at the end, is deleted |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3130 |
old_method = _old_methods->at(oj); |
1 | 3131 |
_deleted_methods[_deleted_methods_length++] = old_method; |
3132 |
++oj; |
|
3133 |
} else { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3134 |
old_method = _old_methods->at(oj); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3135 |
new_method = _new_methods->at(nj); |
1 | 3136 |
if (old_method->name() == new_method->name()) { |
3137 |
if (old_method->signature() == new_method->signature()) { |
|
3138 |
_matching_old_methods[_matching_methods_length ] = old_method; |
|
3139 |
_matching_new_methods[_matching_methods_length++] = new_method; |
|
3140 |
++nj; |
|
3141 |
++oj; |
|
3142 |
} else { |
|
3143 |
// added overloaded have already been moved to the end, |
|
3144 |
// so this is a deleted overloaded method |
|
3145 |
_deleted_methods[_deleted_methods_length++] = old_method; |
|
3146 |
++oj; |
|
3147 |
} |
|
3148 |
} else { // names don't match |
|
3149 |
if (old_method->name()->fast_compare(new_method->name()) > 0) { |
|
3150 |
// new method |
|
3151 |
_added_methods[_added_methods_length++] = new_method; |
|
3152 |
++nj; |
|
3153 |
} else { |
|
3154 |
// deleted method |
|
3155 |
_deleted_methods[_deleted_methods_length++] = old_method; |
|
3156 |
++oj; |
|
3157 |
} |
|
3158 |
} |
|
3159 |
} |
|
3160 |
} |
|
3161 |
assert(_matching_methods_length + _deleted_methods_length == _old_methods->length(), "sanity"); |
|
3162 |
assert(_matching_methods_length + _added_methods_length == _new_methods->length(), "sanity"); |
|
3163 |
} |
|
3164 |
||
3165 |
||
15601 | 3166 |
void VM_RedefineClasses::swap_annotations(instanceKlassHandle the_class, |
3167 |
instanceKlassHandle scratch_class) { |
|
3168 |
// Since there is currently no rewriting of type annotations indexes |
|
3169 |
// into the CP, we null out type annotations on scratch_class before |
|
3170 |
// we swap annotations with the_class rather than facing the |
|
3171 |
// possibility of shipping annotations with broken indexes to |
|
3172 |
// Java-land. |
|
3173 |
ClassLoaderData* loader_data = scratch_class->class_loader_data(); |
|
3174 |
AnnotationArray* new_class_type_annotations = scratch_class->class_type_annotations(); |
|
3175 |
if (new_class_type_annotations != NULL) { |
|
3176 |
MetadataFactory::free_array<u1>(loader_data, new_class_type_annotations); |
|
3177 |
scratch_class->annotations()->set_class_type_annotations(NULL); |
|
3178 |
} |
|
3179 |
Array<AnnotationArray*>* new_field_type_annotations = scratch_class->fields_type_annotations(); |
|
3180 |
if (new_field_type_annotations != NULL) { |
|
3181 |
Annotations::free_contents(loader_data, new_field_type_annotations); |
|
3182 |
scratch_class->annotations()->set_fields_type_annotations(NULL); |
|
3183 |
} |
|
3184 |
||
3185 |
// Swap annotation fields values |
|
3186 |
Annotations* old_annotations = the_class->annotations(); |
|
3187 |
the_class->set_annotations(scratch_class->annotations()); |
|
3188 |
scratch_class->set_annotations(old_annotations); |
|
3189 |
} |
|
3190 |
||
1 | 3191 |
|
3192 |
// Install the redefinition of a class: |
|
3193 |
// - house keeping (flushing breakpoints and caches, deoptimizing |
|
3194 |
// dependent compiled code) |
|
3195 |
// - replacing parts in the_class with parts from scratch_class |
|
3196 |
// - adding a weak reference to track the obsolete but interesting |
|
3197 |
// parts of the_class |
|
3198 |
// - adjusting constant pool caches and vtables in other classes |
|
3199 |
// that refer to methods in the_class. These adjustments use the |
|
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3200 |
// ClassLoaderDataGraph::classes_do() facility which only allows |
1 | 3201 |
// a helper method to be specified. The interesting parameters |
3202 |
// that we would like to pass to the helper method are saved in |
|
3203 |
// static global fields in the VM operation. |
|
3204 |
void VM_RedefineClasses::redefine_single_class(jclass the_jclass, |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3205 |
Klass* scratch_class_oop, TRAPS) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3206 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3207 |
HandleMark hm(THREAD); // make sure handles from this call are freed |
1 | 3208 |
RC_TIMER_START(_timer_rsc_phase1); |
3209 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3210 |
instanceKlassHandle scratch_class(scratch_class_oop); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3211 |
|
1 | 3212 |
oop the_class_mirror = JNIHandles::resolve_non_null(the_jclass); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3213 |
Klass* the_class_oop = java_lang_Class::as_Klass(the_class_mirror); |
1 | 3214 |
instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop); |
3215 |
||
3216 |
// Remove all breakpoints in methods of this class |
|
3217 |
JvmtiBreakpoints& jvmti_breakpoints = JvmtiCurrentBreakpoints::get_jvmti_breakpoints(); |
|
3218 |
jvmti_breakpoints.clearall_in_class_at_safepoint(the_class_oop); |
|
3219 |
||
3220 |
if (the_class_oop == Universe::reflect_invoke_cache()->klass()) { |
|
3221 |
// We are redefining java.lang.reflect.Method. Method.invoke() is |
|
3222 |
// cached and users of the cache care about each active version of |
|
3223 |
// the method so we have to track this previous version. |
|
3224 |
// Do this before methods get switched |
|
3225 |
Universe::reflect_invoke_cache()->add_previous_version( |
|
3226 |
the_class->method_with_idnum(Universe::reflect_invoke_cache()->method_idnum())); |
|
3227 |
} |
|
3228 |
||
3229 |
// Deoptimize all compiled code that depends on this class |
|
3230 |
flush_dependent_code(the_class, THREAD); |
|
3231 |
||
3232 |
_old_methods = the_class->methods(); |
|
3233 |
_new_methods = scratch_class->methods(); |
|
3234 |
_the_class_oop = the_class_oop; |
|
3235 |
compute_added_deleted_matching_methods(); |
|
3236 |
update_jmethod_ids(); |
|
3237 |
||
3238 |
// Attach new constant pool to the original klass. The original |
|
3239 |
// klass still refers to the old constant pool (for now). |
|
3240 |
scratch_class->constants()->set_pool_holder(the_class()); |
|
3241 |
||
3242 |
#if 0 |
|
3243 |
// In theory, with constant pool merging in place we should be able |
|
3244 |
// to save space by using the new, merged constant pool in place of |
|
3245 |
// the old constant pool(s). By "pool(s)" I mean the constant pool in |
|
3246 |
// the klass version we are replacing now and any constant pool(s) in |
|
3247 |
// previous versions of klass. Nice theory, doesn't work in practice. |
|
3248 |
// When this code is enabled, even simple programs throw NullPointer |
|
3249 |
// exceptions. I'm guessing that this is caused by some constant pool |
|
3250 |
// cache difference between the new, merged constant pool and the |
|
3251 |
// constant pool that was just being used by the klass. I'm keeping |
|
3252 |
// this code around to archive the idea, but the code has to remain |
|
3253 |
// disabled for now. |
|
3254 |
||
3255 |
// Attach each old method to the new constant pool. This can be |
|
3256 |
// done here since we are past the bytecode verification and |
|
3257 |
// constant pool optimization phases. |
|
3258 |
for (int i = _old_methods->length() - 1; i >= 0; i--) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3259 |
Method* method = _old_methods->at(i); |
1 | 3260 |
method->set_constants(scratch_class->constants()); |
3261 |
} |
|
3262 |
||
3263 |
{ |
|
3264 |
// walk all previous versions of the klass |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3265 |
InstanceKlass *ik = (InstanceKlass *)the_class(); |
1 | 3266 |
PreviousVersionWalker pvw(ik); |
3267 |
instanceKlassHandle ikh; |
|
3268 |
do { |
|
3269 |
ikh = pvw.next_previous_version(); |
|
3270 |
if (!ikh.is_null()) { |
|
3271 |
ik = ikh(); |
|
3272 |
||
3273 |
// attach previous version of klass to the new constant pool |
|
3274 |
ik->set_constants(scratch_class->constants()); |
|
3275 |
||
3276 |
// Attach each method in the previous version of klass to the |
|
3277 |
// new constant pool |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3278 |
Array<Method*>* prev_methods = ik->methods(); |
1 | 3279 |
for (int i = prev_methods->length() - 1; i >= 0; i--) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3280 |
Method* method = prev_methods->at(i); |
1 | 3281 |
method->set_constants(scratch_class->constants()); |
3282 |
} |
|
3283 |
} |
|
3284 |
} while (!ikh.is_null()); |
|
3285 |
} |
|
3286 |
#endif |
|
3287 |
||
3288 |
// Replace methods and constantpool |
|
3289 |
the_class->set_methods(_new_methods); |
|
3290 |
scratch_class->set_methods(_old_methods); // To prevent potential GCing of the old methods, |
|
3291 |
// and to be able to undo operation easily. |
|
3292 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3293 |
ConstantPool* old_constants = the_class->constants(); |
1 | 3294 |
the_class->set_constants(scratch_class->constants()); |
3295 |
scratch_class->set_constants(old_constants); // See the previous comment. |
|
3296 |
#if 0 |
|
3297 |
// We are swapping the guts of "the new class" with the guts of "the |
|
3298 |
// class". Since the old constant pool has just been attached to "the |
|
3299 |
// new class", it seems logical to set the pool holder in the old |
|
3300 |
// constant pool also. However, doing this will change the observable |
|
3301 |
// class hierarchy for any old methods that are still executing. A |
|
3302 |
// method can query the identity of its "holder" and this query uses |
|
3303 |
// the method's constant pool link to find the holder. The change in |
|
3304 |
// holding class from "the class" to "the new class" can confuse |
|
3305 |
// things. |
|
3306 |
// |
|
3307 |
// Setting the old constant pool's holder will also cause |
|
3308 |
// verification done during vtable initialization below to fail. |
|
3309 |
// During vtable initialization, the vtable's class is verified to be |
|
3310 |
// a subtype of the method's holder. The vtable's class is "the |
|
3311 |
// class" and the method's holder is gotten from the constant pool |
|
3312 |
// link in the method itself. For "the class"'s directly implemented |
|
3313 |
// methods, the method holder is "the class" itself (as gotten from |
|
3314 |
// the new constant pool). The check works fine in this case. The |
|
3315 |
// check also works fine for methods inherited from super classes. |
|
3316 |
// |
|
3317 |
// Miranda methods are a little more complicated. A miranda method is |
|
3318 |
// provided by an interface when the class implementing the interface |
|
3319 |
// does not provide its own method. These interfaces are implemented |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3320 |
// internally as an InstanceKlass. These special instanceKlasses |
1 | 3321 |
// share the constant pool of the class that "implements" the |
3322 |
// interface. By sharing the constant pool, the method holder of a |
|
3323 |
// miranda method is the class that "implements" the interface. In a |
|
3324 |
// non-redefine situation, the subtype check works fine. However, if |
|
3325 |
// the old constant pool's pool holder is modified, then the check |
|
3326 |
// fails because there is no class hierarchy relationship between the |
|
3327 |
// vtable's class and "the new class". |
|
3328 |
||
3329 |
old_constants->set_pool_holder(scratch_class()); |
|
3330 |
#endif |
|
3331 |
||
3332 |
// track which methods are EMCP for add_previous_version() call below |
|
3333 |
BitMap emcp_methods(_old_methods->length()); |
|
3334 |
int emcp_method_count = 0; |
|
3335 |
emcp_methods.clear(); // clears 0..(length() - 1) |
|
3336 |
check_methods_and_mark_as_obsolete(&emcp_methods, &emcp_method_count); |
|
3337 |
transfer_old_native_function_registrations(the_class); |
|
3338 |
||
3339 |
// The class file bytes from before any retransformable agents mucked |
|
3340 |
// with them was cached on the scratch class, move to the_class. |
|
3341 |
// Note: we still want to do this if nothing needed caching since it |
|
3342 |
// should get cleared in the_class too. |
|
11399
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3343 |
if (the_class->get_cached_class_file_bytes() == 0) { |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3344 |
// the_class doesn't have a cache yet so copy it |
18940
d39d4765e6cb
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
17864
diff
changeset
|
3345 |
the_class->set_cached_class_file(scratch_class->get_cached_class_file()); |
11399
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3346 |
} |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3347 |
#ifndef PRODUCT |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3348 |
else { |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3349 |
assert(the_class->get_cached_class_file_bytes() == |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3350 |
scratch_class->get_cached_class_file_bytes(), "cache ptrs must match"); |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3351 |
assert(the_class->get_cached_class_file_len() == |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3352 |
scratch_class->get_cached_class_file_len(), "cache lens must match"); |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3353 |
} |
5dd5c4dd4b7d
7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents:
10546
diff
changeset
|
3354 |
#endif |
1 | 3355 |
|
17357
98206e5df09e
8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents:
17077
diff
changeset
|
3356 |
// NULL out in scratch class to not delete twice. The class to be redefined |
98206e5df09e
8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents:
17077
diff
changeset
|
3357 |
// always owns these bytes. |
18940
d39d4765e6cb
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
17864
diff
changeset
|
3358 |
scratch_class->set_cached_class_file(NULL); |
17357
98206e5df09e
8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents:
17077
diff
changeset
|
3359 |
|
1 | 3360 |
// Replace inner_classes |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3361 |
Array<u2>* old_inner_classes = the_class->inner_classes(); |
1 | 3362 |
the_class->set_inner_classes(scratch_class->inner_classes()); |
3363 |
scratch_class->set_inner_classes(old_inner_classes); |
|
3364 |
||
3365 |
// Initialize the vtable and interface table after |
|
3366 |
// methods have been rewritten |
|
3367 |
{ |
|
3368 |
ResourceMark rm(THREAD); |
|
3369 |
// no exception should happen here since we explicitly |
|
3370 |
// do not check loader constraints. |
|
3371 |
// compare_and_normalize_class_versions has already checked: |
|
3372 |
// - classloaders unchanged, signatures unchanged |
|
3373 |
// - all instanceKlasses for redefined classes reused & contents updated |
|
3374 |
the_class->vtable()->initialize_vtable(false, THREAD); |
|
3375 |
the_class->itable()->initialize_itable(false, THREAD); |
|
4571 | 3376 |
assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())), "redefine exception"); |
1 | 3377 |
} |
3378 |
||
3379 |
// Leave arrays of jmethodIDs and itable index cache unchanged |
|
3380 |
||
3381 |
// Copy the "source file name" attribute from new class version |
|
3382 |
the_class->set_source_file_name(scratch_class->source_file_name()); |
|
3383 |
||
3384 |
// Copy the "source debug extension" attribute from new class version |
|
3385 |
the_class->set_source_debug_extension( |
|
13201
69f157caabcc
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
13195
diff
changeset
|
3386 |
scratch_class->source_debug_extension(), |
69f157caabcc
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
13195
diff
changeset
|
3387 |
scratch_class->source_debug_extension() == NULL ? 0 : |
69f157caabcc
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
13195
diff
changeset
|
3388 |
(int)strlen(scratch_class->source_debug_extension())); |
1 | 3389 |
|
3390 |
// Use of javac -g could be different in the old and the new |
|
3391 |
if (scratch_class->access_flags().has_localvariable_table() != |
|
3392 |
the_class->access_flags().has_localvariable_table()) { |
|
3393 |
||
3394 |
AccessFlags flags = the_class->access_flags(); |
|
3395 |
if (scratch_class->access_flags().has_localvariable_table()) { |
|
3396 |
flags.set_has_localvariable_table(); |
|
3397 |
} else { |
|
3398 |
flags.clear_has_localvariable_table(); |
|
3399 |
} |
|
3400 |
the_class->set_access_flags(flags); |
|
3401 |
} |
|
3402 |
||
15601 | 3403 |
swap_annotations(the_class, scratch_class); |
1 | 3404 |
|
3405 |
// Replace minor version number of class file |
|
3406 |
u2 old_minor_version = the_class->minor_version(); |
|
3407 |
the_class->set_minor_version(scratch_class->minor_version()); |
|
3408 |
scratch_class->set_minor_version(old_minor_version); |
|
3409 |
||
3410 |
// Replace major version number of class file |
|
3411 |
u2 old_major_version = the_class->major_version(); |
|
3412 |
the_class->set_major_version(scratch_class->major_version()); |
|
3413 |
scratch_class->set_major_version(old_major_version); |
|
3414 |
||
3415 |
// Replace CP indexes for class and name+type of enclosing method |
|
3416 |
u2 old_class_idx = the_class->enclosing_method_class_index(); |
|
3417 |
u2 old_method_idx = the_class->enclosing_method_method_index(); |
|
3418 |
the_class->set_enclosing_method_indices( |
|
3419 |
scratch_class->enclosing_method_class_index(), |
|
3420 |
scratch_class->enclosing_method_method_index()); |
|
3421 |
scratch_class->set_enclosing_method_indices(old_class_idx, old_method_idx); |
|
3422 |
||
3423 |
// keep track of previous versions of this class |
|
3424 |
the_class->add_previous_version(scratch_class, &emcp_methods, |
|
3425 |
emcp_method_count); |
|
3426 |
||
3427 |
RC_TIMER_STOP(_timer_rsc_phase1); |
|
3428 |
RC_TIMER_START(_timer_rsc_phase2); |
|
3429 |
||
3430 |
// Adjust constantpool caches and vtables for all classes |
|
3431 |
// that reference methods of the evolved class. |
|
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3432 |
AdjustCpoolCacheAndVtable adjust_cpool_cache_and_vtable(THREAD); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3433 |
ClassLoaderDataGraph::classes_do(&adjust_cpool_cache_and_vtable); |
1 | 3434 |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3435 |
// JSR-292 support |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3436 |
MemberNameTable* mnt = the_class->member_names(); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3437 |
if (mnt != NULL) { |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3438 |
bool trace_name_printed = false; |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3439 |
mnt->adjust_method_entries(_matching_old_methods, |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3440 |
_matching_new_methods, |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3441 |
_matching_methods_length, |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3442 |
&trace_name_printed); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3443 |
} |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
15744
diff
changeset
|
3444 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3445 |
// Fix Resolution Error table also to remove old constant pools |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3446 |
SystemDictionary::delete_resolution_error(old_constants); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3447 |
|
1 | 3448 |
if (the_class->oop_map_cache() != NULL) { |
3449 |
// Flush references to any obsolete methods from the oop map cache |
|
3450 |
// so that obsolete methods are not pinned. |
|
3451 |
the_class->oop_map_cache()->flush_obsolete_entries(); |
|
3452 |
} |
|
3453 |
||
3454 |
// increment the classRedefinedCount field in the_class and in any |
|
3455 |
// direct and indirect subclasses of the_class |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3456 |
increment_class_counter((InstanceKlass *)the_class(), THREAD); |
1 | 3457 |
|
3458 |
// RC_TRACE macro has an embedded ResourceMark |
|
3459 |
RC_TRACE_WITH_THREAD(0x00000001, THREAD, |
|
3460 |
("redefined name=%s, count=%d (avail_mem=" UINT64_FORMAT "K)", |
|
3461 |
the_class->external_name(), |
|
3462 |
java_lang_Class::classRedefinedCount(the_class_mirror), |
|
3463 |
os::available_memory() >> 10)); |
|
3464 |
||
3465 |
RC_TIMER_STOP(_timer_rsc_phase2); |
|
3466 |
} // end redefine_single_class() |
|
3467 |
||
3468 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3469 |
// Increment the classRedefinedCount field in the specific InstanceKlass |
1 | 3470 |
// and in all direct and indirect subclasses. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3471 |
void VM_RedefineClasses::increment_class_counter(InstanceKlass *ik, TRAPS) { |
1 | 3472 |
oop class_mirror = ik->java_mirror(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3473 |
Klass* class_oop = java_lang_Class::as_Klass(class_mirror); |
1 | 3474 |
int new_count = java_lang_Class::classRedefinedCount(class_mirror) + 1; |
3475 |
java_lang_Class::set_classRedefinedCount(class_mirror, new_count); |
|
3476 |
||
3477 |
if (class_oop != _the_class_oop) { |
|
3478 |
// _the_class_oop count is printed at end of redefine_single_class() |
|
3479 |
RC_TRACE_WITH_THREAD(0x00000008, THREAD, |
|
3480 |
("updated count in subclass=%s to %d", ik->external_name(), new_count)); |
|
3481 |
} |
|
3482 |
||
3483 |
for (Klass *subk = ik->subklass(); subk != NULL; |
|
3484 |
subk = subk->next_sibling()) { |
|
8726
7bafcf0e5bfb
7029509: nightly failures after static fields in Class
never
parents:
8651
diff
changeset
|
3485 |
if (subk->oop_is_instance()) { |
7bafcf0e5bfb
7029509: nightly failures after static fields in Class
never
parents:
8651
diff
changeset
|
3486 |
// Only update instanceKlasses |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3487 |
InstanceKlass *subik = (InstanceKlass*)subk; |
8726
7bafcf0e5bfb
7029509: nightly failures after static fields in Class
never
parents:
8651
diff
changeset
|
3488 |
// recursively do subclasses of the current subclass |
7bafcf0e5bfb
7029509: nightly failures after static fields in Class
never
parents:
8651
diff
changeset
|
3489 |
increment_class_counter(subik, THREAD); |
7bafcf0e5bfb
7029509: nightly failures after static fields in Class
never
parents:
8651
diff
changeset
|
3490 |
} |
1 | 3491 |
} |
3492 |
} |
|
3493 |
||
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3494 |
void VM_RedefineClasses::CheckClass::do_klass(Klass* k) { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3495 |
bool no_old_methods = true; // be optimistic |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3496 |
|
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3497 |
// Both array and instance classes have vtables. |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3498 |
// a vtable should never contain old or obsolete methods |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3499 |
ResourceMark rm(_thread); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3500 |
if (k->vtable_length() > 0 && |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3501 |
!k->vtable()->check_no_old_or_obsolete_entries()) { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3502 |
if (RC_TRACE_ENABLED(0x00004000)) { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3503 |
RC_TRACE_WITH_THREAD(0x00004000, _thread, |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3504 |
("klassVtable::check_no_old_or_obsolete_entries failure" |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3505 |
" -- OLD or OBSOLETE method found -- class: %s", |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3506 |
k->signature_name())); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3507 |
k->vtable()->dump_vtable(); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3508 |
} |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3509 |
no_old_methods = false; |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3510 |
} |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3511 |
|
1 | 3512 |
if (k->oop_is_instance()) { |
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3513 |
HandleMark hm(_thread); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3514 |
InstanceKlass *ik = InstanceKlass::cast(k); |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3515 |
|
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3516 |
// an itable should never contain old or obsolete methods |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3517 |
if (ik->itable_length() > 0 && |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3518 |
!ik->itable()->check_no_old_or_obsolete_entries()) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3519 |
if (RC_TRACE_ENABLED(0x00004000)) { |
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3520 |
RC_TRACE_WITH_THREAD(0x00004000, _thread, |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3521 |
("klassItable::check_no_old_or_obsolete_entries failure" |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3522 |
" -- OLD or OBSOLETE method found -- class: %s", |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3523 |
ik->signature_name())); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3524 |
ik->itable()->dump_itable(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3525 |
} |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3526 |
no_old_methods = false; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3527 |
} |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3528 |
|
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3529 |
// the constant pool cache should never contain old or obsolete methods |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3530 |
if (ik->constants() != NULL && |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3531 |
ik->constants()->cache() != NULL && |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3532 |
!ik->constants()->cache()->check_no_old_or_obsolete_entries()) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3533 |
if (RC_TRACE_ENABLED(0x00004000)) { |
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3534 |
RC_TRACE_WITH_THREAD(0x00004000, _thread, |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3535 |
("cp-cache::check_no_old_or_obsolete_entries failure" |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3536 |
" -- OLD or OBSOLETE method found -- class: %s", |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3537 |
ik->signature_name())); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3538 |
ik->constants()->cache()->dump_cache(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3539 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3540 |
no_old_methods = false; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3541 |
} |
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3542 |
} |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3543 |
|
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3544 |
// print and fail guarantee if old methods are found. |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3545 |
if (!no_old_methods) { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3546 |
if (RC_TRACE_ENABLED(0x00004000)) { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3547 |
dump_methods(); |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3548 |
} else { |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3549 |
tty->print_cr("INFO: use the '-XX:TraceRedefineClasses=16384' option " |
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3550 |
"to see more info about the following guarantee() failure."); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13286
diff
changeset
|
3551 |
} |
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3552 |
guarantee(false, "OLD and/or OBSOLETE method(s) found"); |
1 | 3553 |
} |
3554 |
} |
|
3555 |
||
17373
7d8bb2a8787e
8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents:
17357
diff
changeset
|
3556 |
|
1 | 3557 |
void VM_RedefineClasses::dump_methods() { |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3558 |
int j; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3559 |
RC_TRACE(0x00004000, ("_old_methods --")); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3560 |
for (j = 0; j < _old_methods->length(); ++j) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3561 |
Method* m = _old_methods->at(j); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3562 |
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index())); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3563 |
m->access_flags().print_on(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3564 |
tty->print(" -- "); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3565 |
m->print_name(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3566 |
tty->cr(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3567 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3568 |
RC_TRACE(0x00004000, ("_new_methods --")); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3569 |
for (j = 0; j < _new_methods->length(); ++j) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3570 |
Method* m = _new_methods->at(j); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3571 |
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index())); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3572 |
m->access_flags().print_on(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3573 |
tty->print(" -- "); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3574 |
m->print_name(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3575 |
tty->cr(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3576 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3577 |
RC_TRACE(0x00004000, ("_matching_(old/new)_methods --")); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3578 |
for (j = 0; j < _matching_methods_length; ++j) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3579 |
Method* m = _matching_old_methods[j]; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3580 |
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index())); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3581 |
m->access_flags().print_on(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3582 |
tty->print(" -- "); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3583 |
m->print_name(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3584 |
tty->cr(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3585 |
m = _matching_new_methods[j]; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3586 |
RC_TRACE_NO_CR(0x00004000, (" (%5d) ", m->vtable_index())); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3587 |
m->access_flags().print_on(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3588 |
tty->cr(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3589 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3590 |
RC_TRACE(0x00004000, ("_deleted_methods --")); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3591 |
for (j = 0; j < _deleted_methods_length; ++j) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3592 |
Method* m = _deleted_methods[j]; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3593 |
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index())); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3594 |
m->access_flags().print_on(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3595 |
tty->print(" -- "); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3596 |
m->print_name(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3597 |
tty->cr(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3598 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3599 |
RC_TRACE(0x00004000, ("_added_methods --")); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3600 |
for (j = 0; j < _added_methods_length; ++j) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3601 |
Method* m = _added_methods[j]; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3602 |
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index())); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3603 |
m->access_flags().print_on(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3604 |
tty->print(" -- "); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3605 |
m->print_name(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3606 |
tty->cr(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
15446
diff
changeset
|
3607 |
} |
1 | 3608 |
} |