Mercurial > hg > truffle
annotate src/share/vm/oops/klassVtable.cpp @ 21947:9f70fc90169d
Truffle: remove expensive assertion
| author | Andreas Woess <andreas.woess@oracle.com> |
|---|---|
| date | Wed, 17 Jun 2015 04:09:30 +0200 |
| parents | 12dcf5ba8b34 |
| children |
| 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:
14221
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 |
|
17571
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
254 // For public and protected methods: if they override a superclass, they will |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
255 // also be overridden themselves appropriately. |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
256 // Private methods do not override and are not overridden. |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
257 // Package Private methods are trickier: |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
258 // e.g. P1.A, pub m |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
259 // P2.B extends A, package private m |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
260 // P1.C extends B, public m |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
261 // P1.C.m needs to override P1.A.m and can not override P2.B.m |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
262 // Therefore: all package private methods need their own vtable entries for |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
263 // them to be the root of an inheritance overriding decision |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
264 // Package private methods may also override other vtable entries |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
265 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
|
266 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
|
267 InstanceKlass* superk = initialsuper; |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
268 while (superk != NULL && superk->super() != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
269 InstanceKlass* supersuperklass = InstanceKlass::cast(superk->super()); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
270 klassVtable* ssVtable = supersuperklass->vtable(); |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
271 if (vtable_index < ssVtable->length()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
272 Method* super_method = ssVtable->method_at(vtable_index); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
273 #ifndef PRODUCT |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
274 Symbol* name= target_method()->name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
275 Symbol* signature = target_method()->signature(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
276 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
|
277 #endif |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
278 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
|
279 #ifndef PRODUCT |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
280 if (PrintVtables && Verbose) { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
281 ResourceMark rm(THREAD); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
282 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
|
283 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
|
284 supersuperklass->internal_name(), |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
285 _klass->internal_name(), sig, vtable_index); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
286 super_method->access_flags().print_on(tty); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
287 if (super_method->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
288 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
289 } |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
290 tty->print("overriders flags: "); |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
291 target_method->access_flags().print_on(tty); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
292 if (target_method->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
293 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
294 } |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
295 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
296 #endif /*PRODUCT*/ |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
297 break; // return found superk |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
298 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
299 } else { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
300 // 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
|
301 superk = (InstanceKlass*)NULL; |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
302 break; |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
303 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
304 // 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
|
305 superk = InstanceKlass::cast(superk->super()); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
306 } |
| 0 | 307 |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
308 return superk; |
| 0 | 309 } |
| 310 | |
| 311 // 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
|
312 // 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
|
313 // Only called for InstanceKlass's, i.e. not for arrays |
| 0 | 314 // 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
|
315 bool klassVtable::update_inherited_vtable(InstanceKlass* klass, methodHandle target_method, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
316 int super_vtable_len, int default_index, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
317 bool checkconstraints, TRAPS) { |
| 0 | 318 ResourceMark rm; |
| 319 bool allocate_new = true; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
320 assert(klass->oop_is_instance(), "must be InstanceKlass"); |
| 0 | 321 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
322 Array<int>* def_vtable_indices = NULL; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
323 bool is_default = false; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
324 // 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
|
325 // with their real method_holder |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
326 // 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
|
327 // the default method's real vtable/itable index |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
328 // default_vtable_indices stores the vtable value relative to this inheritor |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
329 if (default_index >= 0 ) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
330 is_default = true; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
331 def_vtable_indices = klass->default_vtable_indices(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
332 assert(def_vtable_indices != NULL, "def vtable alloc?"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
333 assert(default_index <= def_vtable_indices->length(), "def vtable len?"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
334 } else { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
335 assert(klass == target_method()->method_holder(), "caller resp."); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
336 // Initialize the method's vtable index to "nonvirtual". |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
337 // 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
|
338 target_method()->set_vtable_index(Method::nonvirtual_vtable_index); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
339 } |
| 0 | 340 |
| 341 // Static and <init> methods are never in | |
| 342 if (target_method()->is_static() || target_method()->name() == vmSymbols::object_initializer_name()) { | |
| 343 return false; | |
| 344 } | |
| 345 | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
346 if (target_method->is_final_method(klass->access_flags())) { |
| 0 | 347 // a final method never needs a new entry; final methods can be statically |
| 348 // resolved and they have to be present in the vtable only if they override | |
| 349 // a super's method, in which case they re-use its entry | |
| 350 allocate_new = false; | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
351 } else if (klass->is_interface()) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
352 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
|
353 // 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
|
354 // 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
|
355 // 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
|
356 // default methods inherited by classes store their vtable indices |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
357 // in the inheritor's default_vtable_indices |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
358 // default methods inherited by interfaces may already have a |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
359 // valid itable index, if so, don't change it |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
360 // 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
|
361 // by an inheriting class |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
362 if (!is_default || !target_method()->has_itable_index()) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
363 target_method()->set_vtable_index(Method::pending_itable_index); |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
364 } |
| 0 | 365 } |
| 366 | |
| 367 // we need a new entry if there is no superclass | |
| 368 if (klass->super() == NULL) { | |
| 369 return allocate_new; | |
| 370 } | |
| 371 | |
|
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
372 // 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
|
373 // specification interpretation since classic has |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
374 // private methods not overriding |
|
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
375 // JDK8 adds private methods in interfaces which require invokespecial |
| 0 | 376 if (target_method()->is_private()) { |
| 377 return allocate_new; | |
| 378 } | |
| 379 | |
| 380 // search through the vtable and update overridden entries | |
| 381 // Since check_signature_loaders acquires SystemDictionary_lock | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
382 // 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
|
383 // For classfiles built with >= jdk7, we now look for transitive overrides |
| 0 | 384 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
385 Symbol* name = target_method()->name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
386 Symbol* signature = target_method()->signature(); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
387 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
388 KlassHandle target_klass(THREAD, target_method()->method_holder()); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
389 if (target_klass == NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
390 target_klass = _klass; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
391 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
392 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
393 Handle target_loader(THREAD, target_klass->class_loader()); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
394 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
395 Symbol* target_classname = target_klass->name(); |
| 0 | 396 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
|
397 Method* super_method = method_at(i); |
| 0 | 398 // Check if method name matches |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
399 if (super_method->name() == name && super_method->signature() == signature) { |
| 0 | 400 |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
401 // 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
|
402 InstanceKlass* super_klass = super_method->method_holder(); |
| 0 | 403 |
| 21829 | 404 // private methods are also never overridden |
| 405 if (!super_method->is_private() && | |
| 406 (is_default | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
407 || ((super_klass->is_override(super_method, target_loader, target_classname, THREAD)) |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
408 || ((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
409 && ((super_klass = find_transitive_override(super_klass, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
410 target_method, i, target_loader, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
411 target_classname, THREAD)) |
| 21829 | 412 != (InstanceKlass*)NULL))))) |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
413 { |
|
17571
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
414 // Package private methods always need a new entry to root their own |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
415 // overriding. They may also override other methods. |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
416 if (!target_method()->is_package_private()) { |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
417 allocate_new = false; |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
418 } |
| 0 | 419 |
| 420 if (checkconstraints) { | |
| 421 // Override vtable entry if passes loader constraint check | |
| 422 // if loader constraint checking requested | |
| 423 // No need to visit his super, since he and his super | |
| 424 // have already made any needed loader constraints. | |
| 425 // Since loader constraints are transitive, it is enough | |
| 426 // to link to the first super, and we get all the others. | |
| 427 Handle super_loader(THREAD, super_klass->class_loader()); | |
| 428 | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
429 if (target_loader() != super_loader()) { |
| 0 | 430 ResourceMark rm(THREAD); |
|
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
431 Symbol* failed_type_symbol = |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
432 SystemDictionary::check_signature_loaders(signature, target_loader, |
| 0 | 433 super_loader, true, |
| 434 CHECK_(false)); | |
|
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
435 if (failed_type_symbol != NULL) { |
| 0 | 436 const char* msg = "loader constraint violation: when resolving " |
| 437 "overridden method \"%s\" the class loader (instance" | |
| 438 " of %s) of the current class, %s, and its superclass loader " | |
| 439 "(instance of %s), have different Class objects for the type " | |
| 440 "%s used in the signature"; | |
| 441 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
|
442 const char* loader1 = SystemDictionary::loader_name(target_loader()); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
443 char* current = target_klass->name()->as_C_string(); |
| 0 | 444 const char* loader2 = SystemDictionary::loader_name(super_loader()); |
|
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
445 char* failed_type_name = failed_type_symbol->as_C_string(); |
| 0 | 446 size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + |
| 447 strlen(current) + strlen(loader2) + strlen(failed_type_name); | |
| 448 char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); | |
| 449 jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2, | |
| 450 failed_type_name); | |
| 451 THROW_MSG_(vmSymbols::java_lang_LinkageError(), buf, false); | |
| 452 } | |
| 453 } | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
454 } |
| 0 | 455 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
456 put_method_at(target_method(), i); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
457 if (!is_default) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
458 target_method()->set_vtable_index(i); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
459 } else { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
460 if (def_vtable_indices != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
461 def_vtable_indices->at_put(default_index, i); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
462 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
463 assert(super_method->is_default_method() || super_method->is_overpass() |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
464 || super_method->is_abstract(), "default override error"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
465 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
466 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
467 |
| 0 | 468 #ifndef PRODUCT |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
469 if (PrintVtables && Verbose) { |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
470 ResourceMark rm(THREAD); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
471 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
|
472 tty->print("overriding with %s::%s index %d, original flags: ", |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
473 target_klass->internal_name(), sig, i); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
474 super_method->access_flags().print_on(tty); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
475 if (super_method->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
476 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
477 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
478 if (super_method->is_overpass()) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
479 tty->print("overpass"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
480 } |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
481 tty->print("overriders flags: "); |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
482 target_method->access_flags().print_on(tty); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
483 if (target_method->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
484 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
485 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
486 if (target_method->is_overpass()) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
487 tty->print("overpass"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
488 } |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
489 tty->cr(); |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
490 } |
| 0 | 491 #endif /*PRODUCT*/ |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
492 } else { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
493 // allocate_new = true; default. We might override one entry, |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
494 // but not override another. Once we override one, not need new |
| 0 | 495 #ifndef PRODUCT |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
496 if (PrintVtables && Verbose) { |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
497 ResourceMark rm(THREAD); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
498 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
|
499 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
|
500 target_klass->internal_name(), sig,i); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
501 super_method->access_flags().print_on(tty); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
502 if (super_method->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
503 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
504 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
505 if (super_method->is_overpass()) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
506 tty->print("overpass"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
507 } |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
508 tty->print("overriders flags: "); |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
509 target_method->access_flags().print_on(tty); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
510 if (target_method->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
511 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
512 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
513 if (target_method->is_overpass()) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
514 tty->print("overpass"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
515 } |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
516 tty->cr(); |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
517 } |
| 0 | 518 #endif /*PRODUCT*/ |
| 519 } | |
| 520 } | |
| 521 } | |
| 522 return allocate_new; | |
| 523 } | |
| 524 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
525 void klassVtable::put_method_at(Method* m, int index) { |
| 0 | 526 #ifndef PRODUCT |
| 527 if (PrintVtables && Verbose) { | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
528 ResourceMark rm; |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
529 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
|
530 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
|
531 if (m != NULL) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
532 m->access_flags().print_on(tty); |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
533 if (m->is_default_method()) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
534 tty->print("default "); |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
535 } |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
536 if (m->is_overpass()) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
537 tty->print("overpass"); |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
538 } |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
539 } |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
540 tty->cr(); |
| 0 | 541 } |
| 542 #endif | |
| 543 table()[index].set(m); | |
| 544 } | |
| 545 | |
| 546 // Find out if a method "m" with superclass "super", loader "classloader" and | |
| 547 // name "classname" needs a new vtable entry. Let P be a class package defined | |
| 548 // by "classloader" and "classname". | |
| 549 // NOTE: The logic used here is very similar to the one used for computing | |
| 550 // 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
|
551 // 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
|
552 // superclass has been loaded. |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
553 // 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
|
554 // 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
|
555 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
|
556 Klass* super, |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
557 Handle classloader, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
558 Symbol* classname, |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
559 AccessFlags class_flags, |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
560 TRAPS) { |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
561 if (class_flags.is_interface()) { |
|
17571
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
562 // Interfaces do not use vtables, except for java.lang.Object methods, |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
563 // so there is no point to assigning |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
564 // a vtable index to any of their local methods. If we refrain from doing this, |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
565 // 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
|
566 return false; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
567 } |
| 6934 | 568 |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
569 if (target_method->is_final_method(class_flags) || |
| 0 | 570 // a final method never needs a new entry; final methods can be statically |
| 571 // resolved and they have to be present in the vtable only if they override | |
| 572 // 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
|
573 (target_method()->is_static()) || |
| 0 | 574 // 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
|
575 (target_method()->name() == vmSymbols::object_initializer_name()) |
| 0 | 576 // <init> is never called dynamically-bound |
| 577 ) { | |
| 578 return false; | |
| 579 } | |
| 580 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
581 // Concrete interface methods do not need new entries, they override |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
582 // abstract method entries using default inheritance rules |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
583 if (target_method()->method_holder() != NULL && |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
584 target_method()->method_holder()->is_interface() && |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
585 !target_method()->is_abstract() ) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
586 return false; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
587 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
588 |
| 0 | 589 // we need a new entry if there is no superclass |
| 590 if (super == NULL) { | |
| 591 return true; | |
| 592 } | |
| 593 | |
|
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
594 // 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
|
595 // specification interpretation since classic has |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
596 // private methods not overriding |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
597 // 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
|
598 if (target_method()->is_private()) { |
| 0 | 599 return true; |
| 600 } | |
| 601 | |
|
17571
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
602 // Package private methods always need a new entry to root their own |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
603 // overriding. This allows transitive overriding to work. |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
604 if (target_method()->is_package_private()) { |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
605 return true; |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
606 } |
|
c02077c4b79c
8032536: JVM resolves wrong method in some unusual cases
hseigel
parents:
14221
diff
changeset
|
607 |
| 0 | 608 // search through the super class hierarchy to see if we need |
| 609 // a new entry | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
610 ResourceMark rm; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
611 Symbol* name = target_method()->name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
612 Symbol* signature = target_method()->signature(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
613 Klass* k = super; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
614 Method* super_method = NULL; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
615 InstanceKlass *holder = NULL; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
616 Method* recheck_method = NULL; |
| 0 | 617 while (k != NULL) { |
| 618 // 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
|
619 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
|
620 if (super_method == NULL) { |
| 0 | 621 break; // we still have to search for a matching miranda method |
| 622 } | |
| 623 // get the class holding the matching method | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
624 // 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
|
625 InstanceKlass* superk = super_method->method_holder(); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
626 // we want only instance method matches |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
627 // pretend private methods are not in the super vtable |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
628 // 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
|
629 // 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
|
630 // 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
|
631 // methods that have less accessibility |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
632 if ((!super_method->is_static()) && |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
633 (!super_method->is_private())) { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
634 if (superk->is_override(super_method, classloader, classname, THREAD)) { |
| 0 | 635 return false; |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
636 // else keep looking for transitive overrides |
| 0 | 637 } |
| 638 } | |
| 639 | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
640 // Start with lookup result and continue to search up |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
641 k = superk->super(); // haven't found an override match yet; continue to look |
| 0 | 642 } |
| 643 | |
| 644 // if the target method is public or protected it may have a matching | |
| 645 // 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
|
646 // 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
|
647 // this check for all access permissions. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
648 InstanceKlass *sk = InstanceKlass::cast(super); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
649 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:
14221
diff
changeset
|
650 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
|
651 return false; // found a matching miranda; we do not need a new entry |
| 0 | 652 } |
| 653 } | |
| 654 return true; // found no match; we need a new entry | |
| 655 } | |
| 656 | |
| 657 // Support for miranda methods | |
| 658 | |
| 659 // 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
|
660 int klassVtable::index_of_miranda(Symbol* name, Symbol* signature) { |
| 0 | 661 // search from the bottom, might be faster |
| 662 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
|
663 Method* m = table()[i].method(); |
| 0 | 664 if (is_miranda_entry_at(i) && |
| 665 m->name() == name && m->signature() == signature) { | |
| 666 return i; | |
| 667 } | |
| 668 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
669 return Method::invalid_vtable_index; |
| 0 | 670 } |
| 671 | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
672 // 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
|
673 // requires that method m at entry be declared ("held") by an interface. |
| 0 | 674 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
|
675 Method* m = method_at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
676 Klass* method_holder = m->method_holder(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
677 InstanceKlass *mhk = InstanceKlass::cast(method_holder); |
| 0 | 678 |
|
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12264
diff
changeset
|
679 // miranda methods are public abstract instance interface methods in a class's vtable |
| 0 | 680 if (mhk->is_interface()) { |
| 6934 | 681 assert(m->is_public(), "should be public"); |
| 0 | 682 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
|
683 // 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
|
684 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
|
685 return true; |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
686 } |
| 0 | 687 } |
| 688 return false; | |
| 689 } | |
| 690 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
691 // 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
|
692 // its default_method table and its super |
|
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
693 // Miranda methods are calculated twice: |
| 21829 | 694 // first: before vtable size calculation: including abstract and superinterface default |
| 695 // We include potential default methods to give them space in the vtable. | |
| 696 // During the first run, the default_methods list is empty | |
|
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
697 // This is seen by default method creation |
| 21829 | 698 // Second: recalculated during vtable initialization: only include abstract methods. |
| 699 // During the second run, default_methods is set up, so concrete methods from | |
| 700 // superinterfaces with matching names/signatures to default_methods are already | |
| 701 // in the default_methods list and do not need to be appended to the vtable | |
| 702 // as mirandas | |
|
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
703 // This is seen by link resolution and selection. |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
704 // "miranda" means not static, not defined by this class. |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
705 // private methods in interfaces do not belong in the miranda list. |
| 0 | 706 // 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
|
707 // Miranda methods only include public interface instance methods |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
708 // 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
|
709 // Miranda methods also do not include overpass methods in interfaces |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
710 bool klassVtable::is_miranda(Method* m, Array<Method*>* class_methods, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
711 Array<Method*>* default_methods, Klass* super) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
712 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
|
713 return false; |
|
08236d966eea
8013418: assert(i == total_args_passed) in AdapterHandlerLibrary::get_adapter since 8-b87
bharadwaj
parents:
8840
diff
changeset
|
714 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
715 Symbol* name = m->name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2018
diff
changeset
|
716 Symbol* signature = m->signature(); |
| 21829 | 717 Method* mo; |
|
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
718 |
| 21829 | 719 if ((mo = 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
|
720 // 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
|
721 if ((default_methods == NULL) || |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
722 InstanceKlass::find_method(default_methods, name, signature) == NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
723 if (super == NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
724 // super doesn't exist |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
725 return true; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
726 } |
|
2018
642e54d1850a
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
1972
diff
changeset
|
727 |
| 21829 | 728 mo = InstanceKlass::cast(super)->lookup_method(name, signature); |
|
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
729 while (mo != NULL && mo->access_flags().is_static() |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
730 && mo->method_holder() != NULL |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
731 && mo->method_holder()->super() != NULL) |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13403
diff
changeset
|
732 { |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
14221
diff
changeset
|
733 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
|
734 } |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
735 if (mo == NULL || mo->access_flags().is_private() ) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
736 // super class hierarchy does not implement it or protection is different |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
737 return true; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
738 } |
| 0 | 739 } |
| 21829 | 740 } else { |
| 741 // if the local class has a private method, the miranda will not | |
| 742 // override it, so a vtable slot is needed | |
| 743 if (mo->access_flags().is_private()) { | |
| 744 | |
| 745 // Second round, weed out any superinterface methods that turned | |
| 746 // into default methods, i.e. were concrete not abstract in the end | |
| 747 if ((default_methods == NULL) || | |
| 748 InstanceKlass::find_method(default_methods, name, signature) == NULL) { | |
| 749 return true; | |
| 750 } | |
| 751 } | |
| 0 | 752 } |
|
2018
642e54d1850a
6989076: JVM crashes in klassItable::initialize_itable_for_interface
dsamersoff
parents:
1972
diff
changeset
|
753 |
| 0 | 754 return false; |
| 755 } | |
| 756 | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
757 // Scans current_interface_methods for miranda methods that do not |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
758 // 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
|
759 // 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
|
760 // 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
|
761 // 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
|
762 // 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
|
763 // 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
|
764 // including all defined in superclasses. |
| 6934 | 765 void klassVtable::add_new_mirandas_to_lists( |
| 766 GrowableArray<Method*>* new_mirandas, GrowableArray<Method*>* all_mirandas, | |
| 767 Array<Method*>* current_interface_methods, Array<Method*>* class_methods, | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
768 Array<Method*>* default_methods, Klass* super) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
769 |
| 0 | 770 // iterate thru the current interface's method to see if it a miranda |
| 771 int num_methods = current_interface_methods->length(); | |
| 772 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
|
773 Method* im = current_interface_methods->at(i); |
| 0 | 774 bool is_duplicate = false; |
| 6934 | 775 int num_of_current_mirandas = new_mirandas->length(); |
| 0 | 776 // check for duplicate mirandas in different interfaces we implement |
| 777 for (int j = 0; j < num_of_current_mirandas; j++) { | |
| 6934 | 778 Method* miranda = new_mirandas->at(j); |
| 0 | 779 if ((im->name() == miranda->name()) && |
| 780 (im->signature() == miranda->signature())) { | |
| 781 is_duplicate = true; | |
| 782 break; | |
| 783 } | |
| 784 } | |
| 785 | |
| 786 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
|
787 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
|
788 InstanceKlass *sk = InstanceKlass::cast(super); |
| 0 | 789 // 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:
14221
diff
changeset
|
790 if (sk->lookup_method_in_all_interfaces(im->name(), im->signature(), Klass::normal) == NULL) { |
| 6934 | 791 new_mirandas->append(im); |
| 792 } | |
| 793 if (all_mirandas != NULL) { | |
| 794 all_mirandas->append(im); | |
| 0 | 795 } |
| 796 } | |
| 797 } | |
| 798 } | |
| 799 } | |
| 800 | |
| 6934 | 801 void klassVtable::get_mirandas(GrowableArray<Method*>* new_mirandas, |
| 802 GrowableArray<Method*>* all_mirandas, | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
803 Klass* super, Array<Method*>* class_methods, |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
804 Array<Method*>* default_methods, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
805 Array<Klass*>* local_interfaces) { |
| 6934 | 806 assert((new_mirandas->length() == 0) , "current mirandas must be 0"); |
| 0 | 807 |
| 808 // iterate thru the local interfaces looking for a miranda | |
| 809 int num_local_ifs = local_interfaces->length(); | |
| 810 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
|
811 InstanceKlass *ik = InstanceKlass::cast(local_interfaces->at(i)); |
| 6934 | 812 add_new_mirandas_to_lists(new_mirandas, all_mirandas, |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
813 ik->methods(), class_methods, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
814 default_methods, super); |
| 0 | 815 // iterate thru each local's super interfaces |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
816 Array<Klass*>* super_ifs = ik->transitive_interfaces(); |
| 0 | 817 int num_super_ifs = super_ifs->length(); |
| 818 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
|
819 InstanceKlass *sik = InstanceKlass::cast(super_ifs->at(j)); |
| 6934 | 820 add_new_mirandas_to_lists(new_mirandas, all_mirandas, |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
821 sik->methods(), class_methods, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
822 default_methods, super); |
| 0 | 823 } |
| 824 } | |
| 825 } | |
| 826 | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
827 // 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
|
828 // 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
|
829 // return the new value of initialized. |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
830 // 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
|
831 // 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
|
832 int klassVtable::fill_in_mirandas(int initialized) { |
| 6934 | 833 GrowableArray<Method*> mirandas(20); |
| 834 get_mirandas(&mirandas, NULL, ik()->super(), ik()->methods(), | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
835 ik()->default_methods(), ik()->local_interfaces()); |
| 6934 | 836 for (int i = 0; i < mirandas.length(); i++) { |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
837 if (PrintVtables && Verbose) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
838 Method* meth = mirandas.at(i); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
839 ResourceMark rm(Thread::current()); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
840 if (meth != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
841 char* sig = meth->name_and_sig_as_C_string(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
842 tty->print("fill in mirandas with %s index %d, flags: ", |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
843 sig, initialized); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
844 meth->access_flags().print_on(tty); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
845 if (meth->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
846 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
847 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
848 tty->cr(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
849 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
850 } |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
851 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
|
852 ++initialized; |
| 0 | 853 } |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
854 return initialized; |
| 0 | 855 } |
| 856 | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
857 // 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
|
858 // Used to copy superclass vtable to prefix of subclass's vtable. |
| 0 | 859 void klassVtable::copy_vtable_to(vtableEntry* start) { |
| 860 Copy::disjoint_words((HeapWord*)table(), (HeapWord*)start, _length * vtableEntry::size()); | |
| 861 } | |
| 862 | |
|
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
863 #if INCLUDE_JVMTI |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
864 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
|
865 // 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
|
866 // and replace that method in the _default_methods list |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
867 bool updated = false; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
868 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
869 Array<Method*>* default_methods = ik()->default_methods(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
870 if (default_methods != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
871 int len = default_methods->length(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
872 for (int idx = 0; idx < len; idx++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
873 if (vtable_index == ik()->default_vtable_indices()->at(idx)) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
874 if (default_methods->at(idx) == old_method) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
875 default_methods->at_put(idx, new_method); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
876 updated = true; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
877 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
878 break; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
879 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
880 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
881 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
882 return updated; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
883 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
884 void klassVtable::adjust_method_entries(Method** old_methods, Method** new_methods, |
| 0 | 885 int methods_length, bool * trace_name_printed) { |
| 886 // search the vtable for uses of either obsolete or EMCP methods | |
| 887 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
|
888 Method* old_method = old_methods[j]; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
889 Method* new_method = new_methods[j]; |
| 0 | 890 |
| 891 // In the vast majority of cases we could get the vtable index | |
| 892 // by using: old_method->vtable_index() | |
| 893 // However, there are rare cases, eg. sun.awt.X11.XDecoratedPeer.getX() | |
| 894 // in sun.awt.X11.XFramePeer where methods occur more than once in the | |
| 895 // vtable, so, alas, we must do an exhaustive search. | |
| 896 for (int index = 0; index < length(); index++) { | |
| 897 if (unchecked_method_at(index) == old_method) { | |
| 898 put_method_at(new_method, index); | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
899 // For default methods, need to update the _default_methods array |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
900 // which can only have one method entry for a given signature |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
901 bool updated_default = false; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
902 if (old_method->is_default_method()) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
903 updated_default = adjust_default_method(index, old_method, new_method); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
904 } |
| 0 | 905 |
| 906 if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { | |
| 907 if (!(*trace_name_printed)) { | |
| 908 // RC_TRACE_MESG macro has an embedded ResourceMark | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
909 RC_TRACE_MESG(("adjust: klassname=%s for methods from name=%s", |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
910 klass()->external_name(), |
|
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
911 old_method->method_holder()->external_name())); |
| 0 | 912 *trace_name_printed = true; |
| 913 } | |
| 914 // RC_TRACE macro has an embedded ResourceMark | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
915 RC_TRACE(0x00100000, ("vtable method update: %s(%s), updated default = %s", |
| 0 | 916 new_method->name()->as_C_string(), |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
917 new_method->signature()->as_C_string(), |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
918 updated_default ? "true" : "false")); |
| 0 | 919 } |
|
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
920 // cannot 'break' here; see for-loop comment above. |
| 0 | 921 } |
| 922 } | |
| 923 } | |
| 924 } | |
| 925 | |
|
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
926 // a vtable should never contain old or obsolete methods |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
927 bool klassVtable::check_no_old_or_obsolete_entries() { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
928 for (int i = 0; i < length(); i++) { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
929 Method* m = unchecked_method_at(i); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
930 if (m != NULL && |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
931 (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
|
932 return false; |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
933 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
934 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
935 return true; |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
936 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
937 |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
938 void klassVtable::dump_vtable() { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
939 tty->print_cr("vtable dump --"); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
940 for (int i = 0; i < length(); i++) { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
941 Method* m = unchecked_method_at(i); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
942 if (m != NULL) { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
943 tty->print(" (%5d) ", i); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
944 m->access_flags().print_on(tty); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
945 if (m->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
946 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
947 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
948 if (m->is_overpass()) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
949 tty->print("overpass"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
950 } |
|
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
951 tty->print(" -- "); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
952 m->print_name(tty); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
953 tty->cr(); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
954 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
955 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
956 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
957 #endif // INCLUDE_JVMTI |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
958 |
|
3245
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
959 // CDS/RedefineClasses support - clear vtables so they can be reinitialized |
|
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
960 void klassVtable::clear_vtable() { |
|
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
961 for (int i = 0; i < _length; i++) table()[i].clear(); |
|
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
962 } |
|
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
963 |
|
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
964 bool klassVtable::is_initialized() { |
|
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
965 return _length == 0 || table()[0].method() != NULL; |
|
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
966 } |
|
8ce625481709
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
coleenp
parents:
2376
diff
changeset
|
967 |
| 0 | 968 //----------------------------------------------------------------------------------------- |
| 969 // Itable code | |
| 970 | |
| 971 // Initialize a itableMethodEntry | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
972 void itableMethodEntry::initialize(Method* m) { |
| 0 | 973 if (m == NULL) return; |
| 974 | |
| 975 _method = m; | |
| 976 } | |
| 977 | |
| 978 klassItable::klassItable(instanceKlassHandle klass) { | |
| 979 _klass = klass; | |
| 980 | |
| 981 if (klass->itable_length() > 0) { | |
| 982 itableOffsetEntry* offset_entry = (itableOffsetEntry*)klass->start_of_itable(); | |
| 983 if (offset_entry != NULL && offset_entry->interface_klass() != NULL) { // Check that itable is initialized | |
| 984 // 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
|
985 intptr_t* method_entry = (intptr_t *)(((address)klass()) + offset_entry->offset()); |
| 0 | 986 intptr_t* end = klass->end_of_itable(); |
| 987 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
988 _table_offset = (intptr_t*)offset_entry - (intptr_t*)klass(); |
| 0 | 989 _size_offset_table = (method_entry - ((intptr_t*)offset_entry)) / itableOffsetEntry::size(); |
| 990 _size_method_table = (end - method_entry) / itableMethodEntry::size(); | |
| 991 assert(_table_offset >= 0 && _size_offset_table >= 0 && _size_method_table >= 0, "wrong computation"); | |
| 992 return; | |
| 993 } | |
| 994 } | |
| 995 | |
|
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
996 // The length of the itable was either zero, or it has not yet been initialized. |
| 0 | 997 _table_offset = 0; |
| 998 _size_offset_table = 0; | |
| 999 _size_method_table = 0; | |
| 1000 } | |
| 1001 | |
| 1002 static int initialize_count = 0; | |
| 1003 | |
| 1004 // Initialization | |
| 1005 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
|
1006 if (_klass->is_interface()) { |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1007 // This needs to go after vtable indices are assigned but |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1008 // before implementors need to know the number of itable indices. |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1009 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
|
1010 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1011 |
|
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1012 // 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
|
1013 // 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
|
1014 if (Universe::is_bootstrapping() || |
|
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1015 _klass->is_interface() || |
|
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1016 _klass->itable_length() == itableOffsetEntry::size()) return; |
| 0 | 1017 |
|
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1018 // 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
|
1019 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
|
1020 int num_interfaces = size_offset_table() - 1; |
| 0 | 1021 if (num_interfaces > 0) { |
|
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1022 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
|
1023 _klass->name()->as_C_string()); |
| 0 | 1024 |
| 1025 | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
610
diff
changeset
|
1026 // Iterate through all interfaces |
| 0 | 1027 int i; |
| 1028 for(i = 0; i < num_interfaces; i++) { | |
| 1029 itableOffsetEntry* ioe = offset_entry(i); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1030 HandleMark hm(THREAD); |
| 0 | 1031 KlassHandle interf_h (THREAD, ioe->interface_klass()); |
| 1032 assert(interf_h() != NULL && ioe->offset() != 0, "bad offset entry in itable"); | |
| 1033 initialize_itable_for_interface(ioe->offset(), interf_h, checkconstraints, CHECK); | |
| 1034 } | |
| 1035 | |
| 1036 } | |
|
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1037 // 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
|
1038 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
|
1039 guarantee(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing"); |
| 0 | 1040 } |
| 1041 | |
| 1042 | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1043 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
|
1044 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
|
1045 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
|
1046 // 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
|
1047 // 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
|
1048 // 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
|
1049 // 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
|
1050 return true; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1051 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1052 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1053 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
|
1054 // 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
|
1055 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
|
1056 klass->name()->as_C_string()); |
|
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(klass)->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 int ime_num = 0; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1060 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
|
1061 Method* m = methods->at(i); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1062 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
|
1063 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
|
1064 // 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
|
1065 if (TraceItables && Verbose) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1066 ResourceMark rm; |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1067 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
|
1068 if (m->has_vtable_index()) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1069 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
|
1070 } else { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1071 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
|
1072 } |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1073 if (m != NULL) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1074 m->access_flags().print_on(tty); |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1075 if (m->is_default_method()) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1076 tty->print("default "); |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1077 } |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1078 if (m->is_overpass()) { |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1079 tty->print("overpass"); |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1080 } |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1081 } |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1082 tty->cr(); |
|
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1083 } |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1084 if (!m->has_vtable_index()) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1085 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
|
1086 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
|
1087 // Progress to next itable entry |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1088 ime_num++; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1089 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1090 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1091 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1092 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
|
1093 return ime_num; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1094 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1095 |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1096 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
|
1097 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
|
1098 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
|
1099 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
|
1100 int nof_methods = methods->length(); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1101 while (nof_methods > 0) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1102 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
|
1103 if (m->has_itable_index()) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1104 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
|
1105 #ifdef ASSERT |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1106 while (nof_methods = 0) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1107 m = methods->at(--nof_methods); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1108 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
|
1109 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1110 #endif //ASSERT |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1111 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
|
1112 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1113 nof_methods -= 1; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1114 } |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1115 // 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
|
1116 return 0; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1117 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1118 |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1119 |
| 0 | 1120 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
|
1121 Array<Method*>* methods = InstanceKlass::cast(interf_h())->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1122 int nof_methods = methods->length(); |
| 0 | 1123 HandleMark hm; |
|
1489
cff162798819
6888953: some calls to function-like macros are missing semicolons
jcoomes
parents:
676
diff
changeset
|
1124 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
|
1125 Handle interface_loader (THREAD, InstanceKlass::cast(interf_h())->class_loader()); |
| 0 | 1126 |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1127 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
|
1128 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
|
1129 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
|
1130 methodHandle target; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1131 if (m->has_itable_index()) { |
|
14221
2353011244bd
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13414
diff
changeset
|
1132 // This search must match the runtime resolution, i.e. selection search for invokeinterface |
|
2353011244bd
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13414
diff
changeset
|
1133 // 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
|
1134 LinkResolver::lookup_instance_method_in_klasses(target, _klass, m->name(), m->signature(), CHECK); |
| 0 | 1135 } |
| 1136 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
|
1137 // 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
|
1138 if (!(target == NULL) && !target->is_public()) { |
|
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1139 // Stuff an IllegalAccessError throwing method in there instead. |
|
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1140 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
|
1141 initialize(Universe::throw_illegal_access_error()); |
|
9d15b81d5d1b
8016839: JSR292: AME instead of IAE when calling a method
drchase
parents:
13055
diff
changeset
|
1142 } |
| 0 | 1143 } else { |
| 1144 // Entry did resolve, check loader constraints before initializing | |
| 1145 // if checkconstraints requested | |
| 1146 if (checkconstraints) { | |
|
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
1147 Handle method_holder_loader (THREAD, target->method_holder()->class_loader()); |
| 0 | 1148 if (method_holder_loader() != interface_loader()) { |
| 1149 ResourceMark rm(THREAD); | |
|
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
1150 Symbol* failed_type_symbol = |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1151 SystemDictionary::check_signature_loaders(m->signature(), |
| 0 | 1152 method_holder_loader, |
| 1153 interface_loader, | |
| 1154 true, CHECK); | |
|
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8021
diff
changeset
|
1155 if (failed_type_symbol != NULL) { |
| 0 | 1156 const char* msg = "loader constraint violation in interface " |
| 1157 "itable initialization: when resolving method \"%s\" the class" | |
| 1158 " loader (instance of %s) of the current class, %s, " | |
| 1159 "and the class loader (instance of %s) for interface " | |
| 1160 "%s have different Class objects for the type %s " | |
| 1161 "used in the signature"; | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1162 char* sig = target()->name_and_sig_as_C_string(); |
| 0 | 1163 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
|
1164 char* current = _klass->name()->as_C_string(); |
| 0 | 1165 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
|
1166 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
|
1167 char* failed_type_name = failed_type_symbol->as_C_string(); |
| 0 | 1168 size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1) + |
| 1169 strlen(current) + strlen(loader2) + strlen(iface) + | |
| 1170 strlen(failed_type_name); | |
| 1171 char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); | |
| 1172 jio_snprintf(buf, buflen, msg, sig, loader1, current, loader2, | |
| 1173 iface, failed_type_name); | |
| 1174 THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); | |
| 1175 } | |
| 1176 } | |
| 1177 } | |
| 1178 | |
| 1179 // 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
|
1180 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
|
1181 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
|
1182 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
|
1183 if (TraceItables && Verbose) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1184 ResourceMark rm(THREAD); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1185 if (target() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1186 char* sig = target()->name_and_sig_as_C_string(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1187 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
|
1188 interf_h()->internal_name(), ime_num, sig, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1189 target()->method_holder()->internal_name()); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1190 tty->print("target_method flags: "); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1191 target()->access_flags().print_on(tty); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1192 if (target()->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1193 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1194 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1195 tty->cr(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1196 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1197 } |
| 0 | 1198 } |
| 1199 } | |
| 1200 } | |
| 1201 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1202 // Update entry for specific Method* |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1203 void klassItable::initialize_with_method(Method* m) { |
| 0 | 1204 itableMethodEntry* ime = method_entry(0); |
| 1205 for(int i = 0; i < _size_method_table; i++) { | |
| 1206 if (ime->method() == m) { | |
| 1207 ime->initialize(m); | |
| 1208 } | |
| 1209 ime++; | |
| 1210 } | |
| 1211 } | |
| 1212 | |
|
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1213 #if INCLUDE_JVMTI |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1214 void klassItable::adjust_method_entries(Method** old_methods, Method** new_methods, |
| 0 | 1215 int methods_length, bool * trace_name_printed) { |
| 1216 // search the itable for uses of either obsolete or EMCP methods | |
| 1217 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
|
1218 Method* old_method = old_methods[j]; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1219 Method* new_method = new_methods[j]; |
| 0 | 1220 itableMethodEntry* ime = method_entry(0); |
| 1221 | |
|
610
70998f2e05ef
6805864: 4/3 Problem with jvmti->redefineClasses: some methods don't get redefined
dcubed
parents:
196
diff
changeset
|
1222 // 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
|
1223 // 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
|
1224 // 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
|
1225 // old_method references. |
| 0 | 1226 for (int i = 0; i < _size_method_table; i++) { |
| 1227 if (ime->method() == old_method) { | |
| 1228 ime->initialize(new_method); | |
| 1229 | |
| 1230 if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { | |
| 1231 if (!(*trace_name_printed)) { | |
| 1232 // RC_TRACE_MESG macro has an embedded ResourceMark | |
| 1233 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
|
1234 old_method->method_holder()->external_name())); |
| 0 | 1235 *trace_name_printed = true; |
| 1236 } | |
| 1237 // RC_TRACE macro has an embedded ResourceMark | |
| 1238 RC_TRACE(0x00200000, ("itable method update: %s(%s)", | |
| 1239 new_method->name()->as_C_string(), | |
| 1240 new_method->signature()->as_C_string())); | |
| 1241 } | |
|
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1242 // cannot 'break' here; see for-loop comment above. |
| 0 | 1243 } |
| 1244 ime++; | |
| 1245 } | |
| 1246 } | |
| 1247 } | |
| 1248 | |
|
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1249 // an itable should never contain old or obsolete methods |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1250 bool klassItable::check_no_old_or_obsolete_entries() { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1251 itableMethodEntry* ime = method_entry(0); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1252 for (int i = 0; i < _size_method_table; i++) { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1253 Method* m = ime->method(); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1254 if (m != NULL && |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1255 (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
|
1256 return false; |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1257 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1258 ime++; |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1259 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1260 return true; |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1261 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1262 |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1263 void klassItable::dump_itable() { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1264 itableMethodEntry* ime = method_entry(0); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1265 tty->print_cr("itable dump --"); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1266 for (int i = 0; i < _size_method_table; i++) { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1267 Method* m = ime->method(); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1268 if (m != NULL) { |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1269 tty->print(" (%5d) ", i); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1270 m->access_flags().print_on(tty); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1271 if (m->is_default_method()) { |
|
13055
fce21ac5968d
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
12823
diff
changeset
|
1272 tty->print("default "); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12318
diff
changeset
|
1273 } |
|
8021
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1274 tty->print(" -- "); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1275 m->print_name(tty); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1276 tty->cr(); |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1277 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1278 ime++; |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1279 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1280 } |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1281 #endif // INCLUDE_JVMTI |
|
8d9fc28831cc
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
6983
diff
changeset
|
1282 |
| 0 | 1283 |
| 1284 // Setup | |
| 1285 class InterfaceVisiterClosure : public StackObj { | |
| 1286 public: | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1287 virtual void doit(Klass* intf, int method_count) = 0; |
| 0 | 1288 }; |
| 1289 | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1290 // 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
|
1291 void visit_all_interfaces(Array<Klass*>* transitive_intf, InterfaceVisiterClosure *blk) { |
| 0 | 1292 // Handle array argument |
| 1293 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
|
1294 Klass* intf = transitive_intf->at(i); |
| 6983 | 1295 assert(intf->is_interface(), "sanity check"); |
| 0 | 1296 |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1297 // Find no. of itable methods |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1298 int method_count = 0; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1299 // 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
|
1300 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
|
1301 if (methods->length() > 0) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1302 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
|
1303 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
|
1304 method_count++; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1305 } |
| 0 | 1306 } |
| 1307 } | |
| 1308 | |
| 1309 // Only count interfaces with at least one method | |
| 1310 if (method_count > 0) { | |
| 1311 blk->doit(intf, method_count); | |
| 1312 } | |
| 1313 } | |
| 1314 } | |
| 1315 | |
| 1316 class CountInterfacesClosure : public InterfaceVisiterClosure { | |
| 1317 private: | |
| 1318 int _nof_methods; | |
| 1319 int _nof_interfaces; | |
| 1320 public: | |
| 1321 CountInterfacesClosure() { _nof_methods = 0; _nof_interfaces = 0; } | |
| 1322 | |
| 1323 int nof_methods() const { return _nof_methods; } | |
| 1324 int nof_interfaces() const { return _nof_interfaces; } | |
| 1325 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1326 void doit(Klass* intf, int method_count) { _nof_methods += method_count; _nof_interfaces++; } |
| 0 | 1327 }; |
| 1328 | |
| 1329 class SetupItableClosure : public InterfaceVisiterClosure { | |
| 1330 private: | |
| 1331 itableOffsetEntry* _offset_entry; | |
| 1332 itableMethodEntry* _method_entry; | |
| 1333 address _klass_begin; | |
| 1334 public: | |
| 1335 SetupItableClosure(address klass_begin, itableOffsetEntry* offset_entry, itableMethodEntry* method_entry) { | |
| 1336 _klass_begin = klass_begin; | |
| 1337 _offset_entry = offset_entry; | |
| 1338 _method_entry = method_entry; | |
| 1339 } | |
| 1340 | |
| 1341 itableMethodEntry* method_entry() const { return _method_entry; } | |
| 1342 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1343 void doit(Klass* intf, int method_count) { |
| 0 | 1344 int offset = ((address)_method_entry) - _klass_begin; |
| 1345 _offset_entry->initialize(intf, offset); | |
| 1346 _offset_entry++; | |
| 1347 _method_entry += method_count; | |
| 1348 } | |
| 1349 }; | |
| 1350 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1351 int klassItable::compute_itable_size(Array<Klass*>* transitive_interfaces) { |
| 0 | 1352 // Count no of interfaces and total number of interface methods |
| 1353 CountInterfacesClosure cic; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1354 visit_all_interfaces(transitive_interfaces, &cic); |
| 0 | 1355 |
|
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1356 // 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
|
1357 int itable_size = calc_itable_size(cic.nof_interfaces() + 1, cic.nof_methods()); |
| 0 | 1358 |
| 1359 // Statistics | |
| 1360 update_stats(itable_size * HeapWordSize); | |
| 1361 | |
| 1362 return itable_size; | |
| 1363 } | |
| 1364 | |
| 1365 | |
| 1366 // Fill out offset table and interface klasses into the itable space | |
| 1367 void klassItable::setup_itable_offset_table(instanceKlassHandle klass) { | |
| 1368 if (klass->itable_length() == 0) return; | |
| 1369 assert(!klass->is_interface(), "Should have zero length itable"); | |
| 1370 | |
| 1371 // Count no of interfaces and total number of interface methods | |
| 1372 CountInterfacesClosure cic; | |
| 1373 visit_all_interfaces(klass->transitive_interfaces(), &cic); | |
| 1374 int nof_methods = cic.nof_methods(); | |
| 1375 int nof_interfaces = cic.nof_interfaces(); | |
| 1376 | |
|
16
f8236e79048a
6664627: Merge changes made only in hotspot 11 forward to jdk 7
dcubed
parents:
0
diff
changeset
|
1377 // 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
|
1378 nof_interfaces++; |
| 0 | 1379 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1380 assert(compute_itable_size(klass->transitive_interfaces()) == |
| 0 | 1381 calc_itable_size(nof_interfaces, nof_methods), |
| 1382 "mismatch calculation of itable size"); | |
| 1383 | |
| 1384 // Fill-out offset table | |
| 1385 itableOffsetEntry* ioe = (itableOffsetEntry*)klass->start_of_itable(); | |
| 1386 itableMethodEntry* ime = (itableMethodEntry*)(ioe + nof_interfaces); | |
| 1387 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
|
1388 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
|
1389 assert((oop*)(end) == (oop*)(ime + nof_methods), "wrong offset calculation (2)"); |
| 0 | 1390 |
| 1391 // 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
|
1392 SetupItableClosure sic((address)klass(), ioe, ime); |
| 0 | 1393 visit_all_interfaces(klass->transitive_interfaces(), &sic); |
| 1394 | |
| 1395 #ifdef ASSERT | |
| 1396 ime = sic.method_entry(); | |
| 1397 oop* v = (oop*) klass->end_of_itable(); | |
| 1398 assert( (oop*)(ime) == v, "wrong offset calculation (2)"); | |
| 1399 #endif | |
| 1400 } | |
| 1401 | |
| 1402 | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1403 // inverse to itable_index |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1404 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
|
1405 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
|
1406 assert(intf->verify_itable_index(itable_index), ""); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1407 Array<Method*>* methods = InstanceKlass::cast(intf)->methods(); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1408 |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1409 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
|
1410 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
|
1411 |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1412 int index = itable_index; |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1413 Method* m = methods->at(index); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1414 int index2 = -1; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1415 while (!m->has_itable_index() || |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1416 (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
|
1417 assert(index2 < itable_index, "monotonic"); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1418 if (++index == methods->length()) |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1419 return NULL; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1420 m = methods->at(index); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1421 } |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
10166
diff
changeset
|
1422 assert(m->itable_index() == itable_index, "correct inverse"); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1423 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1424 return m; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1425 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
610
diff
changeset
|
1426 |
| 0 | 1427 void klassVtable::verify(outputStream* st, bool forced) { |
| 1428 // make sure table is initialized | |
| 1429 if (!Universe::is_fully_initialized()) return; | |
| 1430 #ifndef PRODUCT | |
| 1431 // avoid redundant verifies | |
| 1432 if (!forced && _verify_count == Universe::verify_count()) return; | |
| 1433 _verify_count = Universe::verify_count(); | |
| 1434 #endif | |
| 1435 oop* end_of_obj = (oop*)_klass() + _klass()->size(); | |
| 1436 oop* end_of_vtable = (oop *)&table()[_length]; | |
| 1437 if (end_of_vtable > end_of_obj) { | |
|
1490
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1489
diff
changeset
|
1438 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
|
1439 "end)", _klass->internal_name())); |
| 0 | 1440 } |
| 1441 | |
| 1442 for (int i = 0; i < _length; i++) table()[i].verify(this, st); | |
| 1443 // verify consistency with superKlass vtable | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1444 Klass* super = _klass->super(); |
| 0 | 1445 if (super != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1446 InstanceKlass* sk = InstanceKlass::cast(super); |
| 0 | 1447 klassVtable* vt = sk->vtable(); |
| 1448 for (int i = 0; i < vt->length(); i++) { | |
| 1449 verify_against(st, vt, i); | |
| 1450 } | |
| 1451 } | |
| 1452 } | |
| 1453 | |
| 1454 void klassVtable::verify_against(outputStream* st, klassVtable* vt, int index) { | |
| 1455 vtableEntry* vte = &vt->table()[index]; | |
| 1456 if (vte->method()->name() != table()[index].method()->name() || | |
| 1457 vte->method()->signature() != table()[index].method()->signature()) { | |
| 1458 fatal("mismatched name/signature of vtable entries"); | |
| 1459 } | |
| 1460 } | |
| 1461 | |
| 1462 #ifndef PRODUCT | |
| 1463 void klassVtable::print() { | |
| 1464 ResourceMark rm; | |
| 1465 tty->print("klassVtable for klass %s (length %d):\n", _klass->internal_name(), length()); | |
| 1466 for (int i = 0; i < length(); i++) { | |
| 1467 table()[i].print(); | |
| 1468 tty->cr(); | |
| 1469 } | |
| 1470 } | |
| 1471 #endif | |
| 1472 | |
| 1473 void vtableEntry::verify(klassVtable* vt, outputStream* st) { | |
| 1474 NOT_PRODUCT(FlagSetting fs(IgnoreLockingAssertions, true)); | |
| 1475 assert(method() != NULL, "must have set method"); | |
| 1476 method()->verify(); | |
| 1477 // we sub_type, because it could be a miranda method | |
| 1478 if (!vt->klass()->is_subtype_of(method()->method_holder())) { | |
| 1479 #ifndef PRODUCT | |
| 1480 print(); | |
| 1481 #endif | |
|
1490
f03d0a26bf83
6888954: argument formatting for assert() and friends
jcoomes
parents:
1489
diff
changeset
|
1482 fatal(err_msg("vtableEntry " PTR_FORMAT ": method is from subclass", this)); |
| 0 | 1483 } |
| 1484 } | |
| 1485 | |
| 1486 #ifndef PRODUCT | |
| 1487 | |
| 1488 void vtableEntry::print() { | |
| 1489 ResourceMark rm; | |
| 1490 tty->print("vtableEntry %s: ", method()->name()->as_C_string()); | |
| 1491 if (Verbose) { | |
| 1492 tty->print("m %#lx ", (address)method()); | |
| 1493 } | |
| 1494 } | |
| 1495 | |
| 1496 class VtableStats : AllStatic { | |
| 1497 public: | |
| 1498 static int no_klasses; // # classes with vtables | |
| 1499 static int no_array_klasses; // # array classes | |
| 1500 static int no_instance_klasses; // # instanceKlasses | |
| 1501 static int sum_of_vtable_len; // total # of vtable entries | |
| 1502 static int sum_of_array_vtable_len; // total # of vtable entries in array klasses only | |
| 1503 static int fixed; // total fixed overhead in bytes | |
| 1504 static int filler; // overhead caused by filler bytes | |
| 1505 static int entries; // total bytes consumed by vtable entries | |
| 1506 static int array_entries; // total bytes consumed by array vtable entries | |
| 1507 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1508 static void do_class(Klass* k) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
3245
diff
changeset
|
1509 Klass* kl = k; |
| 0 | 1510 klassVtable* vt = kl->vtable(); |
| 1511 if (vt == NULL) return; | |
| 1512 no_klasses++; | |
| 1513 if (kl->oop_is_instance()) { | |
| 1514 no_instance_klasses++; | |
| 1515 kl->array_klasses_do(do_class); | |
| 1516 } | |
| 1517 if (kl->oop_is_array()) { | |
| 1518 no_array_klasses++; | |
| 1519 sum_of_array_vtable_len += vt->length(); | |
| 1520 } | |
| 1521 sum_of_vtable_len += vt->length(); | |
| 1522 } | |
| 1523 | |
| 1524 static void compute() { | |
| 1525 SystemDictionary::classes_do(do_class); | |
| 1526 fixed = no_klasses * oopSize; // vtable length | |
| 1527 // filler size is a conservative approximation | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6725
diff
changeset
|
1528 filler = oopSize * (no_klasses - no_instance_klasses) * (sizeof(InstanceKlass) - sizeof(ArrayKlass) - 1); |
| 0 | 1529 entries = sizeof(vtableEntry) * sum_of_vtable_len; |
| 1530 array_entries = sizeof(vtableEntry) * sum_of_array_vtable_len; | |
| 1531 } | |
| 1532 }; | |
| 1533 | |
| 1534 int VtableStats::no_klasses = 0; | |
| 1535 int VtableStats::no_array_klasses = 0; | |
| 1536 int VtableStats::no_instance_klasses = 0; | |
| 1537 int VtableStats::sum_of_vtable_len = 0; | |
| 1538 int VtableStats::sum_of_array_vtable_len = 0; | |
| 1539 int VtableStats::fixed = 0; | |
| 1540 int VtableStats::filler = 0; | |
| 1541 int VtableStats::entries = 0; | |
| 1542 int VtableStats::array_entries = 0; | |
| 1543 | |
| 1544 void klassVtable::print_statistics() { | |
| 1545 ResourceMark rm; | |
| 1546 HandleMark hm; | |
| 1547 VtableStats::compute(); | |
| 1548 tty->print_cr("vtable statistics:"); | |
| 1549 tty->print_cr("%6d classes (%d instance, %d array)", VtableStats::no_klasses, VtableStats::no_instance_klasses, VtableStats::no_array_klasses); | |
| 1550 int total = VtableStats::fixed + VtableStats::filler + VtableStats::entries; | |
| 1551 tty->print_cr("%6d bytes fixed overhead (refs + vtable object header)", VtableStats::fixed); | |
| 1552 tty->print_cr("%6d bytes filler overhead", VtableStats::filler); | |
| 1553 tty->print_cr("%6d bytes for vtable entries (%d for arrays)", VtableStats::entries, VtableStats::array_entries); | |
| 1554 tty->print_cr("%6d bytes total", total); | |
| 1555 } | |
| 1556 | |
| 1557 int klassItable::_total_classes; // Total no. of classes with itables | |
| 1558 long klassItable::_total_size; // Total no. of bytes used for itables | |
| 1559 | |
| 1560 void klassItable::print_statistics() { | |
| 1561 tty->print_cr("itable statistics:"); | |
| 1562 tty->print_cr("%6d classes with itables", _total_classes); | |
| 1563 tty->print_cr("%6d K uses for itables (average by class: %d bytes)", _total_size / K, _total_size / _total_classes); | |
| 1564 } | |
| 1565 | |
| 1566 #endif // PRODUCT |