Mercurial > hg > graal-compiler
annotate src/share/vm/oops/klassVtable.cpp @ 17937:78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas
8043164: Format warning in traceStream.hpp
Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings
Reviewed-by: kvn, coleenp, iveresov, twisti
author | drchase |
---|---|
date | Thu, 22 May 2014 15:52:41 -0400 |
parents | 386dd1c71858 |
children | f73af4455d7d |
rev | line source |
---|---|
0 | 1 /* |
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17464
diff
changeset
|
2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1490
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1490
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1490
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 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" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
34 #include "oops/method.hpp" |
1972 | 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" | |
0 | 41 |
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
42 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC |
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
43 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
44 inline InstanceKlass* klassVtable::ik() const { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
45 Klass* k = _klass(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
46 assert(k->oop_is_instance(), "not an InstanceKlass"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
47 return (InstanceKlass*)k; |
0 | 48 } |
49 | |
50 | |
51 // this function computes the vtable size (including the size needed for miranda | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
52 // methods) and the number of miranda methods in this class. |
0 | 53 // Note on Miranda methods: Let's say there is a class C that implements |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
54 // interface I, and none of C's superclasses implements I. |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
55 // Let's say there is an abstract method m in I that neither C |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
56 // nor any of its super classes implement (i.e there is no method of any access, |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
57 // with the same name and signature as m), then m is a Miranda method which is |
0 | 58 // entered as a public abstract method in C's vtable. From then on it should |
59 // treated as any other public method in C for method over-ride purposes. | |
6934 | 60 void klassVtable::compute_vtable_size_and_num_mirandas( |
61 int* vtable_length_ret, int* num_new_mirandas, | |
62 GrowableArray<Method*>* all_mirandas, Klass* super, | |
63 Array<Method*>* methods, AccessFlags class_flags, | |
64 Handle classloader, Symbol* classname, Array<Klass*>* local_interfaces, | |
65 TRAPS) { | |
0 | 66 No_Safepoint_Verifier nsv; |
67 | |
68 // set up default result values | |
6934 | 69 int vtable_length = 0; |
0 | 70 |
71 // start off with super's vtable length | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
72 InstanceKlass* sk = (InstanceKlass*)super; |
0 | 73 vtable_length = super == NULL ? 0 : sk->vtable_length(); |
74 | |
75 // go thru each method in the methods table to see if it needs a new entry | |
76 int len = methods->length(); | |
77 for (int i = 0; i < len; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
78 assert(methods->at(i)->is_method(), "must be a Method*"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
79 methodHandle mh(THREAD, methods->at(i)); |
0 | 80 |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
81 if (needs_new_vtable_entry(mh, super, classloader, classname, class_flags, THREAD)) { |
0 | 82 vtable_length += vtableEntry::size(); // we need a new entry |
83 } | |
84 } | |
85 | |
6934 | 86 GrowableArray<Method*> new_mirandas(20); |
0 | 87 // compute the number of mirandas methods that must be added to the end |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
88 get_mirandas(&new_mirandas, all_mirandas, super, methods, NULL, local_interfaces); |
6934 | 89 *num_new_mirandas = new_mirandas.length(); |
90 | |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
91 // Interfaces do not need interface methods in their vtables |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
92 // This includes miranda methods and during later processing, default methods |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
93 if (!class_flags.is_interface()) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
94 vtable_length += *num_new_mirandas * vtableEntry::size(); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
95 } |
0 | 96 |
97 if (Universe::is_bootstrapping() && vtable_length == 0) { | |
98 // array classes don't have their superclass set correctly during | |
99 // bootstrapping | |
100 vtable_length = Universe::base_vtable_size(); | |
101 } | |
102 | |
103 if (super == NULL && !Universe::is_bootstrapping() && | |
104 vtable_length != Universe::base_vtable_size()) { | |
105 // Someone is attempting to redefine java.lang.Object incorrectly. The | |
106 // only way this should happen is from | |
107 // SystemDictionary::resolve_from_stream(), which will detect this later | |
108 // and throw a security exception. So don't assert here to let | |
109 // the exception occur. | |
110 vtable_length = Universe::base_vtable_size(); | |
111 } | |
112 assert(super != NULL || vtable_length == Universe::base_vtable_size(), | |
113 "bad vtable size for class Object"); | |
114 assert(vtable_length % vtableEntry::size() == 0, "bad vtable length"); | |
115 assert(vtable_length >= Universe::base_vtable_size(), "vtable too small"); | |
6934 | 116 |
117 *vtable_length_ret = vtable_length; | |
0 | 118 } |
119 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
120 int klassVtable::index_of(Method* m, int len) const { |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
121 assert(m->has_vtable_index(), "do not ask this of non-vtable methods"); |
0 | 122 return m->vtable_index(); |
123 } | |
124 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
125 // Copy super class's vtable to the first part (prefix) of this class's vtable, |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
126 // and return the number of entries copied. Expects that 'super' is the Java |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
127 // super class (arrays can have "array" super classes that must be skipped). |
0 | 128 int klassVtable::initialize_from_super(KlassHandle super) { |
129 if (super.is_null()) { | |
130 return 0; | |
131 } else { | |
132 // copy methods from superKlass | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
133 // can't inherit from array class, so must be InstanceKlass |
0 | 134 assert(super->oop_is_instance(), "must be instance klass"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
135 InstanceKlass* sk = (InstanceKlass*)super(); |
0 | 136 klassVtable* superVtable = sk->vtable(); |
137 assert(superVtable->length() <= _length, "vtable too short"); | |
138 #ifdef ASSERT | |
139 superVtable->verify(tty, true); | |
140 #endif | |
141 superVtable->copy_vtable_to(table()); | |
142 #ifndef PRODUCT | |
143 if (PrintVtables && Verbose) { | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
144 ResourceMark rm; |
0 | 145 tty->print_cr("copy vtable from %s to %s size %d", sk->internal_name(), klass()->internal_name(), _length); |
146 } | |
147 #endif | |
148 return superVtable->length(); | |
149 } | |
150 } | |
151 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
152 // |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
153 // Revised lookup semantics introduced 1.3 (Kestrel beta) |
0 | 154 void klassVtable::initialize_vtable(bool checkconstraints, TRAPS) { |
155 | |
156 // Note: Arrays can have intermediate array supers. Use java_super to skip them. | |
157 KlassHandle super (THREAD, klass()->java_super()); | |
158 int nofNewEntries = 0; | |
159 | |
160 if (PrintVtables && !klass()->oop_is_array()) { | |
161 ResourceMark rm(THREAD); | |
162 tty->print_cr("Initializing: %s", _klass->name()->as_C_string()); | |
163 } | |
164 | |
165 #ifdef ASSERT | |
166 oop* end_of_obj = (oop*)_klass() + _klass()->size(); | |
167 oop* end_of_vtable = (oop*)&table()[_length]; | |
168 assert(end_of_vtable <= end_of_obj, "vtable extends beyond end"); | |
169 #endif | |
170 | |
171 if (Universe::is_bootstrapping()) { | |
172 // just clear everything | |
173 for (int i = 0; i < _length; i++) table()[i].clear(); | |
174 return; | |
175 } | |
176 | |
177 int super_vtable_len = initialize_from_super(super); | |
178 if (klass()->oop_is_array()) { | |
179 assert(super_vtable_len == _length, "arrays shouldn't introduce new methods"); | |
180 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
181 assert(_klass->oop_is_instance(), "must be InstanceKlass"); |
0 | 182 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
183 Array<Method*>* methods = ik()->methods(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
184 int len = methods->length(); |
0 | 185 int initialized = super_vtable_len; |
186 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
187 // Check each of this class's methods against super; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
188 // if override, replace in copy of super vtable, otherwise append to end |
0 | 189 for (int i = 0; i < len; i++) { |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
190 // update_inherited_vtable can stop for gc - ensure using handles |
0 | 191 HandleMark hm(THREAD); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
192 assert(methods->at(i)->is_method(), "must be a Method*"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
193 methodHandle mh(THREAD, methods->at(i)); |
0 | 194 |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
195 bool needs_new_entry = update_inherited_vtable(ik(), mh, super_vtable_len, -1, checkconstraints, CHECK); |
0 | 196 |
197 if (needs_new_entry) { | |
198 put_method_at(mh(), initialized); | |
199 mh()->set_vtable_index(initialized); // set primary vtable index | |
200 initialized++; | |
201 } | |
202 } | |
203 | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
204 // update vtable with default_methods |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
205 Array<Method*>* default_methods = ik()->default_methods(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
206 if (default_methods != NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
207 len = default_methods->length(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
208 if (len > 0) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
209 Array<int>* def_vtable_indices = NULL; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
210 if ((def_vtable_indices = ik()->default_vtable_indices()) == NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
211 def_vtable_indices = ik()->create_new_default_vtable_indices(len, CHECK); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
212 } else { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
213 assert(def_vtable_indices->length() == len, "reinit vtable len?"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
214 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
215 for (int i = 0; i < len; i++) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
216 HandleMark hm(THREAD); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
217 assert(default_methods->at(i)->is_method(), "must be a Method*"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
218 methodHandle mh(THREAD, default_methods->at(i)); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
219 |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
220 bool needs_new_entry = update_inherited_vtable(ik(), mh, super_vtable_len, i, checkconstraints, CHECK); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
221 |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
222 // needs new entry |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
223 if (needs_new_entry) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
224 put_method_at(mh(), initialized); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
225 def_vtable_indices->at_put(i, initialized); //set vtable index |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
226 initialized++; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
227 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
228 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
229 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
230 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
231 |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
232 // add miranda methods; it will also return the updated initialized |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
233 // Interfaces do not need interface methods in their vtables |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
234 // This includes miranda methods and during later processing, default methods |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
235 if (!ik()->is_interface()) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
236 initialized = fill_in_mirandas(initialized); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
237 } |
0 | 238 |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
239 // In class hierarchies where the accessibility is not increasing (i.e., going from private -> |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
240 // package_private -> public/protected), the vtable might actually be smaller than our initial |
0 | 241 // calculation. |
242 assert(initialized <= _length, "vtable initialization failed"); | |
243 for(;initialized < _length; initialized++) { | |
244 put_method_at(NULL, initialized); | |
245 } | |
246 NOT_PRODUCT(verify(tty, true)); | |
247 } | |
248 } | |
249 | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
250 // Called for cases where a method does not override its superclass' vtable entry |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
251 // For bytecodes not produced by javac together it is possible that a method does not override |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
252 // the superclass's method, but might indirectly override a super-super class's vtable entry |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
253 // If none found, return a null superk, else return the superk of the method this does override |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
254 InstanceKlass* klassVtable::find_transitive_override(InstanceKlass* initialsuper, methodHandle target_method, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
255 int vtable_index, Handle target_loader, Symbol* target_classname, Thread * THREAD) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
256 InstanceKlass* superk = initialsuper; |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
257 while (superk != NULL && superk->super() != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
258 InstanceKlass* supersuperklass = InstanceKlass::cast(superk->super()); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
259 klassVtable* ssVtable = supersuperklass->vtable(); |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
260 if (vtable_index < ssVtable->length()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
261 Method* super_method = ssVtable->method_at(vtable_index); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
262 #ifndef PRODUCT |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
263 Symbol* name= target_method()->name(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
264 Symbol* signature = target_method()->signature(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
265 assert(super_method->name() == name && super_method->signature() == signature, "vtable entry name/sig mismatch"); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
266 #endif |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
267 if (supersuperklass->is_override(super_method, target_loader, target_classname, THREAD)) { |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
268 #ifndef PRODUCT |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
269 if (PrintVtables && Verbose) { |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
270 ResourceMark rm(THREAD); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
271 char* sig = target_method()->name_and_sig_as_C_string(); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
272 tty->print("transitive overriding superclass %s with %s::%s index %d, original flags: ", |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
273 supersuperklass->internal_name(), |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
274 _klass->internal_name(), sig, vtable_index); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
275 super_method->access_flags().print_on(tty); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
276 if (super_method->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
277 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
278 } |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
279 tty->print("overriders flags: "); |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
280 target_method->access_flags().print_on(tty); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
281 if (target_method->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
282 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
283 } |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
284 } |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
285 #endif /*PRODUCT*/ |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
286 break; // return found superk |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
287 } |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
288 } else { |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
289 // super class has no vtable entry here, stop transitive search |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
290 superk = (InstanceKlass*)NULL; |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
291 break; |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
292 } |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
293 // if no override found yet, continue to search up |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
294 superk = InstanceKlass::cast(superk->super()); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
295 } |
0 | 296 |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
297 return superk; |
0 | 298 } |
299 | |
300 // Update child's copy of super vtable for overrides | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
301 // OR return true if a new vtable entry is required. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
302 // Only called for InstanceKlass's, i.e. not for arrays |
0 | 303 // If that changed, could not use _klass as handle for klass |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
304 bool klassVtable::update_inherited_vtable(InstanceKlass* klass, methodHandle target_method, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
305 int super_vtable_len, int default_index, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
306 bool checkconstraints, TRAPS) { |
0 | 307 ResourceMark rm; |
308 bool allocate_new = true; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
309 assert(klass->oop_is_instance(), "must be InstanceKlass"); |
0 | 310 |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
311 Array<int>* def_vtable_indices = NULL; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
312 bool is_default = false; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
313 // default methods are concrete methods in superinterfaces which are added to the vtable |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
314 // with their real method_holder |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
315 // Since vtable and itable indices share the same storage, don't touch |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
316 // the default method's real vtable/itable index |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
317 // default_vtable_indices stores the vtable value relative to this inheritor |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
318 if (default_index >= 0 ) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
319 is_default = true; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
320 def_vtable_indices = klass->default_vtable_indices(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
321 assert(def_vtable_indices != NULL, "def vtable alloc?"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
322 assert(default_index <= def_vtable_indices->length(), "def vtable len?"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
323 } else { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
324 assert(klass == target_method()->method_holder(), "caller resp."); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
325 // Initialize the method's vtable index to "nonvirtual". |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
326 // If we allocate a vtable entry, we will update it to a non-negative number. |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
327 target_method()->set_vtable_index(Method::nonvirtual_vtable_index); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
328 } |
0 | 329 |
330 // Static and <init> methods are never in | |
331 if (target_method()->is_static() || target_method()->name() == vmSymbols::object_initializer_name()) { | |
332 return false; | |
333 } | |
334 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
335 if (target_method->is_final_method(klass->access_flags())) { |
0 | 336 // a final method never needs a new entry; final methods can be statically |
337 // resolved and they have to be present in the vtable only if they override | |
338 // a super's method, in which case they re-use its entry | |
339 allocate_new = false; | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
340 } else if (klass->is_interface()) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
341 allocate_new = false; // see note below in needs_new_vtable_entry |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
342 // An interface never allocates new vtable slots, only inherits old ones. |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
343 // This method will either be assigned its own itable index later, |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
344 // or be assigned an inherited vtable index in the loop below. |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
345 // default methods inherited by classes store their vtable indices |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
346 // in the inheritor's default_vtable_indices |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
347 // default methods inherited by interfaces may already have a |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
348 // valid itable index, if so, don't change it |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
349 // overpass methods in an interface will be assigned an itable index later |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
350 // by an inheriting class |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
351 if (!is_default || !target_method()->has_itable_index()) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
352 target_method()->set_vtable_index(Method::pending_itable_index); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
353 } |
0 | 354 } |
355 | |
356 // we need a new entry if there is no superclass | |
357 if (klass->super() == NULL) { | |
358 return allocate_new; | |
359 } | |
360 | |
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
361 // private methods in classes always have a new entry in the vtable |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
362 // specification interpretation since classic has |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
363 // private methods not overriding |
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
364 // JDK8 adds private methods in interfaces which require invokespecial |
0 | 365 if (target_method()->is_private()) { |
366 return allocate_new; | |
367 } | |
368 | |
369 // search through the vtable and update overridden entries | |
370 // Since check_signature_loaders acquires SystemDictionary_lock | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
371 // which can block for gc, once we are in this loop, use handles |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
372 // For classfiles built with >= jdk7, we now look for transitive overrides |
0 | 373 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
374 Symbol* name = target_method()->name(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
375 Symbol* signature = target_method()->signature(); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
376 |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
377 KlassHandle target_klass(THREAD, target_method()->method_holder()); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
378 if (target_klass == NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
379 target_klass = _klass; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
380 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
381 |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
382 Handle target_loader(THREAD, target_klass->class_loader()); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
383 |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
384 Symbol* target_classname = target_klass->name(); |
0 | 385 for(int i = 0; i < super_vtable_len; i++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
386 Method* super_method = method_at(i); |
0 | 387 // Check if method name matches |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
388 if (super_method->name() == name && super_method->signature() == signature) { |
0 | 389 |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
390 // get super_klass for method_holder for the found method |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
391 InstanceKlass* super_klass = super_method->method_holder(); |
0 | 392 |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
393 if (is_default |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
394 || ((super_klass->is_override(super_method, target_loader, target_classname, THREAD)) |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
395 || ((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
396 && ((super_klass = find_transitive_override(super_klass, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
397 target_method, i, target_loader, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
398 target_classname, THREAD)) |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
399 != (InstanceKlass*)NULL)))) |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
400 { |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
401 // overriding, so no new entry |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
402 allocate_new = false; |
0 | 403 |
404 if (checkconstraints) { | |
405 // Override vtable entry if passes loader constraint check | |
406 // if loader constraint checking requested | |
407 // No need to visit his super, since he and his super | |
408 // have already made any needed loader constraints. | |
409 // Since loader constraints are transitive, it is enough | |
410 // to link to the first super, and we get all the others. | |
411 Handle super_loader(THREAD, super_klass->class_loader()); | |
412 | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
413 if (target_loader() != super_loader()) { |
0 | 414 ResourceMark rm(THREAD); |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
415 Symbol* failed_type_symbol = |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
416 SystemDictionary::check_signature_loaders(signature, target_loader, |
0 | 417 super_loader, true, |
418 CHECK_(false)); | |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
419 if (failed_type_symbol != NULL) { |
0 | 420 const char* msg = "loader constraint violation: when resolving " |
421 "overridden method \"%s\" the class loader (instance" | |
422 " of %s) of the current class, %s, and its superclass loader " | |
423 "(instance of %s), have different Class objects for the type " | |
424 "%s used in the signature"; | |
425 char* sig = target_method()->name_and_sig_as_C_string(); | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
426 const char* loader1 = SystemDictionary::loader_name(target_loader()); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
427 char* current = target_klass->name()->as_C_string(); |
0 | 428 const char* loader2 = SystemDictionary::loader_name(super_loader()); |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
429 char* failed_type_name = failed_type_symbol->as_C_string(); |
0 | 430 size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + |
431 strlen(current) + strlen(loader2) + strlen(failed_type_name); | |
432 char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); | |
433 jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2, | |
434 failed_type_name); | |
435 THROW_MSG_(vmSymbols::java_lang_LinkageError(), buf, false); | |
436 } | |
437 } | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
438 } |
0 | 439 |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
440 put_method_at(target_method(), i); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
441 if (!is_default) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
442 target_method()->set_vtable_index(i); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
443 } else { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
444 if (def_vtable_indices != NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
445 def_vtable_indices->at_put(default_index, i); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
446 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
447 assert(super_method->is_default_method() || super_method->is_overpass() |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
448 || super_method->is_abstract(), "default override error"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
449 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
450 |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
451 |
0 | 452 #ifndef PRODUCT |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
453 if (PrintVtables && Verbose) { |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
454 ResourceMark rm(THREAD); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
455 char* sig = target_method()->name_and_sig_as_C_string(); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
456 tty->print("overriding with %s::%s index %d, original flags: ", |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
457 target_klass->internal_name(), sig, i); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
458 super_method->access_flags().print_on(tty); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
459 if (super_method->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
460 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
461 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
462 if (super_method->is_overpass()) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
463 tty->print("overpass"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
464 } |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
465 tty->print("overriders flags: "); |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
466 target_method->access_flags().print_on(tty); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
467 if (target_method->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
468 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
469 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
470 if (target_method->is_overpass()) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
471 tty->print("overpass"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
472 } |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
473 tty->cr(); |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
474 } |
0 | 475 #endif /*PRODUCT*/ |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
476 } else { |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
477 // allocate_new = true; default. We might override one entry, |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
478 // but not override another. Once we override one, not need new |
0 | 479 #ifndef PRODUCT |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
480 if (PrintVtables && Verbose) { |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
481 ResourceMark rm(THREAD); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
482 char* sig = target_method()->name_and_sig_as_C_string(); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
483 tty->print("NOT overriding with %s::%s index %d, original flags: ", |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
484 target_klass->internal_name(), sig,i); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
485 super_method->access_flags().print_on(tty); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
486 if (super_method->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
487 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
488 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
489 if (super_method->is_overpass()) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
490 tty->print("overpass"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
491 } |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
492 tty->print("overriders flags: "); |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
493 target_method->access_flags().print_on(tty); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
494 if (target_method->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
495 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
496 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
497 if (target_method->is_overpass()) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
498 tty->print("overpass"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
499 } |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
500 tty->cr(); |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
501 } |
0 | 502 #endif /*PRODUCT*/ |
503 } | |
504 } | |
505 } | |
506 return allocate_new; | |
507 } | |
508 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
509 void klassVtable::put_method_at(Method* m, int index) { |
0 | 510 #ifndef PRODUCT |
511 if (PrintVtables && Verbose) { | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
512 ResourceMark rm; |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
513 const char* sig = (m != NULL) ? m->name_and_sig_as_C_string() : "<NULL>"; |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
514 tty->print("adding %s at index %d, flags: ", sig, index); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
515 if (m != NULL) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
516 m->access_flags().print_on(tty); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
517 if (m->is_default_method()) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
518 tty->print("default "); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
519 } |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
520 if (m->is_overpass()) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
521 tty->print("overpass"); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
522 } |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
523 } |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
524 tty->cr(); |
0 | 525 } |
526 #endif | |
527 table()[index].set(m); | |
528 } | |
529 | |
530 // Find out if a method "m" with superclass "super", loader "classloader" and | |
531 // name "classname" needs a new vtable entry. Let P be a class package defined | |
532 // by "classloader" and "classname". | |
533 // NOTE: The logic used here is very similar to the one used for computing | |
534 // the vtables indices for a method. We cannot directly use that function because, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
535 // we allocate the InstanceKlass at load time, and that requires that the |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
536 // superclass has been loaded. |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
537 // However, the vtable entries are filled in at link time, and therefore |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
538 // the superclass' vtable may not yet have been filled in. |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
539 bool klassVtable::needs_new_vtable_entry(methodHandle target_method, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
540 Klass* super, |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
541 Handle classloader, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
542 Symbol* classname, |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
543 AccessFlags class_flags, |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
544 TRAPS) { |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
545 if (class_flags.is_interface()) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
546 // Interfaces do not use vtables, so there is no point to assigning |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
547 // a vtable index to any of their methods. If we refrain from doing this, |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
548 // we can use Method::_vtable_index to hold the itable index |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
549 return false; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
550 } |
6934 | 551 |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
552 if (target_method->is_final_method(class_flags) || |
0 | 553 // a final method never needs a new entry; final methods can be statically |
554 // resolved and they have to be present in the vtable only if they override | |
555 // a super's method, in which case they re-use its entry | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
556 (target_method()->is_static()) || |
0 | 557 // static methods don't need to be in vtable |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
558 (target_method()->name() == vmSymbols::object_initializer_name()) |
0 | 559 // <init> is never called dynamically-bound |
560 ) { | |
561 return false; | |
562 } | |
563 | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
564 // Concrete interface methods do not need new entries, they override |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
565 // abstract method entries using default inheritance rules |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
566 if (target_method()->method_holder() != NULL && |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
567 target_method()->method_holder()->is_interface() && |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
568 !target_method()->is_abstract() ) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
569 return false; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
570 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
571 |
0 | 572 // we need a new entry if there is no superclass |
573 if (super == NULL) { | |
574 return true; | |
575 } | |
576 | |
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
577 // private methods in classes always have a new entry in the vtable |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
578 // specification interpretation since classic has |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
579 // private methods not overriding |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
580 // JDK8 adds private methods in interfaces which require invokespecial |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
581 if (target_method()->is_private()) { |
0 | 582 return true; |
583 } | |
584 | |
585 // search through the super class hierarchy to see if we need | |
586 // a new entry | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
587 ResourceMark rm; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
588 Symbol* name = target_method()->name(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
589 Symbol* signature = target_method()->signature(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
590 Klass* k = super; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
591 Method* super_method = NULL; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
592 InstanceKlass *holder = NULL; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
593 Method* recheck_method = NULL; |
0 | 594 while (k != NULL) { |
595 // lookup through the hierarchy for a method with matching name and sign. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
596 super_method = InstanceKlass::cast(k)->lookup_method(name, signature); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
597 if (super_method == NULL) { |
0 | 598 break; // we still have to search for a matching miranda method |
599 } | |
600 // get the class holding the matching method | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
601 // make sure you use that class for is_override |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
602 InstanceKlass* superk = super_method->method_holder(); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
603 // we want only instance method matches |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
604 // pretend private methods are not in the super vtable |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
605 // since we do override around them: e.g. a.m pub/b.m private/c.m pub, |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
606 // ignore private, c.m pub does override a.m pub |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
607 // For classes that were not javac'd together, we also do transitive overriding around |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
608 // methods that have less accessibility |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
609 if ((!super_method->is_static()) && |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
610 (!super_method->is_private())) { |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
611 if (superk->is_override(super_method, classloader, classname, THREAD)) { |
0 | 612 return false; |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
613 // else keep looking for transitive overrides |
0 | 614 } |
615 } | |
616 | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
617 // Start with lookup result and continue to search up |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
618 k = superk->super(); // haven't found an override match yet; continue to look |
0 | 619 } |
620 | |
621 // if the target method is public or protected it may have a matching | |
622 // miranda method in the super, whose entry it should re-use. | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
623 // Actually, to handle cases that javac would not generate, we need |
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
624 // this check for all access permissions. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
625 InstanceKlass *sk = InstanceKlass::cast(super); |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
626 if (sk->has_miranda_methods()) { |
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17464
diff
changeset
|
627 if (sk->lookup_method_in_all_interfaces(name, signature, Klass::normal) != NULL) { |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
628 return false; // found a matching miranda; we do not need a new entry |
0 | 629 } |
630 } | |
631 return true; // found no match; we need a new entry | |
632 } | |
633 | |
634 // Support for miranda methods | |
635 | |
636 // get the vtable index of a miranda method with matching "name" and "signature" | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
637 int klassVtable::index_of_miranda(Symbol* name, Symbol* signature) { |
0 | 638 // search from the bottom, might be faster |
639 for (int i = (length() - 1); i >= 0; i--) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
640 Method* m = table()[i].method(); |
0 | 641 if (is_miranda_entry_at(i) && |
642 m->name() == name && m->signature() == signature) { | |
643 return i; | |
644 } | |
645 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
646 return Method::invalid_vtable_index; |
0 | 647 } |
648 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
649 // check if an entry at an index is miranda |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
650 // requires that method m at entry be declared ("held") by an interface. |
0 | 651 bool klassVtable::is_miranda_entry_at(int i) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
652 Method* m = method_at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
653 Klass* method_holder = m->method_holder(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
654 InstanceKlass *mhk = InstanceKlass::cast(method_holder); |
0 | 655 |
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
656 // miranda methods are public abstract instance interface methods in a class's vtable |
0 | 657 if (mhk->is_interface()) { |
6934 | 658 assert(m->is_public(), "should be public"); |
0 | 659 assert(ik()->implements_interface(method_holder) , "this class should implement the interface"); |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
660 // the search could find a miranda or a default method |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
661 if (is_miranda(m, ik()->methods(), ik()->default_methods(), ik()->super())) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
662 return true; |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
663 } |
0 | 664 } |
665 return false; | |
666 } | |
667 | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
668 // check if a method is a miranda method, given a class's methods table, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
669 // its default_method table and its super |
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
670 // Miranda methods are calculated twice: |
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
671 // first: before vtable size calculation: including abstract and default |
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
672 // This is seen by default method creation |
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
673 // Second: recalculated during vtable initialization: only abstract |
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
674 // This is seen by link resolution and selection. |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
675 // "miranda" means not static, not defined by this class. |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
676 // private methods in interfaces do not belong in the miranda list. |
0 | 677 // the caller must make sure that the method belongs to an interface implemented by the class |
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
678 // Miranda methods only include public interface instance methods |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
679 // Not private methods, not static methods, not default == concrete abstract |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
680 // Miranda methods also do not include overpass methods in interfaces |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
681 bool klassVtable::is_miranda(Method* m, Array<Method*>* class_methods, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
682 Array<Method*>* default_methods, Klass* super) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
683 if (m->is_static() || m->is_private() || m->is_overpass()) { |
10166
08236d966eea
8013418: assert(i == total_args_passed) in AdapterHandlerLibrary::get_adapter since 8-b87
bharadwaj
parents:
8840
diff
changeset
|
684 return false; |
08236d966eea
8013418: assert(i == total_args_passed) in AdapterHandlerLibrary::get_adapter since 8-b87
bharadwaj
parents:
8840
diff
changeset
|
685 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
686 Symbol* name = m->name(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
687 Symbol* signature = m->signature(); |
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
688 |
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
689 if (InstanceKlass::find_instance_method(class_methods, name, signature) == NULL) { |
2018
642e54d1850a
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
1972
diff
changeset
|
690 // did not find it in the method table of the current class |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
691 if ((default_methods == NULL) || |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
692 InstanceKlass::find_method(default_methods, name, signature) == NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
693 if (super == NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
694 // super doesn't exist |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
695 return true; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
696 } |
2018
642e54d1850a
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
1972
diff
changeset
|
697 |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
698 Method* mo = InstanceKlass::cast(super)->lookup_method(name, signature); |
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
699 while (mo != NULL && mo->access_flags().is_static() |
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
700 && mo->method_holder() != NULL |
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
701 && mo->method_holder()->super() != NULL) |
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
702 { |
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17464
diff
changeset
|
703 mo = mo->method_holder()->super()->uncached_lookup_method(name, signature, Klass::normal); |
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
704 } |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
705 if (mo == NULL || mo->access_flags().is_private() ) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
706 // super class hierarchy does not implement it or protection is different |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
707 return true; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
708 } |
0 | 709 } |
710 } | |
2018
642e54d1850a
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
1972
diff
changeset
|
711 |
0 | 712 return false; |
713 } | |
714 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
715 // Scans current_interface_methods for miranda methods that do not |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
716 // already appear in new_mirandas, or default methods, and are also not defined-and-non-private |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
717 // in super (superclass). These mirandas are added to all_mirandas if it is |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
718 // not null; in addition, those that are not duplicates of miranda methods |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
719 // inherited by super from its interfaces are added to new_mirandas. |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
720 // Thus, new_mirandas will be the set of mirandas that this class introduces, |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
721 // all_mirandas will be the set of all mirandas applicable to this class |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
722 // including all defined in superclasses. |
6934 | 723 void klassVtable::add_new_mirandas_to_lists( |
724 GrowableArray<Method*>* new_mirandas, GrowableArray<Method*>* all_mirandas, | |
725 Array<Method*>* current_interface_methods, Array<Method*>* class_methods, | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
726 Array<Method*>* default_methods, Klass* super) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
727 |
0 | 728 // iterate thru the current interface's method to see if it a miranda |
729 int num_methods = current_interface_methods->length(); | |
730 for (int i = 0; i < num_methods; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
731 Method* im = current_interface_methods->at(i); |
0 | 732 bool is_duplicate = false; |
6934 | 733 int num_of_current_mirandas = new_mirandas->length(); |
0 | 734 // check for duplicate mirandas in different interfaces we implement |
735 for (int j = 0; j < num_of_current_mirandas; j++) { | |
6934 | 736 Method* miranda = new_mirandas->at(j); |
0 | 737 if ((im->name() == miranda->name()) && |
738 (im->signature() == miranda->signature())) { | |
739 is_duplicate = true; | |
740 break; | |
741 } | |
742 } | |
743 | |
744 if (!is_duplicate) { // we don't want duplicate miranda entries in the vtable | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
745 if (is_miranda(im, class_methods, default_methods, super)) { // is it a miranda at all? |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
746 InstanceKlass *sk = InstanceKlass::cast(super); |
0 | 747 // check if it is a duplicate of a super's miranda |
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17464
diff
changeset
|
748 if (sk->lookup_method_in_all_interfaces(im->name(), im->signature(), Klass::normal) == NULL) { |
6934 | 749 new_mirandas->append(im); |
750 } | |
751 if (all_mirandas != NULL) { | |
752 all_mirandas->append(im); | |
0 | 753 } |
754 } | |
755 } | |
756 } | |
757 } | |
758 | |
6934 | 759 void klassVtable::get_mirandas(GrowableArray<Method*>* new_mirandas, |
760 GrowableArray<Method*>* all_mirandas, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
761 Klass* super, Array<Method*>* class_methods, |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
762 Array<Method*>* default_methods, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
763 Array<Klass*>* local_interfaces) { |
6934 | 764 assert((new_mirandas->length() == 0) , "current mirandas must be 0"); |
0 | 765 |
766 // iterate thru the local interfaces looking for a miranda | |
767 int num_local_ifs = local_interfaces->length(); | |
768 for (int i = 0; i < num_local_ifs; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
769 InstanceKlass *ik = InstanceKlass::cast(local_interfaces->at(i)); |
6934 | 770 add_new_mirandas_to_lists(new_mirandas, all_mirandas, |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
771 ik->methods(), class_methods, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
772 default_methods, super); |
0 | 773 // iterate thru each local's super interfaces |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
774 Array<Klass*>* super_ifs = ik->transitive_interfaces(); |
0 | 775 int num_super_ifs = super_ifs->length(); |
776 for (int j = 0; j < num_super_ifs; j++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
777 InstanceKlass *sik = InstanceKlass::cast(super_ifs->at(j)); |
6934 | 778 add_new_mirandas_to_lists(new_mirandas, all_mirandas, |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
779 sik->methods(), class_methods, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
780 default_methods, super); |
0 | 781 } |
782 } | |
783 } | |
784 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
785 // Discover miranda methods ("miranda" = "interface abstract, no binding"), |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
786 // and append them into the vtable starting at index initialized, |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
787 // return the new value of initialized. |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
788 // Miranda methods use vtable entries, but do not get assigned a vtable_index |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
789 // The vtable_index is discovered by searching from the end of the vtable |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
790 int klassVtable::fill_in_mirandas(int initialized) { |
6934 | 791 GrowableArray<Method*> mirandas(20); |
792 get_mirandas(&mirandas, NULL, ik()->super(), ik()->methods(), | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
793 ik()->default_methods(), ik()->local_interfaces()); |
6934 | 794 for (int i = 0; i < mirandas.length(); i++) { |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
795 if (PrintVtables && Verbose) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
796 Method* meth = mirandas.at(i); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
797 ResourceMark rm(Thread::current()); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
798 if (meth != NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
799 char* sig = meth->name_and_sig_as_C_string(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
800 tty->print("fill in mirandas with %s index %d, flags: ", |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
801 sig, initialized); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
802 meth->access_flags().print_on(tty); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
803 if (meth->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
804 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
805 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
806 tty->cr(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
807 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
808 } |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
809 put_method_at(mirandas.at(i), initialized); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
810 ++initialized; |
0 | 811 } |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
812 return initialized; |
0 | 813 } |
814 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
815 // Copy this class's vtable to the vtable beginning at start. |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
816 // Used to copy superclass vtable to prefix of subclass's vtable. |
0 | 817 void klassVtable::copy_vtable_to(vtableEntry* start) { |
818 Copy::disjoint_words((HeapWord*)table(), (HeapWord*)start, _length * vtableEntry::size()); | |
819 } | |
820 | |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
821 #if INCLUDE_JVMTI |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
822 bool klassVtable::adjust_default_method(int vtable_index, Method* old_method, Method* new_method) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
823 // If old_method is default, find this vtable index in default_vtable_indices |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
824 // and replace that method in the _default_methods list |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
825 bool updated = false; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
826 |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
827 Array<Method*>* default_methods = ik()->default_methods(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
828 if (default_methods != NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
829 int len = default_methods->length(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
830 for (int idx = 0; idx < len; idx++) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
831 if (vtable_index == ik()->default_vtable_indices()->at(idx)) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
832 if (default_methods->at(idx) == old_method) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
833 default_methods->at_put(idx, new_method); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
834 updated = true; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
835 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
836 break; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
837 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
838 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
839 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
840 return updated; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
841 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
842 void klassVtable::adjust_method_entries(Method** old_methods, Method** new_methods, |
0 | 843 int methods_length, bool * trace_name_printed) { |
844 // search the vtable for uses of either obsolete or EMCP methods | |
845 for (int j = 0; j < methods_length; j++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
846 Method* old_method = old_methods[j]; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
847 Method* new_method = new_methods[j]; |
0 | 848 |
849 // In the vast majority of cases we could get the vtable index | |
850 // by using: old_method->vtable_index() | |
851 // However, there are rare cases, eg. sun.awt.X11.XDecoratedPeer.getX() | |
852 // in sun.awt.X11.XFramePeer where methods occur more than once in the | |
853 // vtable, so, alas, we must do an exhaustive search. | |
854 for (int index = 0; index < length(); index++) { | |
855 if (unchecked_method_at(index) == old_method) { | |
856 put_method_at(new_method, index); | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
857 // For default methods, need to update the _default_methods array |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
858 // which can only have one method entry for a given signature |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
859 bool updated_default = false; |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
860 if (old_method->is_default_method()) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
861 updated_default = adjust_default_method(index, old_method, new_method); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
862 } |
0 | 863 |
864 if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { | |
865 if (!(*trace_name_printed)) { | |
866 // RC_TRACE_MESG macro has an embedded ResourceMark | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
867 RC_TRACE_MESG(("adjust: klassname=%s for methods from name=%s", |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
868 klass()->external_name(), |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
869 old_method->method_holder()->external_name())); |
0 | 870 *trace_name_printed = true; |
871 } | |
872 // RC_TRACE macro has an embedded ResourceMark | |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
873 RC_TRACE(0x00100000, ("vtable method update: %s(%s), updated default = %s", |
0 | 874 new_method->name()->as_C_string(), |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
875 new_method->signature()->as_C_string(), |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
876 updated_default ? "true" : "false")); |
0 | 877 } |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
878 // cannot 'break' here; see for-loop comment above. |
0 | 879 } |
880 } | |
881 } | |
882 } | |
883 | |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
884 // a vtable should never contain old or obsolete methods |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
885 bool klassVtable::check_no_old_or_obsolete_entries() { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
886 for (int i = 0; i < length(); i++) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
887 Method* m = unchecked_method_at(i); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
888 if (m != NULL && |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
889 (NOT_PRODUCT(!m->is_valid() ||) m->is_old() || m->is_obsolete())) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
890 return false; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
891 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
892 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
893 return true; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
894 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
895 |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
896 void klassVtable::dump_vtable() { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
897 tty->print_cr("vtable dump --"); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
898 for (int i = 0; i < length(); i++) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
899 Method* m = unchecked_method_at(i); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
900 if (m != NULL) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
901 tty->print(" (%5d) ", i); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
902 m->access_flags().print_on(tty); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
903 if (m->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
904 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
905 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
906 if (m->is_overpass()) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
907 tty->print("overpass"); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
908 } |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
909 tty->print(" -- "); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
910 m->print_name(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
911 tty->cr(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
912 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
913 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
914 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
915 #endif // INCLUDE_JVMTI |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
916 |
3245
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
917 // CDS/RedefineClasses support - clear vtables so they can be reinitialized |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
918 void klassVtable::clear_vtable() { |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
919 for (int i = 0; i < _length; i++) table()[i].clear(); |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
920 } |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
921 |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
922 bool klassVtable::is_initialized() { |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
923 return _length == 0 || table()[0].method() != NULL; |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
924 } |
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
925 |
0 | 926 //----------------------------------------------------------------------------------------- |
927 // Itable code | |
928 | |
929 // Initialize a itableMethodEntry | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
930 void itableMethodEntry::initialize(Method* m) { |
0 | 931 if (m == NULL) return; |
932 | |
933 _method = m; | |
934 } | |
935 | |
936 klassItable::klassItable(instanceKlassHandle klass) { | |
937 _klass = klass; | |
938 | |
939 if (klass->itable_length() > 0) { | |
940 itableOffsetEntry* offset_entry = (itableOffsetEntry*)klass->start_of_itable(); | |
941 if (offset_entry != NULL && offset_entry->interface_klass() != NULL) { // Check that itable is initialized | |
942 // First offset entry points to the first method_entry | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
943 intptr_t* method_entry = (intptr_t *)(((address)klass()) + offset_entry->offset()); |
0 | 944 intptr_t* end = klass->end_of_itable(); |
945 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
946 _table_offset = (intptr_t*)offset_entry - (intptr_t*)klass(); |
0 | 947 _size_offset_table = (method_entry - ((intptr_t*)offset_entry)) / itableOffsetEntry::size(); |
948 _size_method_table = (end - method_entry) / itableMethodEntry::size(); | |
949 assert(_table_offset >= 0 && _size_offset_table >= 0 && _size_method_table >= 0, "wrong computation"); | |
950 return; | |
951 } | |
952 } | |
953 | |
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
954 // The length of the itable was either zero, or it has not yet been initialized. |
0 | 955 _table_offset = 0; |
956 _size_offset_table = 0; | |
957 _size_method_table = 0; | |
958 } | |
959 | |
960 static int initialize_count = 0; | |
961 | |
962 // Initialization | |
963 void klassItable::initialize_itable(bool checkconstraints, TRAPS) { | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
964 if (_klass->is_interface()) { |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
965 // This needs to go after vtable indices are assigned but |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
966 // before implementors need to know the number of itable indices. |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
967 assign_itable_indices_for_interface(_klass()); |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
968 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
969 |
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
970 // Cannot be setup doing bootstrapping, interfaces don't have |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
971 // itables, and klass with only ones entry have empty itables |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
972 if (Universe::is_bootstrapping() || |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
973 _klass->is_interface() || |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
974 _klass->itable_length() == itableOffsetEntry::size()) return; |
0 | 975 |
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
976 // There's alway an extra itable entry so we can null-terminate it. |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
977 guarantee(size_offset_table() >= 1, "too small"); |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
978 int num_interfaces = size_offset_table() - 1; |
0 | 979 if (num_interfaces > 0) { |
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
980 if (TraceItables) tty->print_cr("%3d: Initializing itables for %s", ++initialize_count, |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
981 _klass->name()->as_C_string()); |
0 | 982 |
983 | |
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
984 // Iterate through all interfaces |
0 | 985 int i; |
986 for(i = 0; i < num_interfaces; i++) { | |
987 itableOffsetEntry* ioe = offset_entry(i); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
988 HandleMark hm(THREAD); |
0 | 989 KlassHandle interf_h (THREAD, ioe->interface_klass()); |
990 assert(interf_h() != NULL && ioe->offset() != 0, "bad offset entry in itable"); | |
991 initialize_itable_for_interface(ioe->offset(), interf_h, checkconstraints, CHECK); | |
992 } | |
993 | |
994 } | |
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
995 // Check that the last entry is empty |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
996 itableOffsetEntry* ioe = offset_entry(size_offset_table() - 1); |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
997 guarantee(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing"); |
0 | 998 } |
999 | |
1000 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1001 inline bool interface_method_needs_itable_index(Method* m) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1002 if (m->is_static()) return false; // e.g., Stream.empty |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1003 if (m->is_initializer()) return false; // <init> or <clinit> |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1004 // If an interface redeclares a method from java.lang.Object, |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1005 // it should already have a vtable index, don't touch it. |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1006 // e.g., CharSequence.toString (from initialize_vtable) |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1007 // if (m->has_vtable_index()) return false; // NO! |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1008 return true; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1009 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1010 |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1011 int klassItable::assign_itable_indices_for_interface(Klass* klass) { |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1012 // an interface does not have an itable, but its methods need to be numbered |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1013 if (TraceItables) tty->print_cr("%3d: Initializing itable for interface %s", ++initialize_count, |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1014 klass->name()->as_C_string()); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1015 Array<Method*>* methods = InstanceKlass::cast(klass)->methods(); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1016 int nof_methods = methods->length(); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1017 int ime_num = 0; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1018 for (int i = 0; i < nof_methods; i++) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1019 Method* m = methods->at(i); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1020 if (interface_method_needs_itable_index(m)) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1021 assert(!m->is_final_method(), "no final interface methods"); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1022 // If m is already assigned a vtable index, do not disturb it. |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1023 if (TraceItables && Verbose) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1024 ResourceMark rm; |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1025 const char* sig = (m != NULL) ? m->name_and_sig_as_C_string() : "<NULL>"; |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1026 if (m->has_vtable_index()) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1027 tty->print("itable index %d for method: %s, flags: ", m->vtable_index(), sig); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1028 } else { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1029 tty->print("itable index %d for method: %s, flags: ", ime_num, sig); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1030 } |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1031 if (m != NULL) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1032 m->access_flags().print_on(tty); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1033 if (m->is_default_method()) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1034 tty->print("default "); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1035 } |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1036 if (m->is_overpass()) { |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1037 tty->print("overpass"); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1038 } |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1039 } |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1040 tty->cr(); |
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1041 } |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1042 if (!m->has_vtable_index()) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1043 assert(m->vtable_index() == Method::pending_itable_index, "set by initialize_vtable"); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1044 m->set_itable_index(ime_num); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1045 // Progress to next itable entry |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1046 ime_num++; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1047 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1048 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1049 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1050 assert(ime_num == method_count_for_interface(klass), "proper sizing"); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1051 return ime_num; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1052 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1053 |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1054 int klassItable::method_count_for_interface(Klass* interf) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1055 assert(interf->oop_is_instance(), "must be"); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1056 assert(interf->is_interface(), "must be"); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1057 Array<Method*>* methods = InstanceKlass::cast(interf)->methods(); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1058 int nof_methods = methods->length(); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1059 while (nof_methods > 0) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1060 Method* m = methods->at(nof_methods-1); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1061 if (m->has_itable_index()) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1062 int length = m->itable_index() + 1; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1063 #ifdef ASSERT |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1064 while (nof_methods = 0) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1065 m = methods->at(--nof_methods); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1066 assert(!m->has_itable_index() || m->itable_index() < length, ""); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1067 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1068 #endif //ASSERT |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1069 return length; // return the rightmost itable index, plus one |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1070 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1071 nof_methods -= 1; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1072 } |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1073 // no methods have itable indices |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1074 return 0; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1075 } |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1076 |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1077 |
0 | 1078 void klassItable::initialize_itable_for_interface(int method_table_offset, KlassHandle interf_h, bool checkconstraints, TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1079 Array<Method*>* methods = InstanceKlass::cast(interf_h())->methods(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1080 int nof_methods = methods->length(); |
0 | 1081 HandleMark hm; |
1489
cff162798819
6888953: some calls to function-like macros are missing semicolons
jcoomes
parents:
676
diff
changeset
|
1082 assert(nof_methods > 0, "at least one method must exist for interface to be in vtable"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1083 Handle interface_loader (THREAD, InstanceKlass::cast(interf_h())->class_loader()); |
0 | 1084 |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1085 int ime_count = method_count_for_interface(interf_h()); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1086 for (int i = 0; i < nof_methods; i++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1087 Method* m = methods->at(i); |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1088 methodHandle target; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1089 if (m->has_itable_index()) { |
17464
5832cdaf89c6
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13414
diff
changeset
|
1090 // This search must match the runtime resolution, i.e. selection search for invokeinterface |
5832cdaf89c6
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13414
diff
changeset
|
1091 // to correctly enforce loader constraints for interface method inheritance |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1092 LinkResolver::lookup_instance_method_in_klasses(target, _klass, m->name(), m->signature(), CHECK); |
0 | 1093 } |
1094 if (target == NULL || !target->is_public() || target->is_abstract()) { | |
13403
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1095 // Entry does not resolve. Leave it empty for AbstractMethodError. |
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1096 if (!(target == NULL) && !target->is_public()) { |
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1097 // Stuff an IllegalAccessError throwing method in there instead. |
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1098 itableOffsetEntry::method_entry(_klass(), method_table_offset)[m->itable_index()]. |
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1099 initialize(Universe::throw_illegal_access_error()); |
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1100 } |
0 | 1101 } else { |
1102 // Entry did resolve, check loader constraints before initializing | |
1103 // if checkconstraints requested | |
1104 if (checkconstraints) { | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
1105 Handle method_holder_loader (THREAD, target->method_holder()->class_loader()); |
0 | 1106 if (method_holder_loader() != interface_loader()) { |
1107 ResourceMark rm(THREAD); | |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
1108 Symbol* failed_type_symbol = |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1109 SystemDictionary::check_signature_loaders(m->signature(), |
0 | 1110 method_holder_loader, |
1111 interface_loader, | |
1112 true, CHECK); | |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
1113 if (failed_type_symbol != NULL) { |
0 | 1114 const char* msg = "loader constraint violation in interface " |
1115 "itable initialization: when resolving method \"%s\" the class" | |
1116 " loader (instance of %s) of the current class, %s, " | |
1117 "and the class loader (instance of %s) for interface " | |
1118 "%s have different Class objects for the type %s " | |
1119 "used in the signature"; | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1120 char* sig = target()->name_and_sig_as_C_string(); |
0 | 1121 const char* loader1 = SystemDictionary::loader_name(method_holder_loader()); |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1122 char* current = _klass->name()->as_C_string(); |
0 | 1123 const char* loader2 = SystemDictionary::loader_name(interface_loader()); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1124 char* iface = InstanceKlass::cast(interf_h())->name()->as_C_string(); |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
1125 char* failed_type_name = failed_type_symbol->as_C_string(); |
0 | 1126 size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + |
1127 strlen(current) + strlen(loader2) + strlen(iface) + | |
1128 strlen(failed_type_name); | |
1129 char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); | |
1130 jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2, | |
1131 iface, failed_type_name); | |
1132 THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); | |
1133 } | |
1134 } | |
1135 } | |
1136 | |
1137 // ime may have moved during GC so recalculate address | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1138 int ime_num = m->itable_index(); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1139 assert(ime_num < ime_count, "oob"); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1140 itableOffsetEntry::method_entry(_klass(), method_table_offset)[ime_num].initialize(target()); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1141 if (TraceItables && Verbose) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1142 ResourceMark rm(THREAD); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1143 if (target() != NULL) { |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1144 char* sig = target()->name_and_sig_as_C_string(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1145 tty->print("interface: %s, ime_num: %d, target: %s, method_holder: %s ", |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1146 interf_h()->internal_name(), ime_num, sig, |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1147 target()->method_holder()->internal_name()); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1148 tty->print("target_method flags: "); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1149 target()->access_flags().print_on(tty); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1150 if (target()->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1151 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1152 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1153 tty->cr(); |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1154 } |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1155 } |
0 | 1156 } |
1157 } | |
1158 } | |
1159 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1160 // Update entry for specific Method* |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1161 void klassItable::initialize_with_method(Method* m) { |
0 | 1162 itableMethodEntry* ime = method_entry(0); |
1163 for(int i = 0; i < _size_method_table; i++) { | |
1164 if (ime->method() == m) { | |
1165 ime->initialize(m); | |
1166 } | |
1167 ime++; | |
1168 } | |
1169 } | |
1170 | |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1171 #if INCLUDE_JVMTI |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1172 void klassItable::adjust_method_entries(Method** old_methods, Method** new_methods, |
0 | 1173 int methods_length, bool * trace_name_printed) { |
1174 // search the itable for uses of either obsolete or EMCP methods | |
1175 for (int j = 0; j < methods_length; j++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1176 Method* old_method = old_methods[j]; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1177 Method* new_method = new_methods[j]; |
0 | 1178 itableMethodEntry* ime = method_entry(0); |
1179 | |
610
70998f2e05ef
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
196
diff
changeset
|
1180 // The itable can describe more than one interface and the same |
70998f2e05ef
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
196
diff
changeset
|
1181 // method signature can be specified by more than one interface. |
70998f2e05ef
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
196
diff
changeset
|
1182 // This means we have to do an exhaustive search to find all the |
70998f2e05ef
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
196
diff
changeset
|
1183 // old_method references. |
0 | 1184 for (int i = 0; i < _size_method_table; i++) { |
1185 if (ime->method() == old_method) { | |
1186 ime->initialize(new_method); | |
1187 | |
1188 if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { | |
1189 if (!(*trace_name_printed)) { | |
1190 // RC_TRACE_MESG macro has an embedded ResourceMark | |
1191 RC_TRACE_MESG(("adjust: name=%s", | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
1192 old_method->method_holder()->external_name())); |
0 | 1193 *trace_name_printed = true; |
1194 } | |
1195 // RC_TRACE macro has an embedded ResourceMark | |
1196 RC_TRACE(0x00200000, ("itable method update: %s(%s)", | |
1197 new_method->name()->as_C_string(), | |
1198 new_method->signature()->as_C_string())); | |
1199 } | |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1200 // cannot 'break' here; see for-loop comment above. |
0 | 1201 } |
1202 ime++; | |
1203 } | |
1204 } | |
1205 } | |
1206 | |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1207 // an itable should never contain old or obsolete methods |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1208 bool klassItable::check_no_old_or_obsolete_entries() { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1209 itableMethodEntry* ime = method_entry(0); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1210 for (int i = 0; i < _size_method_table; i++) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1211 Method* m = ime->method(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1212 if (m != NULL && |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1213 (NOT_PRODUCT(!m->is_valid() ||) m->is_old() || m->is_obsolete())) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1214 return false; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1215 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1216 ime++; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1217 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1218 return true; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1219 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1220 |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1221 void klassItable::dump_itable() { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1222 itableMethodEntry* ime = method_entry(0); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1223 tty->print_cr("itable dump --"); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1224 for (int i = 0; i < _size_method_table; i++) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1225 Method* m = ime->method(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1226 if (m != NULL) { |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1227 tty->print(" (%5d) ", i); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1228 m->access_flags().print_on(tty); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1229 if (m->is_default_method()) { |
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1230 tty->print("default "); |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1231 } |
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1232 tty->print(" -- "); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1233 m->print_name(tty); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1234 tty->cr(); |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1235 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1236 ime++; |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1237 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1238 } |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1239 #endif // INCLUDE_JVMTI |
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1240 |
0 | 1241 |
1242 // Setup | |
1243 class InterfaceVisiterClosure : public StackObj { | |
1244 public: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1245 virtual void doit(Klass* intf, int method_count) = 0; |
0 | 1246 }; |
1247 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1248 // Visit all interfaces with at least one itable method |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1249 void visit_all_interfaces(Array<Klass*>* transitive_intf, InterfaceVisiterClosure *blk) { |
0 | 1250 // Handle array argument |
1251 for(int i = 0; i < transitive_intf->length(); i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1252 Klass* intf = transitive_intf->at(i); |
6983 | 1253 assert(intf->is_interface(), "sanity check"); |
0 | 1254 |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1255 // Find no. of itable methods |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1256 int method_count = 0; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1257 // method_count = klassItable::method_count_for_interface(intf); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1258 Array<Method*>* methods = InstanceKlass::cast(intf)->methods(); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1259 if (methods->length() > 0) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1260 for (int i = methods->length(); --i >= 0; ) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1261 if (interface_method_needs_itable_index(methods->at(i))) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1262 method_count++; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1263 } |
0 | 1264 } |
1265 } | |
1266 | |
1267 // Only count interfaces with at least one method | |
1268 if (method_count > 0) { | |
1269 blk->doit(intf, method_count); | |
1270 } | |
1271 } | |
1272 } | |
1273 | |
1274 class CountInterfacesClosure : public InterfaceVisiterClosure { | |
1275 private: | |
1276 int _nof_methods; | |
1277 int _nof_interfaces; | |
1278 public: | |
1279 CountInterfacesClosure() { _nof_methods = 0; _nof_interfaces = 0; } | |
1280 | |
1281 int nof_methods() const { return _nof_methods; } | |
1282 int nof_interfaces() const { return _nof_interfaces; } | |
1283 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1284 void doit(Klass* intf, int method_count) { _nof_methods += method_count; _nof_interfaces++; } |
0 | 1285 }; |
1286 | |
1287 class SetupItableClosure : public InterfaceVisiterClosure { | |
1288 private: | |
1289 itableOffsetEntry* _offset_entry; | |
1290 itableMethodEntry* _method_entry; | |
1291 address _klass_begin; | |
1292 public: | |
1293 SetupItableClosure(address klass_begin, itableOffsetEntry* offset_entry, itableMethodEntry* method_entry) { | |
1294 _klass_begin = klass_begin; | |
1295 _offset_entry = offset_entry; | |
1296 _method_entry = method_entry; | |
1297 } | |
1298 | |
1299 itableMethodEntry* method_entry() const { return _method_entry; } | |
1300 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1301 void doit(Klass* intf, int method_count) { |
0 | 1302 int offset = ((address)_method_entry) - _klass_begin; |
1303 _offset_entry->initialize(intf, offset); | |
1304 _offset_entry++; | |
1305 _method_entry += method_count; | |
1306 } | |
1307 }; | |
1308 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1309 int klassItable::compute_itable_size(Array<Klass*>* transitive_interfaces) { |
0 | 1310 // Count no of interfaces and total number of interface methods |
1311 CountInterfacesClosure cic; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1312 visit_all_interfaces(transitive_interfaces, &cic); |
0 | 1313 |
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1314 // There's alway an extra itable entry so we can null-terminate it. |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1315 int itable_size = calc_itable_size(cic.nof_interfaces() + 1, cic.nof_methods()); |
0 | 1316 |
1317 // Statistics | |
1318 update_stats(itable_size * HeapWordSize); | |
1319 | |
1320 return itable_size; | |
1321 } | |
1322 | |
1323 | |
1324 // Fill out offset table and interface klasses into the itable space | |
1325 void klassItable::setup_itable_offset_table(instanceKlassHandle klass) { | |
1326 if (klass->itable_length() == 0) return; | |
1327 assert(!klass->is_interface(), "Should have zero length itable"); | |
1328 | |
1329 // Count no of interfaces and total number of interface methods | |
1330 CountInterfacesClosure cic; | |
1331 visit_all_interfaces(klass->transitive_interfaces(), &cic); | |
1332 int nof_methods = cic.nof_methods(); | |
1333 int nof_interfaces = cic.nof_interfaces(); | |
1334 | |
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1335 // Add one extra entry so we can null-terminate the table |
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1336 nof_interfaces++; |
0 | 1337 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1338 assert(compute_itable_size(klass->transitive_interfaces()) == |
0 | 1339 calc_itable_size(nof_interfaces, nof_methods), |
1340 "mismatch calculation of itable size"); | |
1341 | |
1342 // Fill-out offset table | |
1343 itableOffsetEntry* ioe = (itableOffsetEntry*)klass->start_of_itable(); | |
1344 itableMethodEntry* ime = (itableMethodEntry*)(ioe + nof_interfaces); | |
1345 intptr_t* end = klass->end_of_itable(); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2334
diff
changeset
|
1346 assert((oop*)(ime + nof_methods) <= (oop*)klass->start_of_nonstatic_oop_maps(), "wrong offset calculation (1)"); |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
16
diff
changeset
|
1347 assert((oop*)(end) == (oop*)(ime + nof_methods), "wrong offset calculation (2)"); |
0 | 1348 |
1349 // Visit all interfaces and initialize itable offset table | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1350 SetupItableClosure sic((address)klass(), ioe, ime); |
0 | 1351 visit_all_interfaces(klass->transitive_interfaces(), &sic); |
1352 | |
1353 #ifdef ASSERT | |
1354 ime = sic.method_entry(); | |
1355 oop* v = (oop*) klass->end_of_itable(); | |
1356 assert( (oop*)(ime) == v, "wrong offset calculation (2)"); | |
1357 #endif | |
1358 } | |
1359 | |
1360 | |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1361 // inverse to itable_index |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1362 Method* klassItable::method_for_itable_index(Klass* intf, int itable_index) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1363 assert(InstanceKlass::cast(intf)->is_interface(), "sanity check"); |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1364 assert(intf->verify_itable_index(itable_index), ""); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1365 Array<Method*>* methods = InstanceKlass::cast(intf)->methods(); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1366 |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1367 if (itable_index < 0 || itable_index >= method_count_for_interface(intf)) |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1368 return NULL; // help caller defend against bad indices |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1369 |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1370 int index = itable_index; |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1371 Method* m = methods->at(index); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1372 int index2 = -1; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1373 while (!m->has_itable_index() || |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1374 (index2 = m->itable_index()) != itable_index) { |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1375 assert(index2 < itable_index, "monotonic"); |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1376 if (++index == methods->length()) |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1377 return NULL; |
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1378 m = methods->at(index); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1379 } |
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1380 assert(m->itable_index() == itable_index, "correct inverse"); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1381 |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1382 return m; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1383 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1384 |
0 | 1385 void klassVtable::verify(outputStream* st, bool forced) { |
1386 // make sure table is initialized | |
1387 if (!Universe::is_fully_initialized()) return; | |
1388 #ifndef PRODUCT | |
1389 // avoid redundant verifies | |
1390 if (!forced && _verify_count == Universe::verify_count()) return; | |
1391 _verify_count = Universe::verify_count(); | |
1392 #endif | |
1393 oop* end_of_obj = (oop*)_klass() + _klass()->size(); | |
1394 oop* end_of_vtable = (oop *)&table()[_length]; | |
1395 if (end_of_vtable > end_of_obj) { | |
1490
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1489
diff
changeset
|
1396 fatal(err_msg("klass %s: klass object too short (vtable extends beyond " |
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1489
diff
changeset
|
1397 "end)", _klass->internal_name())); |
0 | 1398 } |
1399 | |
1400 for (int i = 0; i < _length; i++) table()[i].verify(this, st); | |
1401 // verify consistency with superKlass vtable | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1402 Klass* super = _klass->super(); |
0 | 1403 if (super != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1404 InstanceKlass* sk = InstanceKlass::cast(super); |
0 | 1405 klassVtable* vt = sk->vtable(); |
1406 for (int i = 0; i < vt->length(); i++) { | |
1407 verify_against(st, vt, i); | |
1408 } | |
1409 } | |
1410 } | |
1411 | |
1412 void klassVtable::verify_against(outputStream* st, klassVtable* vt, int index) { | |
1413 vtableEntry* vte = &vt->table()[index]; | |
1414 if (vte->method()->name() != table()[index].method()->name() || | |
1415 vte->method()->signature() != table()[index].method()->signature()) { | |
1416 fatal("mismatched name/signature of vtable entries"); | |
1417 } | |
1418 } | |
1419 | |
1420 #ifndef PRODUCT | |
1421 void klassVtable::print() { | |
1422 ResourceMark rm; | |
1423 tty->print("klassVtable for klass %s (length %d):\n", _klass->internal_name(), length()); | |
1424 for (int i = 0; i < length(); i++) { | |
1425 table()[i].print(); | |
1426 tty->cr(); | |
1427 } | |
1428 } | |
1429 #endif | |
1430 | |
1431 void vtableEntry::verify(klassVtable* vt, outputStream* st) { | |
1432 NOT_PRODUCT(FlagSetting fs(IgnoreLockingAssertions, true)); | |
1433 assert(method() != NULL, "must have set method"); | |
1434 method()->verify(); | |
1435 // we sub_type, because it could be a miranda method | |
1436 if (!vt->klass()->is_subtype_of(method()->method_holder())) { | |
1437 #ifndef PRODUCT | |
1438 print(); | |
1439 #endif | |
1490
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1489
diff
changeset
|
1440 fatal(err_msg("vtableEntry " PTR_FORMAT ": method is from subclass", this)); |
0 | 1441 } |
1442 } | |
1443 | |
1444 #ifndef PRODUCT | |
1445 | |
1446 void vtableEntry::print() { | |
1447 ResourceMark rm; | |
1448 tty->print("vtableEntry %s: ", method()->name()->as_C_string()); | |
1449 if (Verbose) { | |
1450 tty->print("m %#lx ", (address)method()); | |
1451 } | |
1452 } | |
1453 | |
1454 class VtableStats : AllStatic { | |
1455 public: | |
1456 static int no_klasses; // # classes with vtables | |
1457 static int no_array_klasses; // # array classes | |
1458 static int no_instance_klasses; // # instanceKlasses | |
1459 static int sum_of_vtable_len; // total # of vtable entries | |
1460 static int sum_of_array_vtable_len; // total # of vtable entries in array klasses only | |
1461 static int fixed; // total fixed overhead in bytes | |
1462 static int filler; // overhead caused by filler bytes | |
1463 static int entries; // total bytes consumed by vtable entries | |
1464 static int array_entries; // total bytes consumed by array vtable entries | |
1465 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1466 static void do_class(Klass* k) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1467 Klass* kl = k; |
0 | 1468 klassVtable* vt = kl->vtable(); |
1469 if (vt == NULL) return; | |
1470 no_klasses++; | |
1471 if (kl->oop_is_instance()) { | |
1472 no_instance_klasses++; | |
1473 kl->array_klasses_do(do_class); | |
1474 } | |
1475 if (kl->oop_is_array()) { | |
1476 no_array_klasses++; | |
1477 sum_of_array_vtable_len += vt->length(); | |
1478 } | |
1479 sum_of_vtable_len += vt->length(); | |
1480 } | |
1481 | |
1482 static void compute() { | |
1483 SystemDictionary::classes_do(do_class); | |
1484 fixed = no_klasses * oopSize; // vtable length | |
1485 // filler size is a conservative approximation | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6725
diff
changeset
|
1486 filler = oopSize * (no_klasses - no_instance_klasses) * (sizeof(InstanceKlass) - sizeof(ArrayKlass) - 1); |
0 | 1487 entries = sizeof(vtableEntry) * sum_of_vtable_len; |
1488 array_entries = sizeof(vtableEntry) * sum_of_array_vtable_len; | |
1489 } | |
1490 }; | |
1491 | |
1492 int VtableStats::no_klasses = 0; | |
1493 int VtableStats::no_array_klasses = 0; | |
1494 int VtableStats::no_instance_klasses = 0; | |
1495 int VtableStats::sum_of_vtable_len = 0; | |
1496 int VtableStats::sum_of_array_vtable_len = 0; | |
1497 int VtableStats::fixed = 0; | |
1498 int VtableStats::filler = 0; | |
1499 int VtableStats::entries = 0; | |
1500 int VtableStats::array_entries = 0; | |
1501 | |
1502 void klassVtable::print_statistics() { | |
1503 ResourceMark rm; | |
1504 HandleMark hm; | |
1505 VtableStats::compute(); | |
1506 tty->print_cr("vtable statistics:"); | |
1507 tty->print_cr("%6d classes (%d instance, %d array)", VtableStats::no_klasses, VtableStats::no_instance_klasses, VtableStats::no_array_klasses); | |
1508 int total = VtableStats::fixed + VtableStats::filler + VtableStats::entries; | |
1509 tty->print_cr("%6d bytes fixed overhead (refs + vtable object header)", VtableStats::fixed); | |
1510 tty->print_cr("%6d bytes filler overhead", VtableStats::filler); | |
1511 tty->print_cr("%6d bytes for vtable entries (%d for arrays)", VtableStats::entries, VtableStats::array_entries); | |
1512 tty->print_cr("%6d bytes total", total); | |
1513 } | |
1514 | |
1515 int klassItable::_total_classes; // Total no. of classes with itables | |
1516 long klassItable::_total_size; // Total no. of bytes used for itables | |
1517 | |
1518 void klassItable::print_statistics() { | |
1519 tty->print_cr("itable statistics:"); | |
1520 tty->print_cr("%6d classes with itables", _total_classes); | |
1521 tty->print_cr("%6d K uses for itables (average by class: %d bytes)", _total_size / K, _total_size / _total_classes); | |
1522 } | |
1523 | |
1524 #endif // PRODUCT |