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