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