author | simonis |
Wed, 27 Feb 2013 09:40:30 +0100 | |
changeset 15855 | 2ac9ebea17f3 |
parent 15591 | b8aa0577f137 |
child 16591 | 73047b0eb568 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
2 |
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
1 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5403
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5403
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5403
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "classfile/systemDictionary.hpp" |
|
27 |
#include "classfile/vmSymbols.hpp" |
|
28 |
#include "gc_implementation/shared/markSweep.inline.hpp" |
|
29 |
#include "memory/gcLocker.hpp" |
|
30 |
#include "memory/resourceArea.hpp" |
|
31 |
#include "memory/universe.inline.hpp" |
|
32 |
#include "oops/instanceKlass.hpp" |
|
33 |
#include "oops/klassVtable.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
34 |
#include "oops/method.hpp" |
7397 | 35 |
#include "oops/objArrayOop.hpp" |
36 |
#include "oops/oop.inline.hpp" |
|
37 |
#include "prims/jvmtiRedefineClassesTrace.hpp" |
|
38 |
#include "runtime/arguments.hpp" |
|
39 |
#include "runtime/handles.inline.hpp" |
|
40 |
#include "utilities/copy.hpp" |
|
1 | 41 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
42 |
inline InstanceKlass* klassVtable::ik() const { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
43 |
Klass* k = _klass(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
44 |
assert(k->oop_is_instance(), "not an InstanceKlass"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
45 |
return (InstanceKlass*)k; |
1 | 46 |
} |
47 |
||
48 |
||
49 |
// this function computes the vtable size (including the size needed for miranda |
|
50 |
// methods) and the number of miranda methods in this class |
|
51 |
// Note on Miranda methods: Let's say there is a class C that implements |
|
52 |
// interface I. Let's say there is a method m in I that neither C nor any |
|
53 |
// of its super classes implement (i.e there is no method of any access, with |
|
54 |
// the same name and signature as m), then m is a Miranda method which is |
|
55 |
// entered as a public abstract method in C's vtable. From then on it should |
|
56 |
// treated as any other public method in C for method over-ride purposes. |
|
14385 | 57 |
void klassVtable::compute_vtable_size_and_num_mirandas( |
58 |
int* vtable_length_ret, int* num_new_mirandas, |
|
59 |
GrowableArray<Method*>* all_mirandas, Klass* super, |
|
60 |
Array<Method*>* methods, AccessFlags class_flags, |
|
61 |
Handle classloader, Symbol* classname, Array<Klass*>* local_interfaces, |
|
62 |
TRAPS) { |
|
1 | 63 |
No_Safepoint_Verifier nsv; |
64 |
||
65 |
// set up default result values |
|
14385 | 66 |
int vtable_length = 0; |
1 | 67 |
|
68 |
// start off with super's vtable length |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
69 |
InstanceKlass* sk = (InstanceKlass*)super; |
1 | 70 |
vtable_length = super == NULL ? 0 : sk->vtable_length(); |
71 |
||
72 |
// go thru each method in the methods table to see if it needs a new entry |
|
73 |
int len = methods->length(); |
|
74 |
for (int i = 0; i < len; i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
75 |
assert(methods->at(i)->is_method(), "must be a Method*"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
76 |
methodHandle mh(THREAD, methods->at(i)); |
1 | 77 |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
78 |
if (needs_new_vtable_entry(mh, super, classloader, classname, class_flags, THREAD)) { |
1 | 79 |
vtable_length += vtableEntry::size(); // we need a new entry |
80 |
} |
|
81 |
} |
|
82 |
||
14385 | 83 |
GrowableArray<Method*> new_mirandas(20); |
1 | 84 |
// compute the number of mirandas methods that must be added to the end |
14385 | 85 |
get_mirandas(&new_mirandas, all_mirandas, super, methods, local_interfaces); |
86 |
*num_new_mirandas = new_mirandas.length(); |
|
87 |
||
88 |
vtable_length += *num_new_mirandas * vtableEntry::size(); |
|
1 | 89 |
|
90 |
if (Universe::is_bootstrapping() && vtable_length == 0) { |
|
91 |
// array classes don't have their superclass set correctly during |
|
92 |
// bootstrapping |
|
93 |
vtable_length = Universe::base_vtable_size(); |
|
94 |
} |
|
95 |
||
96 |
if (super == NULL && !Universe::is_bootstrapping() && |
|
97 |
vtable_length != Universe::base_vtable_size()) { |
|
98 |
// Someone is attempting to redefine java.lang.Object incorrectly. The |
|
99 |
// only way this should happen is from |
|
100 |
// SystemDictionary::resolve_from_stream(), which will detect this later |
|
101 |
// and throw a security exception. So don't assert here to let |
|
102 |
// the exception occur. |
|
103 |
vtable_length = Universe::base_vtable_size(); |
|
104 |
} |
|
105 |
assert(super != NULL || vtable_length == Universe::base_vtable_size(), |
|
106 |
"bad vtable size for class Object"); |
|
107 |
assert(vtable_length % vtableEntry::size() == 0, "bad vtable length"); |
|
108 |
assert(vtable_length >= Universe::base_vtable_size(), "vtable too small"); |
|
14385 | 109 |
|
110 |
*vtable_length_ret = vtable_length; |
|
1 | 111 |
} |
112 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
113 |
int klassVtable::index_of(Method* m, int len) const { |
1 | 114 |
assert(m->vtable_index() >= 0, "do not ask this of non-vtable methods"); |
115 |
return m->vtable_index(); |
|
116 |
} |
|
117 |
||
118 |
int klassVtable::initialize_from_super(KlassHandle super) { |
|
119 |
if (super.is_null()) { |
|
120 |
return 0; |
|
121 |
} else { |
|
122 |
// copy methods from superKlass |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
123 |
// can't inherit from array class, so must be InstanceKlass |
1 | 124 |
assert(super->oop_is_instance(), "must be instance klass"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
125 |
InstanceKlass* sk = (InstanceKlass*)super(); |
1 | 126 |
klassVtable* superVtable = sk->vtable(); |
127 |
assert(superVtable->length() <= _length, "vtable too short"); |
|
128 |
#ifdef ASSERT |
|
129 |
superVtable->verify(tty, true); |
|
130 |
#endif |
|
131 |
superVtable->copy_vtable_to(table()); |
|
132 |
#ifndef PRODUCT |
|
133 |
if (PrintVtables && Verbose) { |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
134 |
ResourceMark rm; |
1 | 135 |
tty->print_cr("copy vtable from %s to %s size %d", sk->internal_name(), klass()->internal_name(), _length); |
136 |
} |
|
137 |
#endif |
|
138 |
return superVtable->length(); |
|
139 |
} |
|
140 |
} |
|
141 |
||
142 |
// Revised lookup semantics introduced 1.3 (Kestral beta) |
|
143 |
void klassVtable::initialize_vtable(bool checkconstraints, TRAPS) { |
|
144 |
||
145 |
// Note: Arrays can have intermediate array supers. Use java_super to skip them. |
|
146 |
KlassHandle super (THREAD, klass()->java_super()); |
|
147 |
int nofNewEntries = 0; |
|
148 |
||
149 |
||
150 |
if (PrintVtables && !klass()->oop_is_array()) { |
|
151 |
ResourceMark rm(THREAD); |
|
152 |
tty->print_cr("Initializing: %s", _klass->name()->as_C_string()); |
|
153 |
} |
|
154 |
||
155 |
#ifdef ASSERT |
|
156 |
oop* end_of_obj = (oop*)_klass() + _klass()->size(); |
|
157 |
oop* end_of_vtable = (oop*)&table()[_length]; |
|
158 |
assert(end_of_vtable <= end_of_obj, "vtable extends beyond end"); |
|
159 |
#endif |
|
160 |
||
161 |
if (Universe::is_bootstrapping()) { |
|
162 |
// just clear everything |
|
163 |
for (int i = 0; i < _length; i++) table()[i].clear(); |
|
164 |
return; |
|
165 |
} |
|
166 |
||
167 |
int super_vtable_len = initialize_from_super(super); |
|
168 |
if (klass()->oop_is_array()) { |
|
169 |
assert(super_vtable_len == _length, "arrays shouldn't introduce new methods"); |
|
170 |
} else { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
171 |
assert(_klass->oop_is_instance(), "must be InstanceKlass"); |
1 | 172 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
173 |
Array<Method*>* methods = ik()->methods(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
174 |
int len = methods->length(); |
1 | 175 |
int initialized = super_vtable_len; |
176 |
||
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
177 |
// update_inherited_vtable can stop for gc - ensure using handles |
1 | 178 |
for (int i = 0; i < len; i++) { |
179 |
HandleMark hm(THREAD); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
180 |
assert(methods->at(i)->is_method(), "must be a Method*"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
181 |
methodHandle mh(THREAD, methods->at(i)); |
1 | 182 |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
183 |
bool needs_new_entry = update_inherited_vtable(ik(), mh, super_vtable_len, checkconstraints, CHECK); |
1 | 184 |
|
185 |
if (needs_new_entry) { |
|
186 |
put_method_at(mh(), initialized); |
|
187 |
mh()->set_vtable_index(initialized); // set primary vtable index |
|
188 |
initialized++; |
|
189 |
} |
|
190 |
} |
|
191 |
||
192 |
// add miranda methods; it will also update the value of initialized |
|
14385 | 193 |
fill_in_mirandas(&initialized); |
1 | 194 |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
195 |
// In class hierarchies where the accessibility is not increasing (i.e., going from private -> |
1 | 196 |
// package_private -> publicprotected), the vtable might actually be smaller than our initial |
197 |
// calculation. |
|
198 |
assert(initialized <= _length, "vtable initialization failed"); |
|
199 |
for(;initialized < _length; initialized++) { |
|
200 |
put_method_at(NULL, initialized); |
|
201 |
} |
|
202 |
NOT_PRODUCT(verify(tty, true)); |
|
203 |
} |
|
204 |
} |
|
205 |
||
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
206 |
// Called for cases where a method does not override its superclass' vtable entry |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
207 |
// For bytecodes not produced by javac together it is possible that a method does not override |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
208 |
// the superclass's method, but might indirectly override a super-super class's vtable entry |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
209 |
// If none found, return a null superk, else return the superk of the method this does override |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
210 |
InstanceKlass* klassVtable::find_transitive_override(InstanceKlass* initialsuper, methodHandle target_method, |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
211 |
int vtable_index, Handle target_loader, Symbol* target_classname, Thread * THREAD) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
212 |
InstanceKlass* superk = initialsuper; |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
213 |
while (superk != NULL && superk->super() != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
214 |
InstanceKlass* supersuperklass = InstanceKlass::cast(superk->super()); |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
215 |
klassVtable* ssVtable = supersuperklass->vtable(); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
216 |
if (vtable_index < ssVtable->length()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
217 |
Method* super_method = ssVtable->method_at(vtable_index); |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
218 |
#ifndef PRODUCT |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
219 |
Symbol* name= target_method()->name(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
220 |
Symbol* signature = target_method()->signature(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
221 |
assert(super_method->name() == name && super_method->signature() == signature, "vtable entry name/sig mismatch"); |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
222 |
#endif |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
223 |
if (supersuperklass->is_override(super_method, target_loader, target_classname, THREAD)) { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
224 |
#ifndef PRODUCT |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
225 |
if (PrintVtables && Verbose) { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
226 |
ResourceMark rm(THREAD); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
227 |
tty->print("transitive overriding superclass %s with %s::%s index %d, original flags: ", |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
228 |
supersuperklass->internal_name(), |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
229 |
_klass->internal_name(), (target_method() != NULL) ? |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
230 |
target_method()->name()->as_C_string() : "<NULL>", vtable_index); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
231 |
super_method->access_flags().print_on(tty); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
232 |
tty->print("overriders flags: "); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
233 |
target_method->access_flags().print_on(tty); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
234 |
tty->cr(); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
235 |
} |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
236 |
#endif /*PRODUCT*/ |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
237 |
break; // return found superk |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
238 |
} |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
239 |
} else { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
240 |
// super class has no vtable entry here, stop transitive search |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
241 |
superk = (InstanceKlass*)NULL; |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
242 |
break; |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
243 |
} |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
244 |
// if no override found yet, continue to search up |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
245 |
superk = InstanceKlass::cast(superk->super()); |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
246 |
} |
1 | 247 |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
248 |
return superk; |
1 | 249 |
} |
250 |
||
14385 | 251 |
// Methods that are "effectively" final don't need vtable entries. |
252 |
bool method_is_effectively_final( |
|
253 |
AccessFlags klass_flags, methodHandle target) { |
|
254 |
return target->is_final() || klass_flags.is_final() && !target->is_overpass(); |
|
255 |
} |
|
1 | 256 |
|
257 |
// Update child's copy of super vtable for overrides |
|
258 |
// OR return true if a new vtable entry is required |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
259 |
// Only called for InstanceKlass's, i.e. not for arrays |
1 | 260 |
// If that changed, could not use _klass as handle for klass |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
261 |
bool klassVtable::update_inherited_vtable(InstanceKlass* klass, methodHandle target_method, int super_vtable_len, |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
262 |
bool checkconstraints, TRAPS) { |
1 | 263 |
ResourceMark rm; |
264 |
bool allocate_new = true; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
265 |
assert(klass->oop_is_instance(), "must be InstanceKlass"); |
1 | 266 |
|
267 |
// Initialize the method's vtable index to "nonvirtual". |
|
268 |
// If we allocate a vtable entry, we will update it to a non-negative number. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
269 |
target_method()->set_vtable_index(Method::nonvirtual_vtable_index); |
1 | 270 |
|
271 |
// Static and <init> methods are never in |
|
272 |
if (target_method()->is_static() || target_method()->name() == vmSymbols::object_initializer_name()) { |
|
273 |
return false; |
|
274 |
} |
|
275 |
||
14385 | 276 |
if (method_is_effectively_final(klass->access_flags(), target_method)) { |
1 | 277 |
// a final method never needs a new entry; final methods can be statically |
278 |
// resolved and they have to be present in the vtable only if they override |
|
279 |
// a super's method, in which case they re-use its entry |
|
280 |
allocate_new = false; |
|
281 |
} |
|
282 |
||
283 |
// we need a new entry if there is no superclass |
|
284 |
if (klass->super() == NULL) { |
|
285 |
return allocate_new; |
|
286 |
} |
|
287 |
||
288 |
// private methods always have a new entry in the vtable |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
289 |
// specification interpretation since classic has |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
290 |
// private methods not overriding |
1 | 291 |
if (target_method()->is_private()) { |
292 |
return allocate_new; |
|
293 |
} |
|
294 |
||
295 |
// search through the vtable and update overridden entries |
|
296 |
// Since check_signature_loaders acquires SystemDictionary_lock |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
297 |
// which can block for gc, once we are in this loop, use handles |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
298 |
// For classfiles built with >= jdk7, we now look for transitive overrides |
1 | 299 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
300 |
Symbol* name = target_method()->name(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
301 |
Symbol* signature = target_method()->signature(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
302 |
Handle target_loader(THREAD, _klass()->class_loader()); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
303 |
Symbol* target_classname = _klass->name(); |
1 | 304 |
for(int i = 0; i < super_vtable_len; i++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
305 |
Method* super_method = method_at(i); |
1 | 306 |
// Check if method name matches |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
307 |
if (super_method->name() == name && super_method->signature() == signature) { |
1 | 308 |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
309 |
// get super_klass for method_holder for the found method |
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
310 |
InstanceKlass* super_klass = super_method->method_holder(); |
1 | 311 |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
312 |
if ((super_klass->is_override(super_method, target_loader, target_classname, THREAD)) || |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
313 |
((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
314 |
&& ((super_klass = find_transitive_override(super_klass, target_method, i, target_loader, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
315 |
target_classname, THREAD)) != (InstanceKlass*)NULL))) { |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
316 |
// overriding, so no new entry |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
317 |
allocate_new = false; |
1 | 318 |
|
319 |
if (checkconstraints) { |
|
320 |
// Override vtable entry if passes loader constraint check |
|
321 |
// if loader constraint checking requested |
|
322 |
// No need to visit his super, since he and his super |
|
323 |
// have already made any needed loader constraints. |
|
324 |
// Since loader constraints are transitive, it is enough |
|
325 |
// to link to the first super, and we get all the others. |
|
326 |
Handle super_loader(THREAD, super_klass->class_loader()); |
|
327 |
||
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
328 |
if (target_loader() != super_loader()) { |
1 | 329 |
ResourceMark rm(THREAD); |
330 |
char* failed_type_name = |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
331 |
SystemDictionary::check_signature_loaders(signature, target_loader, |
1 | 332 |
super_loader, true, |
333 |
CHECK_(false)); |
|
334 |
if (failed_type_name != NULL) { |
|
335 |
const char* msg = "loader constraint violation: when resolving " |
|
336 |
"overridden method \"%s\" the class loader (instance" |
|
337 |
" of %s) of the current class, %s, and its superclass loader " |
|
338 |
"(instance of %s), have different Class objects for the type " |
|
339 |
"%s used in the signature"; |
|
340 |
char* sig = target_method()->name_and_sig_as_C_string(); |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
341 |
const char* loader1 = SystemDictionary::loader_name(target_loader()); |
1 | 342 |
char* current = _klass->name()->as_C_string(); |
343 |
const char* loader2 = SystemDictionary::loader_name(super_loader()); |
|
344 |
size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + |
|
345 |
strlen(current) + strlen(loader2) + strlen(failed_type_name); |
|
346 |
char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); |
|
347 |
jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2, |
|
348 |
failed_type_name); |
|
349 |
THROW_MSG_(vmSymbols::java_lang_LinkageError(), buf, false); |
|
350 |
} |
|
351 |
} |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
352 |
} |
1 | 353 |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
354 |
put_method_at(target_method(), i); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
355 |
target_method()->set_vtable_index(i); |
1 | 356 |
#ifndef PRODUCT |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
357 |
if (PrintVtables && Verbose) { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
358 |
tty->print("overriding with %s::%s index %d, original flags: ", |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
359 |
_klass->internal_name(), (target_method() != NULL) ? |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
360 |
target_method()->name()->as_C_string() : "<NULL>", i); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
361 |
super_method->access_flags().print_on(tty); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
362 |
tty->print("overriders flags: "); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
363 |
target_method->access_flags().print_on(tty); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
364 |
tty->cr(); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
365 |
} |
1 | 366 |
#endif /*PRODUCT*/ |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
367 |
} else { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
368 |
// allocate_new = true; default. We might override one entry, |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
369 |
// but not override another. Once we override one, not need new |
1 | 370 |
#ifndef PRODUCT |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
371 |
if (PrintVtables && Verbose) { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
372 |
tty->print("NOT overriding with %s::%s index %d, original flags: ", |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
373 |
_klass->internal_name(), (target_method() != NULL) ? |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
374 |
target_method()->name()->as_C_string() : "<NULL>", i); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
375 |
super_method->access_flags().print_on(tty); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
376 |
tty->print("overriders flags: "); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
377 |
target_method->access_flags().print_on(tty); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
378 |
tty->cr(); |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
379 |
} |
1 | 380 |
#endif /*PRODUCT*/ |
381 |
} |
|
382 |
} |
|
383 |
} |
|
384 |
return allocate_new; |
|
385 |
} |
|
386 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
387 |
void klassVtable::put_method_at(Method* m, int index) { |
1 | 388 |
#ifndef PRODUCT |
389 |
if (PrintVtables && Verbose) { |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
390 |
ResourceMark rm; |
1 | 391 |
tty->print_cr("adding %s::%s at index %d", _klass->internal_name(), |
392 |
(m != NULL) ? m->name()->as_C_string() : "<NULL>", index); |
|
393 |
} |
|
394 |
#endif |
|
395 |
table()[index].set(m); |
|
396 |
} |
|
397 |
||
398 |
// Find out if a method "m" with superclass "super", loader "classloader" and |
|
399 |
// name "classname" needs a new vtable entry. Let P be a class package defined |
|
400 |
// by "classloader" and "classname". |
|
401 |
// NOTE: The logic used here is very similar to the one used for computing |
|
402 |
// the vtables indices for a method. We cannot directly use that function because, |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
403 |
// we allocate the InstanceKlass at load time, and that requires that the |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
404 |
// superclass has been loaded. |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
405 |
// However, the vtable entries are filled in at link time, and therefore |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
406 |
// the superclass' vtable may not yet have been filled in. |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
407 |
bool klassVtable::needs_new_vtable_entry(methodHandle target_method, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
408 |
Klass* super, |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
409 |
Handle classloader, |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
410 |
Symbol* classname, |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
411 |
AccessFlags class_flags, |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
412 |
TRAPS) { |
14385 | 413 |
|
414 |
if (method_is_effectively_final(class_flags, target_method) || |
|
1 | 415 |
// a final method never needs a new entry; final methods can be statically |
416 |
// resolved and they have to be present in the vtable only if they override |
|
417 |
// a super's method, in which case they re-use its entry |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
418 |
(target_method()->is_static()) || |
1 | 419 |
// static methods don't need to be in vtable |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
420 |
(target_method()->name() == vmSymbols::object_initializer_name()) |
1 | 421 |
// <init> is never called dynamically-bound |
422 |
) { |
|
423 |
return false; |
|
424 |
} |
|
425 |
||
426 |
// we need a new entry if there is no superclass |
|
427 |
if (super == NULL) { |
|
428 |
return true; |
|
429 |
} |
|
430 |
||
431 |
// private methods always have a new entry in the vtable |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
432 |
// specification interpretation since classic has |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
433 |
// private methods not overriding |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
434 |
if (target_method()->is_private()) { |
1 | 435 |
return true; |
436 |
} |
|
437 |
||
438 |
// search through the super class hierarchy to see if we need |
|
439 |
// a new entry |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
440 |
ResourceMark rm; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
441 |
Symbol* name = target_method()->name(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
442 |
Symbol* signature = target_method()->signature(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
443 |
Klass* k = super; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
444 |
Method* super_method = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
445 |
InstanceKlass *holder = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
446 |
Method* recheck_method = NULL; |
1 | 447 |
while (k != NULL) { |
448 |
// lookup through the hierarchy for a method with matching name and sign. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
449 |
super_method = InstanceKlass::cast(k)->lookup_method(name, signature); |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
450 |
if (super_method == NULL) { |
1 | 451 |
break; // we still have to search for a matching miranda method |
452 |
} |
|
453 |
// get the class holding the matching method |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
454 |
// make sure you use that class for is_override |
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
455 |
InstanceKlass* superk = super_method->method_holder(); |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
456 |
// we want only instance method matches |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
457 |
// pretend private methods are not in the super vtable |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
458 |
// since we do override around them: e.g. a.m pub/b.m private/c.m pub, |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
459 |
// ignore private, c.m pub does override a.m pub |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
460 |
// For classes that were not javac'd together, we also do transitive overriding around |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
461 |
// methods that have less accessibility |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
462 |
if ((!super_method->is_static()) && |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
463 |
(!super_method->is_private())) { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
464 |
if (superk->is_override(super_method, classloader, classname, THREAD)) { |
1 | 465 |
return false; |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
466 |
// else keep looking for transitive overrides |
1 | 467 |
} |
468 |
} |
|
469 |
||
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
470 |
// Start with lookup result and continue to search up |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
471 |
k = superk->super(); // haven't found an override match yet; continue to look |
1 | 472 |
} |
473 |
||
474 |
// if the target method is public or protected it may have a matching |
|
475 |
// miranda method in the super, whose entry it should re-use. |
|
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
476 |
// Actually, to handle cases that javac would not generate, we need |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
477 |
// this check for all access permissions. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
478 |
InstanceKlass *sk = InstanceKlass::cast(super); |
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
479 |
if (sk->has_miranda_methods()) { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
480 |
if (sk->lookup_method_in_all_interfaces(name, signature) != NULL) { |
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
481 |
return false; // found a matching miranda; we do not need a new entry |
1 | 482 |
} |
483 |
} |
|
484 |
return true; // found no match; we need a new entry |
|
485 |
} |
|
486 |
||
487 |
// Support for miranda methods |
|
488 |
||
489 |
// get the vtable index of a miranda method with matching "name" and "signature" |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
490 |
int klassVtable::index_of_miranda(Symbol* name, Symbol* signature) { |
1 | 491 |
// search from the bottom, might be faster |
492 |
for (int i = (length() - 1); i >= 0; i--) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
493 |
Method* m = table()[i].method(); |
1 | 494 |
if (is_miranda_entry_at(i) && |
495 |
m->name() == name && m->signature() == signature) { |
|
496 |
return i; |
|
497 |
} |
|
498 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
499 |
return Method::invalid_vtable_index; |
1 | 500 |
} |
501 |
||
502 |
// check if an entry is miranda |
|
503 |
bool klassVtable::is_miranda_entry_at(int i) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
504 |
Method* m = method_at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
505 |
Klass* method_holder = m->method_holder(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
506 |
InstanceKlass *mhk = InstanceKlass::cast(method_holder); |
1 | 507 |
|
508 |
// miranda methods are interface methods in a class's vtable |
|
509 |
if (mhk->is_interface()) { |
|
14385 | 510 |
assert(m->is_public(), "should be public"); |
1 | 511 |
assert(ik()->implements_interface(method_holder) , "this class should implement the interface"); |
512 |
assert(is_miranda(m, ik()->methods(), ik()->super()), "should be a miranda_method"); |
|
513 |
return true; |
|
514 |
} |
|
515 |
return false; |
|
516 |
} |
|
517 |
||
518 |
// check if a method is a miranda method, given a class's methods table and it's super |
|
519 |
// the caller must make sure that the method belongs to an interface implemented by the class |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
520 |
bool klassVtable::is_miranda(Method* m, Array<Method*>* class_methods, Klass* super) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
521 |
Symbol* name = m->name(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
522 |
Symbol* signature = m->signature(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
523 |
if (InstanceKlass::find_method(class_methods, name, signature) == NULL) { |
7443
39c85d63abf2
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
7397
diff
changeset
|
524 |
// did not find it in the method table of the current class |
1 | 525 |
if (super == NULL) { |
526 |
// super doesn't exist |
|
527 |
return true; |
|
7443
39c85d63abf2
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
7397
diff
changeset
|
528 |
} |
39c85d63abf2
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
7397
diff
changeset
|
529 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
530 |
Method* mo = InstanceKlass::cast(super)->lookup_method(name, signature); |
7443
39c85d63abf2
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
7397
diff
changeset
|
531 |
if (mo == NULL || mo->access_flags().is_private() ) { |
39c85d63abf2
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
7397
diff
changeset
|
532 |
// super class hierarchy does not implement it or protection is different |
39c85d63abf2
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
7397
diff
changeset
|
533 |
return true; |
1 | 534 |
} |
535 |
} |
|
7443
39c85d63abf2
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
7397
diff
changeset
|
536 |
|
1 | 537 |
return false; |
538 |
} |
|
539 |
||
14385 | 540 |
void klassVtable::add_new_mirandas_to_lists( |
541 |
GrowableArray<Method*>* new_mirandas, GrowableArray<Method*>* all_mirandas, |
|
542 |
Array<Method*>* current_interface_methods, Array<Method*>* class_methods, |
|
543 |
Klass* super) { |
|
1 | 544 |
// iterate thru the current interface's method to see if it a miranda |
545 |
int num_methods = current_interface_methods->length(); |
|
546 |
for (int i = 0; i < num_methods; i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
547 |
Method* im = current_interface_methods->at(i); |
1 | 548 |
bool is_duplicate = false; |
14385 | 549 |
int num_of_current_mirandas = new_mirandas->length(); |
1 | 550 |
// check for duplicate mirandas in different interfaces we implement |
551 |
for (int j = 0; j < num_of_current_mirandas; j++) { |
|
14385 | 552 |
Method* miranda = new_mirandas->at(j); |
1 | 553 |
if ((im->name() == miranda->name()) && |
554 |
(im->signature() == miranda->signature())) { |
|
555 |
is_duplicate = true; |
|
556 |
break; |
|
557 |
} |
|
558 |
} |
|
559 |
||
560 |
if (!is_duplicate) { // we don't want duplicate miranda entries in the vtable |
|
561 |
if (is_miranda(im, class_methods, super)) { // is it a miranda at all? |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
562 |
InstanceKlass *sk = InstanceKlass::cast(super); |
1 | 563 |
// check if it is a duplicate of a super's miranda |
564 |
if (sk->lookup_method_in_all_interfaces(im->name(), im->signature()) == NULL) { |
|
14385 | 565 |
new_mirandas->append(im); |
566 |
} |
|
567 |
if (all_mirandas != NULL) { |
|
568 |
all_mirandas->append(im); |
|
1 | 569 |
} |
570 |
} |
|
571 |
} |
|
572 |
} |
|
573 |
} |
|
574 |
||
14385 | 575 |
void klassVtable::get_mirandas(GrowableArray<Method*>* new_mirandas, |
576 |
GrowableArray<Method*>* all_mirandas, |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
577 |
Klass* super, Array<Method*>* class_methods, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
578 |
Array<Klass*>* local_interfaces) { |
14385 | 579 |
assert((new_mirandas->length() == 0) , "current mirandas must be 0"); |
1 | 580 |
|
581 |
// iterate thru the local interfaces looking for a miranda |
|
582 |
int num_local_ifs = local_interfaces->length(); |
|
583 |
for (int i = 0; i < num_local_ifs; i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
584 |
InstanceKlass *ik = InstanceKlass::cast(local_interfaces->at(i)); |
14385 | 585 |
add_new_mirandas_to_lists(new_mirandas, all_mirandas, |
586 |
ik->methods(), class_methods, super); |
|
1 | 587 |
// iterate thru each local's super interfaces |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
588 |
Array<Klass*>* super_ifs = ik->transitive_interfaces(); |
1 | 589 |
int num_super_ifs = super_ifs->length(); |
590 |
for (int j = 0; j < num_super_ifs; j++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
591 |
InstanceKlass *sik = InstanceKlass::cast(super_ifs->at(j)); |
14385 | 592 |
add_new_mirandas_to_lists(new_mirandas, all_mirandas, |
593 |
sik->methods(), class_methods, super); |
|
1 | 594 |
} |
595 |
} |
|
596 |
} |
|
597 |
||
598 |
// fill in mirandas |
|
14385 | 599 |
void klassVtable::fill_in_mirandas(int* initialized) { |
600 |
GrowableArray<Method*> mirandas(20); |
|
601 |
get_mirandas(&mirandas, NULL, ik()->super(), ik()->methods(), |
|
602 |
ik()->local_interfaces()); |
|
603 |
for (int i = 0; i < mirandas.length(); i++) { |
|
604 |
put_method_at(mirandas.at(i), *initialized); |
|
605 |
++(*initialized); |
|
1 | 606 |
} |
607 |
} |
|
608 |
||
609 |
void klassVtable::copy_vtable_to(vtableEntry* start) { |
|
610 |
Copy::disjoint_words((HeapWord*)table(), (HeapWord*)start, _length * vtableEntry::size()); |
|
611 |
} |
|
612 |
||
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
613 |
#if INCLUDE_JVMTI |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
614 |
void klassVtable::adjust_method_entries(Method** old_methods, Method** new_methods, |
1 | 615 |
int methods_length, bool * trace_name_printed) { |
616 |
// search the vtable for uses of either obsolete or EMCP methods |
|
617 |
for (int j = 0; j < methods_length; j++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
618 |
Method* old_method = old_methods[j]; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
619 |
Method* new_method = new_methods[j]; |
1 | 620 |
|
621 |
// In the vast majority of cases we could get the vtable index |
|
622 |
// by using: old_method->vtable_index() |
|
623 |
// However, there are rare cases, eg. sun.awt.X11.XDecoratedPeer.getX() |
|
624 |
// in sun.awt.X11.XFramePeer where methods occur more than once in the |
|
625 |
// vtable, so, alas, we must do an exhaustive search. |
|
626 |
for (int index = 0; index < length(); index++) { |
|
627 |
if (unchecked_method_at(index) == old_method) { |
|
628 |
put_method_at(new_method, index); |
|
629 |
||
630 |
if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { |
|
631 |
if (!(*trace_name_printed)) { |
|
632 |
// RC_TRACE_MESG macro has an embedded ResourceMark |
|
633 |
RC_TRACE_MESG(("adjust: name=%s", |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
634 |
old_method->method_holder()->external_name())); |
1 | 635 |
*trace_name_printed = true; |
636 |
} |
|
637 |
// RC_TRACE macro has an embedded ResourceMark |
|
638 |
RC_TRACE(0x00100000, ("vtable method update: %s(%s)", |
|
639 |
new_method->name()->as_C_string(), |
|
640 |
new_method->signature()->as_C_string())); |
|
641 |
} |
|
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
642 |
// cannot 'break' here; see for-loop comment above. |
1 | 643 |
} |
644 |
} |
|
645 |
} |
|
646 |
} |
|
647 |
||
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
648 |
// a vtable should never contain old or obsolete methods |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
649 |
bool klassVtable::check_no_old_or_obsolete_entries() { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
650 |
for (int i = 0; i < length(); i++) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
651 |
Method* m = unchecked_method_at(i); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
652 |
if (m != NULL && |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
653 |
(NOT_PRODUCT(!m->is_valid() ||) m->is_old() || m->is_obsolete())) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
654 |
return false; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
655 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
656 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
657 |
return true; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
658 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
659 |
|
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
660 |
void klassVtable::dump_vtable() { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
661 |
tty->print_cr("vtable dump --"); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
662 |
for (int i = 0; i < length(); i++) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
663 |
Method* m = unchecked_method_at(i); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
664 |
if (m != NULL) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
665 |
tty->print(" (%5d) ", i); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
666 |
m->access_flags().print_on(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
667 |
tty->print(" -- "); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
668 |
m->print_name(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
669 |
tty->cr(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
670 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
671 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
672 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
673 |
#endif // INCLUDE_JVMTI |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
674 |
|
9172
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
675 |
// CDS/RedefineClasses support - clear vtables so they can be reinitialized |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
676 |
void klassVtable::clear_vtable() { |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
677 |
for (int i = 0; i < _length; i++) table()[i].clear(); |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
678 |
} |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
679 |
|
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
680 |
bool klassVtable::is_initialized() { |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
681 |
return _length == 0 || table()[0].method() != NULL; |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
682 |
} |
a4e13ccafc44
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
8725
diff
changeset
|
683 |
|
1 | 684 |
//----------------------------------------------------------------------------------------- |
685 |
// Itable code |
|
686 |
||
687 |
// Initialize a itableMethodEntry |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
688 |
void itableMethodEntry::initialize(Method* m) { |
1 | 689 |
if (m == NULL) return; |
690 |
||
691 |
_method = m; |
|
692 |
} |
|
693 |
||
694 |
klassItable::klassItable(instanceKlassHandle klass) { |
|
695 |
_klass = klass; |
|
696 |
||
697 |
if (klass->itable_length() > 0) { |
|
698 |
itableOffsetEntry* offset_entry = (itableOffsetEntry*)klass->start_of_itable(); |
|
699 |
if (offset_entry != NULL && offset_entry->interface_klass() != NULL) { // Check that itable is initialized |
|
700 |
// First offset entry points to the first method_entry |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
701 |
intptr_t* method_entry = (intptr_t *)(((address)klass()) + offset_entry->offset()); |
1 | 702 |
intptr_t* end = klass->end_of_itable(); |
703 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
704 |
_table_offset = (intptr_t*)offset_entry - (intptr_t*)klass(); |
1 | 705 |
_size_offset_table = (method_entry - ((intptr_t*)offset_entry)) / itableOffsetEntry::size(); |
706 |
_size_method_table = (end - method_entry) / itableMethodEntry::size(); |
|
707 |
assert(_table_offset >= 0 && _size_offset_table >= 0 && _size_method_table >= 0, "wrong computation"); |
|
708 |
return; |
|
709 |
} |
|
710 |
} |
|
711 |
||
189
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
712 |
// The length of the itable was either zero, or it has not yet been initialized. |
1 | 713 |
_table_offset = 0; |
714 |
_size_offset_table = 0; |
|
715 |
_size_method_table = 0; |
|
716 |
} |
|
717 |
||
718 |
static int initialize_count = 0; |
|
719 |
||
720 |
// Initialization |
|
721 |
void klassItable::initialize_itable(bool checkconstraints, TRAPS) { |
|
189
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
722 |
// Cannot be setup doing bootstrapping, interfaces don't have |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
723 |
// itables, and klass with only ones entry have empty itables |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
724 |
if (Universe::is_bootstrapping() || |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
725 |
_klass->is_interface() || |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
726 |
_klass->itable_length() == itableOffsetEntry::size()) return; |
1 | 727 |
|
189
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
728 |
// There's alway an extra itable entry so we can null-terminate it. |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
729 |
guarantee(size_offset_table() >= 1, "too small"); |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
730 |
int num_interfaces = size_offset_table() - 1; |
1 | 731 |
if (num_interfaces > 0) { |
189
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
732 |
if (TraceItables) tty->print_cr("%3d: Initializing itables for %s", ++initialize_count, |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
733 |
_klass->name()->as_C_string()); |
1 | 734 |
|
735 |
||
2264
55d0115a54fe
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
2136
diff
changeset
|
736 |
// Iterate through all interfaces |
1 | 737 |
int i; |
738 |
for(i = 0; i < num_interfaces; i++) { |
|
739 |
itableOffsetEntry* ioe = offset_entry(i); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
740 |
HandleMark hm(THREAD); |
1 | 741 |
KlassHandle interf_h (THREAD, ioe->interface_klass()); |
742 |
assert(interf_h() != NULL && ioe->offset() != 0, "bad offset entry in itable"); |
|
743 |
initialize_itable_for_interface(ioe->offset(), interf_h, checkconstraints, CHECK); |
|
744 |
} |
|
745 |
||
746 |
} |
|
189
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
747 |
// Check that the last entry is empty |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
748 |
itableOffsetEntry* ioe = offset_entry(size_offset_table() - 1); |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
749 |
guarantee(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing"); |
1 | 750 |
} |
751 |
||
752 |
||
753 |
void klassItable::initialize_itable_for_interface(int method_table_offset, KlassHandle interf_h, bool checkconstraints, TRAPS) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
754 |
Array<Method*>* methods = InstanceKlass::cast(interf_h())->methods(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
755 |
int nof_methods = methods->length(); |
1 | 756 |
HandleMark hm; |
757 |
KlassHandle klass = _klass; |
|
5402
c51fd0c1d005
6888953: some calls to function-like macros are missing semicolons
jcoomes
parents:
2343
diff
changeset
|
758 |
assert(nof_methods > 0, "at least one method must exist for interface to be in vtable"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
759 |
Handle interface_loader (THREAD, InstanceKlass::cast(interf_h())->class_loader()); |
1 | 760 |
int ime_num = 0; |
761 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
762 |
// Skip first Method* if it is a class initializer |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
763 |
int i = methods->at(0)->is_static_initializer() ? 1 : 0; |
1 | 764 |
|
765 |
// m, method_name, method_signature, klass reset each loop so they |
|
766 |
// don't need preserving across check_signature_loaders call |
|
767 |
// methods needs a handle in case of gc from check_signature_loaders |
|
768 |
for(; i < nof_methods; i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
769 |
Method* m = methods->at(i); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
770 |
Symbol* method_name = m->name(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7443
diff
changeset
|
771 |
Symbol* method_signature = m->signature(); |
1 | 772 |
|
773 |
// This is same code as in Linkresolver::lookup_instance_method_in_klasses |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
774 |
Method* target = klass->uncached_lookup_method(method_name, method_signature); |
1 | 775 |
while (target != NULL && target->is_static()) { |
776 |
// continue with recursive lookup through the superclass |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
777 |
Klass* super = target->method_holder()->super(); |
14488 | 778 |
target = (super == NULL) ? (Method*)NULL : super->uncached_lookup_method(method_name, method_signature); |
1 | 779 |
} |
780 |
if (target == NULL || !target->is_public() || target->is_abstract()) { |
|
781 |
// Entry do not resolve. Leave it empty |
|
782 |
} else { |
|
783 |
// Entry did resolve, check loader constraints before initializing |
|
784 |
// if checkconstraints requested |
|
785 |
methodHandle target_h (THREAD, target); // preserve across gc |
|
786 |
if (checkconstraints) { |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
787 |
Handle method_holder_loader (THREAD, target->method_holder()->class_loader()); |
1 | 788 |
if (method_holder_loader() != interface_loader()) { |
789 |
ResourceMark rm(THREAD); |
|
790 |
char* failed_type_name = |
|
791 |
SystemDictionary::check_signature_loaders(method_signature, |
|
792 |
method_holder_loader, |
|
793 |
interface_loader, |
|
794 |
true, CHECK); |
|
795 |
if (failed_type_name != NULL) { |
|
796 |
const char* msg = "loader constraint violation in interface " |
|
797 |
"itable initialization: when resolving method \"%s\" the class" |
|
798 |
" loader (instance of %s) of the current class, %s, " |
|
799 |
"and the class loader (instance of %s) for interface " |
|
800 |
"%s have different Class objects for the type %s " |
|
801 |
"used in the signature"; |
|
802 |
char* sig = target_h()->name_and_sig_as_C_string(); |
|
803 |
const char* loader1 = SystemDictionary::loader_name(method_holder_loader()); |
|
804 |
char* current = klass->name()->as_C_string(); |
|
805 |
const char* loader2 = SystemDictionary::loader_name(interface_loader()); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
806 |
char* iface = InstanceKlass::cast(interf_h())->name()->as_C_string(); |
1 | 807 |
size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + |
808 |
strlen(current) + strlen(loader2) + strlen(iface) + |
|
809 |
strlen(failed_type_name); |
|
810 |
char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); |
|
811 |
jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2, |
|
812 |
iface, failed_type_name); |
|
813 |
THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); |
|
814 |
} |
|
815 |
} |
|
816 |
} |
|
817 |
||
818 |
// ime may have moved during GC so recalculate address |
|
819 |
itableOffsetEntry::method_entry(_klass(), method_table_offset)[ime_num].initialize(target_h()); |
|
820 |
} |
|
821 |
// Progress to next entry |
|
822 |
ime_num++; |
|
823 |
} |
|
824 |
} |
|
825 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
826 |
// Update entry for specific Method* |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
827 |
void klassItable::initialize_with_method(Method* m) { |
1 | 828 |
itableMethodEntry* ime = method_entry(0); |
829 |
for(int i = 0; i < _size_method_table; i++) { |
|
830 |
if (ime->method() == m) { |
|
831 |
ime->initialize(m); |
|
832 |
} |
|
833 |
ime++; |
|
834 |
} |
|
835 |
} |
|
836 |
||
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
837 |
#if INCLUDE_JVMTI |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
838 |
void klassItable::adjust_method_entries(Method** old_methods, Method** new_methods, |
1 | 839 |
int methods_length, bool * trace_name_printed) { |
840 |
// search the itable for uses of either obsolete or EMCP methods |
|
841 |
for (int j = 0; j < methods_length; j++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
842 |
Method* old_method = old_methods[j]; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
843 |
Method* new_method = new_methods[j]; |
1 | 844 |
itableMethodEntry* ime = method_entry(0); |
845 |
||
2136
c55428da3cec
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
670
diff
changeset
|
846 |
// The itable can describe more than one interface and the same |
c55428da3cec
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
670
diff
changeset
|
847 |
// method signature can be specified by more than one interface. |
c55428da3cec
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
670
diff
changeset
|
848 |
// This means we have to do an exhaustive search to find all the |
c55428da3cec
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
670
diff
changeset
|
849 |
// old_method references. |
1 | 850 |
for (int i = 0; i < _size_method_table; i++) { |
851 |
if (ime->method() == old_method) { |
|
852 |
ime->initialize(new_method); |
|
853 |
||
854 |
if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { |
|
855 |
if (!(*trace_name_printed)) { |
|
856 |
// RC_TRACE_MESG macro has an embedded ResourceMark |
|
857 |
RC_TRACE_MESG(("adjust: name=%s", |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
858 |
old_method->method_holder()->external_name())); |
1 | 859 |
*trace_name_printed = true; |
860 |
} |
|
861 |
// RC_TRACE macro has an embedded ResourceMark |
|
862 |
RC_TRACE(0x00200000, ("itable method update: %s(%s)", |
|
863 |
new_method->name()->as_C_string(), |
|
864 |
new_method->signature()->as_C_string())); |
|
865 |
} |
|
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
866 |
// cannot 'break' here; see for-loop comment above. |
1 | 867 |
} |
868 |
ime++; |
|
869 |
} |
|
870 |
} |
|
871 |
} |
|
872 |
||
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
873 |
// an itable should never contain old or obsolete methods |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
874 |
bool klassItable::check_no_old_or_obsolete_entries() { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
875 |
itableMethodEntry* ime = method_entry(0); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
876 |
for (int i = 0; i < _size_method_table; i++) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
877 |
Method* m = ime->method(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
878 |
if (m != NULL && |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
879 |
(NOT_PRODUCT(!m->is_valid() ||) m->is_old() || m->is_obsolete())) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
880 |
return false; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
881 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
882 |
ime++; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
883 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
884 |
return true; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
885 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
886 |
|
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
887 |
void klassItable::dump_itable() { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
888 |
itableMethodEntry* ime = method_entry(0); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
889 |
tty->print_cr("itable dump --"); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
890 |
for (int i = 0; i < _size_method_table; i++) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
891 |
Method* m = ime->method(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
892 |
if (m != NULL) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
893 |
tty->print(" (%5d) ", i); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
894 |
m->access_flags().print_on(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
895 |
tty->print(" -- "); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
896 |
m->print_name(tty); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
897 |
tty->cr(); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
898 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
899 |
ime++; |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
900 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
901 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
902 |
#endif // INCLUDE_JVMTI |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14488
diff
changeset
|
903 |
|
1 | 904 |
|
905 |
// Setup |
|
906 |
class InterfaceVisiterClosure : public StackObj { |
|
907 |
public: |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
908 |
virtual void doit(Klass* intf, int method_count) = 0; |
1 | 909 |
}; |
910 |
||
911 |
// Visit all interfaces with at-least one method (excluding <clinit>) |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
912 |
void visit_all_interfaces(Array<Klass*>* transitive_intf, InterfaceVisiterClosure *blk) { |
1 | 913 |
// Handle array argument |
914 |
for(int i = 0; i < transitive_intf->length(); i++) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
915 |
Klass* intf = transitive_intf->at(i); |
14488 | 916 |
assert(intf->is_interface(), "sanity check"); |
1 | 917 |
|
918 |
// Find no. of methods excluding a <clinit> |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
919 |
int method_count = InstanceKlass::cast(intf)->methods()->length(); |
1 | 920 |
if (method_count > 0) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
921 |
Method* m = InstanceKlass::cast(intf)->methods()->at(0); |
1 | 922 |
assert(m != NULL && m->is_method(), "sanity check"); |
923 |
if (m->name() == vmSymbols::object_initializer_name()) { |
|
924 |
method_count--; |
|
925 |
} |
|
926 |
} |
|
927 |
||
928 |
// Only count interfaces with at least one method |
|
929 |
if (method_count > 0) { |
|
930 |
blk->doit(intf, method_count); |
|
931 |
} |
|
932 |
} |
|
933 |
} |
|
934 |
||
935 |
class CountInterfacesClosure : public InterfaceVisiterClosure { |
|
936 |
private: |
|
937 |
int _nof_methods; |
|
938 |
int _nof_interfaces; |
|
939 |
public: |
|
940 |
CountInterfacesClosure() { _nof_methods = 0; _nof_interfaces = 0; } |
|
941 |
||
942 |
int nof_methods() const { return _nof_methods; } |
|
943 |
int nof_interfaces() const { return _nof_interfaces; } |
|
944 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
945 |
void doit(Klass* intf, int method_count) { _nof_methods += method_count; _nof_interfaces++; } |
1 | 946 |
}; |
947 |
||
948 |
class SetupItableClosure : public InterfaceVisiterClosure { |
|
949 |
private: |
|
950 |
itableOffsetEntry* _offset_entry; |
|
951 |
itableMethodEntry* _method_entry; |
|
952 |
address _klass_begin; |
|
953 |
public: |
|
954 |
SetupItableClosure(address klass_begin, itableOffsetEntry* offset_entry, itableMethodEntry* method_entry) { |
|
955 |
_klass_begin = klass_begin; |
|
956 |
_offset_entry = offset_entry; |
|
957 |
_method_entry = method_entry; |
|
958 |
} |
|
959 |
||
960 |
itableMethodEntry* method_entry() const { return _method_entry; } |
|
961 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
962 |
void doit(Klass* intf, int method_count) { |
1 | 963 |
int offset = ((address)_method_entry) - _klass_begin; |
964 |
_offset_entry->initialize(intf, offset); |
|
965 |
_offset_entry++; |
|
966 |
_method_entry += method_count; |
|
967 |
} |
|
968 |
}; |
|
969 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
970 |
int klassItable::compute_itable_size(Array<Klass*>* transitive_interfaces) { |
1 | 971 |
// Count no of interfaces and total number of interface methods |
972 |
CountInterfacesClosure cic; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
973 |
visit_all_interfaces(transitive_interfaces, &cic); |
1 | 974 |
|
189
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
975 |
// There's alway an extra itable entry so we can null-terminate it. |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
976 |
int itable_size = calc_itable_size(cic.nof_interfaces() + 1, cic.nof_methods()); |
1 | 977 |
|
978 |
// Statistics |
|
979 |
update_stats(itable_size * HeapWordSize); |
|
980 |
||
981 |
return itable_size; |
|
982 |
} |
|
983 |
||
984 |
||
985 |
// Fill out offset table and interface klasses into the itable space |
|
986 |
void klassItable::setup_itable_offset_table(instanceKlassHandle klass) { |
|
987 |
if (klass->itable_length() == 0) return; |
|
988 |
assert(!klass->is_interface(), "Should have zero length itable"); |
|
989 |
||
990 |
// Count no of interfaces and total number of interface methods |
|
991 |
CountInterfacesClosure cic; |
|
992 |
visit_all_interfaces(klass->transitive_interfaces(), &cic); |
|
993 |
int nof_methods = cic.nof_methods(); |
|
994 |
int nof_interfaces = cic.nof_interfaces(); |
|
995 |
||
189
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
996 |
// Add one extra entry so we can null-terminate the table |
4248c8e21063
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
1
diff
changeset
|
997 |
nof_interfaces++; |
1 | 998 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
999 |
assert(compute_itable_size(klass->transitive_interfaces()) == |
1 | 1000 |
calc_itable_size(nof_interfaces, nof_methods), |
1001 |
"mismatch calculation of itable size"); |
|
1002 |
||
1003 |
// Fill-out offset table |
|
1004 |
itableOffsetEntry* ioe = (itableOffsetEntry*)klass->start_of_itable(); |
|
1005 |
itableMethodEntry* ime = (itableMethodEntry*)(ioe + nof_interfaces); |
|
1006 |
intptr_t* end = klass->end_of_itable(); |
|
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8653
diff
changeset
|
1007 |
assert((oop*)(ime + nof_methods) <= (oop*)klass->start_of_nonstatic_oop_maps(), "wrong offset calculation (1)"); |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
189
diff
changeset
|
1008 |
assert((oop*)(end) == (oop*)(ime + nof_methods), "wrong offset calculation (2)"); |
1 | 1009 |
|
1010 |
// Visit all interfaces and initialize itable offset table |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1011 |
SetupItableClosure sic((address)klass(), ioe, ime); |
1 | 1012 |
visit_all_interfaces(klass->transitive_interfaces(), &sic); |
1013 |
||
1014 |
#ifdef ASSERT |
|
1015 |
ime = sic.method_entry(); |
|
1016 |
oop* v = (oop*) klass->end_of_itable(); |
|
1017 |
assert( (oop*)(ime) == v, "wrong offset calculation (2)"); |
|
1018 |
#endif |
|
1019 |
} |
|
1020 |
||
1021 |
||
1022 |
// m must be a method in an interface |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1023 |
int klassItable::compute_itable_index(Method* m) { |
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
1024 |
InstanceKlass* intf = m->method_holder(); |
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
1025 |
assert(intf->is_interface(), "sanity check"); |
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
1026 |
Array<Method*>* methods = intf->methods(); |
1 | 1027 |
int index = 0; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1028 |
while(methods->at(index) != m) { |
1 | 1029 |
index++; |
1030 |
assert(index < methods->length(), "should find index for resolve_invoke"); |
|
1031 |
} |
|
1032 |
// Adjust for <clinit>, which is left out of table if first method |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1033 |
if (methods->length() > 0 && methods->at(0)->is_static_initializer()) { |
1 | 1034 |
index--; |
1035 |
} |
|
1036 |
return index; |
|
1037 |
} |
|
1038 |
||
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1039 |
|
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1040 |
// inverse to compute_itable_index |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1041 |
Method* klassItable::method_for_itable_index(Klass* intf, int itable_index) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1042 |
assert(InstanceKlass::cast(intf)->is_interface(), "sanity check"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1043 |
Array<Method*>* methods = InstanceKlass::cast(intf)->methods(); |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1044 |
|
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1045 |
int index = itable_index; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1046 |
// Adjust for <clinit>, which is left out of table if first method |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1047 |
if (methods->length() > 0 && methods->at(0)->is_static_initializer()) { |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1048 |
index++; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1049 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1050 |
|
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1051 |
if (itable_index < 0 || index >= methods->length()) |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1052 |
return NULL; // help caller defend against bad indexes |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1053 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1054 |
Method* m = methods->at(index); |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1055 |
assert(compute_itable_index(m) == itable_index, "correct inverse"); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1056 |
|
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1057 |
return m; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1058 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2136
diff
changeset
|
1059 |
|
1 | 1060 |
void klassVtable::verify(outputStream* st, bool forced) { |
1061 |
// make sure table is initialized |
|
1062 |
if (!Universe::is_fully_initialized()) return; |
|
1063 |
#ifndef PRODUCT |
|
1064 |
// avoid redundant verifies |
|
1065 |
if (!forced && _verify_count == Universe::verify_count()) return; |
|
1066 |
_verify_count = Universe::verify_count(); |
|
1067 |
#endif |
|
1068 |
oop* end_of_obj = (oop*)_klass() + _klass()->size(); |
|
1069 |
oop* end_of_vtable = (oop *)&table()[_length]; |
|
1070 |
if (end_of_vtable > end_of_obj) { |
|
5403
6b0dd9c75dde
6888954: argument formatting for assert() and friends
jcoomes
parents:
5402
diff
changeset
|
1071 |
fatal(err_msg("klass %s: klass object too short (vtable extends beyond " |
6b0dd9c75dde
6888954: argument formatting for assert() and friends
jcoomes
parents:
5402
diff
changeset
|
1072 |
"end)", _klass->internal_name())); |
1 | 1073 |
} |
1074 |
||
1075 |
for (int i = 0; i < _length; i++) table()[i].verify(this, st); |
|
1076 |
// verify consistency with superKlass vtable |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1077 |
Klass* super = _klass->super(); |
1 | 1078 |
if (super != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1079 |
InstanceKlass* sk = InstanceKlass::cast(super); |
1 | 1080 |
klassVtable* vt = sk->vtable(); |
1081 |
for (int i = 0; i < vt->length(); i++) { |
|
1082 |
verify_against(st, vt, i); |
|
1083 |
} |
|
1084 |
} |
|
1085 |
} |
|
1086 |
||
1087 |
void klassVtable::verify_against(outputStream* st, klassVtable* vt, int index) { |
|
1088 |
vtableEntry* vte = &vt->table()[index]; |
|
1089 |
if (vte->method()->name() != table()[index].method()->name() || |
|
1090 |
vte->method()->signature() != table()[index].method()->signature()) { |
|
1091 |
fatal("mismatched name/signature of vtable entries"); |
|
1092 |
} |
|
1093 |
} |
|
1094 |
||
1095 |
#ifndef PRODUCT |
|
1096 |
void klassVtable::print() { |
|
1097 |
ResourceMark rm; |
|
1098 |
tty->print("klassVtable for klass %s (length %d):\n", _klass->internal_name(), length()); |
|
1099 |
for (int i = 0; i < length(); i++) { |
|
1100 |
table()[i].print(); |
|
1101 |
tty->cr(); |
|
1102 |
} |
|
1103 |
} |
|
1104 |
#endif |
|
1105 |
||
1106 |
void vtableEntry::verify(klassVtable* vt, outputStream* st) { |
|
1107 |
NOT_PRODUCT(FlagSetting fs(IgnoreLockingAssertions, true)); |
|
1108 |
assert(method() != NULL, "must have set method"); |
|
1109 |
method()->verify(); |
|
1110 |
// we sub_type, because it could be a miranda method |
|
1111 |
if (!vt->klass()->is_subtype_of(method()->method_holder())) { |
|
1112 |
#ifndef PRODUCT |
|
1113 |
print(); |
|
1114 |
#endif |
|
5403
6b0dd9c75dde
6888954: argument formatting for assert() and friends
jcoomes
parents:
5402
diff
changeset
|
1115 |
fatal(err_msg("vtableEntry " PTR_FORMAT ": method is from subclass", this)); |
1 | 1116 |
} |
1117 |
} |
|
1118 |
||
1119 |
#ifndef PRODUCT |
|
1120 |
||
1121 |
void vtableEntry::print() { |
|
1122 |
ResourceMark rm; |
|
1123 |
tty->print("vtableEntry %s: ", method()->name()->as_C_string()); |
|
1124 |
if (Verbose) { |
|
1125 |
tty->print("m %#lx ", (address)method()); |
|
1126 |
} |
|
1127 |
} |
|
1128 |
||
1129 |
class VtableStats : AllStatic { |
|
1130 |
public: |
|
1131 |
static int no_klasses; // # classes with vtables |
|
1132 |
static int no_array_klasses; // # array classes |
|
1133 |
static int no_instance_klasses; // # instanceKlasses |
|
1134 |
static int sum_of_vtable_len; // total # of vtable entries |
|
1135 |
static int sum_of_array_vtable_len; // total # of vtable entries in array klasses only |
|
1136 |
static int fixed; // total fixed overhead in bytes |
|
1137 |
static int filler; // overhead caused by filler bytes |
|
1138 |
static int entries; // total bytes consumed by vtable entries |
|
1139 |
static int array_entries; // total bytes consumed by array vtable entries |
|
1140 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1141 |
static void do_class(Klass* k) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
9172
diff
changeset
|
1142 |
Klass* kl = k; |
1 | 1143 |
klassVtable* vt = kl->vtable(); |
1144 |
if (vt == NULL) return; |
|
1145 |
no_klasses++; |
|
1146 |
if (kl->oop_is_instance()) { |
|
1147 |
no_instance_klasses++; |
|
1148 |
kl->array_klasses_do(do_class); |
|
1149 |
} |
|
1150 |
if (kl->oop_is_array()) { |
|
1151 |
no_array_klasses++; |
|
1152 |
sum_of_array_vtable_len += vt->length(); |
|
1153 |
} |
|
1154 |
sum_of_vtable_len += vt->length(); |
|
1155 |
} |
|
1156 |
||
1157 |
static void compute() { |
|
1158 |
SystemDictionary::classes_do(do_class); |
|
1159 |
fixed = no_klasses * oopSize; // vtable length |
|
1160 |
// filler size is a conservative approximation |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
1161 |
filler = oopSize * (no_klasses - no_instance_klasses) * (sizeof(InstanceKlass) - sizeof(ArrayKlass) - 1); |
1 | 1162 |
entries = sizeof(vtableEntry) * sum_of_vtable_len; |
1163 |
array_entries = sizeof(vtableEntry) * sum_of_array_vtable_len; |
|
1164 |
} |
|
1165 |
}; |
|
1166 |
||
1167 |
int VtableStats::no_klasses = 0; |
|
1168 |
int VtableStats::no_array_klasses = 0; |
|
1169 |
int VtableStats::no_instance_klasses = 0; |
|
1170 |
int VtableStats::sum_of_vtable_len = 0; |
|
1171 |
int VtableStats::sum_of_array_vtable_len = 0; |
|
1172 |
int VtableStats::fixed = 0; |
|
1173 |
int VtableStats::filler = 0; |
|
1174 |
int VtableStats::entries = 0; |
|
1175 |
int VtableStats::array_entries = 0; |
|
1176 |
||
1177 |
void klassVtable::print_statistics() { |
|
1178 |
ResourceMark rm; |
|
1179 |
HandleMark hm; |
|
1180 |
VtableStats::compute(); |
|
1181 |
tty->print_cr("vtable statistics:"); |
|
1182 |
tty->print_cr("%6d classes (%d instance, %d array)", VtableStats::no_klasses, VtableStats::no_instance_klasses, VtableStats::no_array_klasses); |
|
1183 |
int total = VtableStats::fixed + VtableStats::filler + VtableStats::entries; |
|
1184 |
tty->print_cr("%6d bytes fixed overhead (refs + vtable object header)", VtableStats::fixed); |
|
1185 |
tty->print_cr("%6d bytes filler overhead", VtableStats::filler); |
|
1186 |
tty->print_cr("%6d bytes for vtable entries (%d for arrays)", VtableStats::entries, VtableStats::array_entries); |
|
1187 |
tty->print_cr("%6d bytes total", total); |
|
1188 |
} |
|
1189 |
||
1190 |
int klassItable::_total_classes; // Total no. of classes with itables |
|
1191 |
long klassItable::_total_size; // Total no. of bytes used for itables |
|
1192 |
||
1193 |
void klassItable::print_statistics() { |
|
1194 |
tty->print_cr("itable statistics:"); |
|
1195 |
tty->print_cr("%6d classes with itables", _total_classes); |
|
1196 |
tty->print_cr("%6d K uses for itables (average by class: %d bytes)", _total_size / K, _total_size / _total_classes); |
|
1197 |
} |
|
1198 |
||
1199 |
#endif // PRODUCT |