annotate src/share/vm/prims/jvmtiRedefineClasses.cpp @ 614:3db67f76d308

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