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