author | redestad |
Tue, 19 Nov 2019 23:22:27 +0100 | |
changeset 59140 | f68fd04fe463 |
parent 58760 | 1f7f707c1aa9 |
permissions | -rw-r--r-- |
14385 | 1 |
/* |
53432
1ec56532ae0c
8217424: Remove the idempotent parameter to Method::sort_methods
iklam
parents:
51444
diff
changeset
|
2 |
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. |
14385 | 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 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
* |
|
23 |
*/ |
|
24 |
||
25 |
#include "precompiled.hpp" |
|
26 |
#include "classfile/bytecodeAssembler.hpp" |
|
27 |
#include "classfile/defaultMethods.hpp" |
|
28 |
#include "classfile/symbolTable.hpp" |
|
48463
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
29 |
#include "classfile/systemDictionary.hpp" |
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
30 |
#include "logging/log.hpp" |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
31 |
#include "logging/logStream.hpp" |
14385 | 32 |
#include "memory/allocation.hpp" |
33 |
#include "memory/metadataFactory.hpp" |
|
34 |
#include "memory/resourceArea.hpp" |
|
54786 | 35 |
#include "memory/universe.hpp" |
34666 | 36 |
#include "runtime/handles.inline.hpp" |
14385 | 37 |
#include "runtime/signature.hpp" |
38 |
#include "runtime/thread.hpp" |
|
39 |
#include "oops/instanceKlass.hpp" |
|
40 |
#include "oops/klass.hpp" |
|
41 |
#include "oops/method.hpp" |
|
42 |
#include "utilities/accessFlags.hpp" |
|
43 |
#include "utilities/exceptions.hpp" |
|
44 |
#include "utilities/ostream.hpp" |
|
45 |
#include "utilities/pair.hpp" |
|
46 |
#include "utilities/resourceHash.hpp" |
|
47 |
||
48 |
typedef enum { QUALIFIED, DISQUALIFIED } QualifiedState; |
|
49 |
||
50 |
static void print_slot(outputStream* str, Symbol* name, Symbol* signature) { |
|
51 |
str->print("%s%s", name->as_C_string(), signature->as_C_string()); |
|
52 |
} |
|
53 |
||
54 |
static void print_method(outputStream* str, Method* mo, bool with_class=true) { |
|
55 |
if (with_class) { |
|
56 |
str->print("%s.", mo->klass_name()->as_C_string()); |
|
57 |
} |
|
58 |
print_slot(str, mo->name(), mo->signature()); |
|
59 |
} |
|
60 |
||
61 |
/** |
|
62 |
* Perform a depth-first iteration over the class hierarchy, applying |
|
63 |
* algorithmic logic as it goes. |
|
64 |
* |
|
65 |
* This class is one half of the inheritance hierarchy analysis mechanism. |
|
66 |
* It is meant to be used in conjunction with another class, the algorithm, |
|
67 |
* which is indicated by the ALGO template parameter. This class can be |
|
68 |
* paired with any algorithm class that provides the required methods. |
|
69 |
* |
|
70 |
* This class contains all the mechanics for iterating over the class hierarchy |
|
71 |
* starting at a particular root, without recursing (thus limiting stack growth |
|
72 |
* from this point). It visits each superclass (if present) and superinterface |
|
73 |
* in a depth-first manner, with callbacks to the ALGO class as each class is |
|
74 |
* encountered (visit()), The algorithm can cut-off further exploration of a |
|
75 |
* particular branch by returning 'false' from a visit() call. |
|
76 |
* |
|
77 |
* The ALGO class, must provide a visit() method, which each of which will be |
|
78 |
* called once for each node in the inheritance tree during the iteration. In |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
79 |
* addition, it can provide a memory block via new_node_data(), which it can |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
80 |
* use for node-specific storage (and access via the current_data() and |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
81 |
* data_at_depth(int) methods). |
14385 | 82 |
* |
83 |
* Bare minimum needed to be an ALGO class: |
|
84 |
* class Algo : public HierarchyVisitor<Algo> { |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
85 |
* void* new_node_data() { return NULL; } |
14385 | 86 |
* void free_node_data(void* data) { return; } |
87 |
* bool visit() { return true; } |
|
88 |
* }; |
|
89 |
*/ |
|
90 |
template <class ALGO> |
|
91 |
class HierarchyVisitor : StackObj { |
|
92 |
private: |
|
93 |
||
94 |
class Node : public ResourceObj { |
|
95 |
public: |
|
96 |
InstanceKlass* _class; |
|
97 |
bool _super_was_visited; |
|
98 |
int _interface_index; |
|
99 |
void* _algorithm_data; |
|
100 |
||
101 |
Node(InstanceKlass* cls, void* data, bool visit_super) |
|
102 |
: _class(cls), _super_was_visited(!visit_super), |
|
103 |
_interface_index(0), _algorithm_data(data) {} |
|
104 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
105 |
void update(InstanceKlass* cls, void* data, bool visit_super) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
106 |
_class = cls; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
107 |
_super_was_visited = !visit_super; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
108 |
_interface_index = 0; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
109 |
_algorithm_data = data; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
110 |
} |
14385 | 111 |
int number_of_interfaces() { return _class->local_interfaces()->length(); } |
112 |
int interface_index() { return _interface_index; } |
|
113 |
void set_super_visited() { _super_was_visited = true; } |
|
114 |
void increment_visited_interface() { ++_interface_index; } |
|
115 |
void set_all_interfaces_visited() { |
|
116 |
_interface_index = number_of_interfaces(); |
|
117 |
} |
|
118 |
bool has_visited_super() { return _super_was_visited; } |
|
119 |
bool has_visited_all_interfaces() { |
|
120 |
return interface_index() >= number_of_interfaces(); |
|
121 |
} |
|
122 |
InstanceKlass* interface_at(int index) { |
|
58760
1f7f707c1aa9
8232881: Remove unnecessary InstanceKlass::casts
redestad
parents:
58689
diff
changeset
|
123 |
return _class->local_interfaces()->at(index); |
14385 | 124 |
} |
125 |
InstanceKlass* next_super() { return _class->java_super(); } |
|
126 |
InstanceKlass* next_interface() { |
|
127 |
return interface_at(interface_index()); |
|
128 |
} |
|
129 |
}; |
|
130 |
||
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
131 |
bool _visited_Object; |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
132 |
|
14385 | 133 |
GrowableArray<Node*> _path; |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
134 |
GrowableArray<Node*> _free_nodes; |
14385 | 135 |
|
136 |
Node* current_top() const { return _path.top(); } |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
137 |
bool has_more_nodes() const { return _path.length() > 0; } |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
138 |
void push(InstanceKlass* cls, ALGO* algo) { |
14385 | 139 |
assert(cls != NULL, "Requires a valid instance class"); |
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
140 |
if (cls == SystemDictionary::Object_klass()) { |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
141 |
_visited_Object = true; |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
142 |
} |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
143 |
void* data = algo->new_node_data(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
144 |
Node* node; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
145 |
if (_free_nodes.is_empty()) { // Add a new node |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
146 |
node = new Node(cls, data, has_super(cls)); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
147 |
} else { // Reuse existing node and data |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
148 |
node = _free_nodes.pop(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
149 |
node->update(cls, data, has_super(cls)); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
150 |
} |
14385 | 151 |
_path.push(node); |
152 |
} |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
153 |
void pop() { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
154 |
Node* node = _path.pop(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
155 |
// Make the node available for reuse |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
156 |
_free_nodes.push(node); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
157 |
} |
14385 | 158 |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
159 |
// Since the starting point can be an interface, we must ensure we catch |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
160 |
// j.l.Object as the super once in those cases. The _visited_Object flag |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
161 |
// only ensures we don't then repeatedly enqueue Object for each interface |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
162 |
// in the class hierarchy. |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
163 |
bool has_super(InstanceKlass* cls) { |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
164 |
return cls->super() != NULL && (!_visited_Object || !cls->is_interface()); |
14385 | 165 |
} |
166 |
||
167 |
Node* node_at_depth(int i) const { |
|
168 |
return (i >= _path.length()) ? NULL : _path.at(_path.length() - i - 1); |
|
169 |
} |
|
170 |
||
171 |
protected: |
|
172 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
173 |
// Resets the visitor |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
174 |
void reset() { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
175 |
_visited_Object = false; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
176 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
177 |
|
14385 | 178 |
// Accessors available to the algorithm |
179 |
int current_depth() const { return _path.length() - 1; } |
|
180 |
||
181 |
InstanceKlass* class_at_depth(int i) { |
|
182 |
Node* n = node_at_depth(i); |
|
183 |
return n == NULL ? NULL : n->_class; |
|
184 |
} |
|
185 |
InstanceKlass* current_class() { return class_at_depth(0); } |
|
186 |
||
187 |
void* data_at_depth(int i) { |
|
188 |
Node* n = node_at_depth(i); |
|
189 |
return n == NULL ? NULL : n->_algorithm_data; |
|
190 |
} |
|
191 |
void* current_data() { return data_at_depth(0); } |
|
192 |
||
193 |
public: |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
194 |
HierarchyVisitor() : _visited_Object(false), _path() {} |
14385 | 195 |
|
196 |
void run(InstanceKlass* root) { |
|
197 |
ALGO* algo = static_cast<ALGO*>(this); |
|
198 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
199 |
push(root, algo); |
14385 | 200 |
bool top_needs_visit = true; |
201 |
do { |
|
202 |
Node* top = current_top(); |
|
203 |
if (top_needs_visit) { |
|
204 |
if (algo->visit() == false) { |
|
205 |
// algorithm does not want to continue along this path. Arrange |
|
206 |
// it so that this state is immediately popped off the stack |
|
207 |
top->set_super_visited(); |
|
208 |
top->set_all_interfaces_visited(); |
|
209 |
} |
|
210 |
top_needs_visit = false; |
|
211 |
} |
|
212 |
||
213 |
if (top->has_visited_super() && top->has_visited_all_interfaces()) { |
|
214 |
algo->free_node_data(top->_algorithm_data); |
|
215 |
pop(); |
|
216 |
} else { |
|
217 |
InstanceKlass* next = NULL; |
|
218 |
if (top->has_visited_super() == false) { |
|
219 |
next = top->next_super(); |
|
220 |
top->set_super_visited(); |
|
221 |
} else { |
|
222 |
next = top->next_interface(); |
|
223 |
top->increment_visited_interface(); |
|
224 |
} |
|
225 |
assert(next != NULL, "Otherwise we shouldn't be here"); |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
226 |
push(next, algo); |
14385 | 227 |
top_needs_visit = true; |
228 |
} |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
229 |
} while (has_more_nodes()); |
14385 | 230 |
} |
231 |
}; |
|
232 |
||
233 |
class PrintHierarchy : public HierarchyVisitor<PrintHierarchy> { |
|
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
234 |
private: |
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
235 |
outputStream* _st; |
14385 | 236 |
public: |
237 |
bool visit() { |
|
238 |
InstanceKlass* cls = current_class(); |
|
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
239 |
streamIndentor si(_st, current_depth() * 2); |
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
240 |
_st->indent().print_cr("%s", cls->name()->as_C_string()); |
14385 | 241 |
return true; |
242 |
} |
|
243 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
244 |
void* new_node_data() { return NULL; } |
14385 | 245 |
void free_node_data(void* data) { return; } |
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
246 |
|
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
247 |
PrintHierarchy(outputStream* st = tty) : _st(st) {} |
14385 | 248 |
}; |
249 |
||
250 |
// Used to register InstanceKlass objects and all related metadata structures |
|
251 |
// (Methods, ConstantPools) as "in-use" by the current thread so that they can't |
|
252 |
// be deallocated by class redefinition while we're using them. The classes are |
|
253 |
// de-registered when this goes out of scope. |
|
254 |
// |
|
255 |
// Once a class is registered, we need not bother with methodHandles or |
|
256 |
// constantPoolHandles for it's associated metadata. |
|
257 |
class KeepAliveRegistrar : public StackObj { |
|
258 |
private: |
|
259 |
Thread* _thread; |
|
260 |
GrowableArray<ConstantPool*> _keep_alive; |
|
261 |
||
262 |
public: |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
263 |
KeepAliveRegistrar(Thread* thread) : _thread(thread), _keep_alive(6) { |
14385 | 264 |
assert(thread == Thread::current(), "Must be current thread"); |
265 |
} |
|
266 |
||
267 |
~KeepAliveRegistrar() { |
|
268 |
for (int i = _keep_alive.length() - 1; i >= 0; --i) { |
|
269 |
ConstantPool* cp = _keep_alive.at(i); |
|
270 |
int idx = _thread->metadata_handles()->find_from_end(cp); |
|
271 |
assert(idx > 0, "Must be in the list"); |
|
272 |
_thread->metadata_handles()->remove_at(idx); |
|
273 |
} |
|
274 |
} |
|
275 |
||
276 |
// Register a class as 'in-use' by the thread. It's fine to register a class |
|
277 |
// multiple times (though perhaps inefficient) |
|
278 |
void register_class(InstanceKlass* ik) { |
|
279 |
ConstantPool* cp = ik->constants(); |
|
280 |
_keep_alive.push(cp); |
|
281 |
_thread->metadata_handles()->push(cp); |
|
282 |
} |
|
283 |
}; |
|
284 |
||
285 |
class KeepAliveVisitor : public HierarchyVisitor<KeepAliveVisitor> { |
|
286 |
private: |
|
287 |
KeepAliveRegistrar* _registrar; |
|
288 |
||
289 |
public: |
|
290 |
KeepAliveVisitor(KeepAliveRegistrar* registrar) : _registrar(registrar) {} |
|
291 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
292 |
void* new_node_data() { return NULL; } |
14385 | 293 |
void free_node_data(void* data) { return; } |
294 |
||
295 |
bool visit() { |
|
296 |
_registrar->register_class(current_class()); |
|
297 |
return true; |
|
298 |
} |
|
299 |
}; |
|
300 |
||
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
301 |
|
14385 | 302 |
// A method family contains a set of all methods that implement a single |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
303 |
// erased method. As members of the set are collected while walking over the |
14385 | 304 |
// hierarchy, they are tagged with a qualification state. The qualification |
305 |
// state for an erased method is set to disqualified if there exists a path |
|
306 |
// from the root of hierarchy to the method that contains an interleaving |
|
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
307 |
// erased method defined in an interface. |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
308 |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
309 |
class MethodState { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
310 |
public: |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
311 |
Method* _method; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
312 |
QualifiedState _state; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
313 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
314 |
MethodState() : _method(NULL), _state(DISQUALIFIED) {} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
315 |
MethodState(Method* method, QualifiedState state) : _method(method), _state(state) {} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
316 |
}; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
317 |
|
14385 | 318 |
class MethodFamily : public ResourceObj { |
319 |
private: |
|
320 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
321 |
GrowableArray<MethodState> _members; |
14385 | 322 |
|
323 |
Method* _selected_target; // Filled in later, if a unique target exists |
|
324 |
Symbol* _exception_message; // If no unique target is found |
|
20284
595a25ab9474
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
19966
diff
changeset
|
325 |
Symbol* _exception_name; // If no unique target is found |
14385 | 326 |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
327 |
MethodState* find_method(Method* method) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
328 |
for (int i = 0; i < _members.length(); i++) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
329 |
if (_members.at(i)._method == method) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
330 |
return &_members.at(i); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
331 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
332 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
333 |
return NULL; |
14385 | 334 |
} |
335 |
||
336 |
void add_method(Method* method, QualifiedState state) { |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
337 |
MethodState method_state(method, state); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
338 |
_members.append(method_state); |
14385 | 339 |
} |
340 |
||
341 |
Symbol* generate_no_defaults_message(TRAPS) const; |
|
22232
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
342 |
Symbol* generate_method_message(Symbol *klass_name, Method* method, TRAPS) const; |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
343 |
Symbol* generate_conflicts_message(GrowableArray<MethodState>* methods, TRAPS) const; |
14385 | 344 |
|
345 |
public: |
|
346 |
||
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
347 |
MethodFamily() |
20284
595a25ab9474
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
19966
diff
changeset
|
348 |
: _selected_target(NULL), _exception_message(NULL), _exception_name(NULL) {} |
14385 | 349 |
|
350 |
void set_target_if_empty(Method* m) { |
|
351 |
if (_selected_target == NULL && !m->is_overpass()) { |
|
352 |
_selected_target = m; |
|
353 |
} |
|
354 |
} |
|
355 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
356 |
void record_method(Method* m, QualifiedState state) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
357 |
// If not in the set, add it. If it's already in the set, then leave it |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
358 |
// as is if state is qualified, or set it to disqualified if state is |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
359 |
// disqualified. |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
360 |
MethodState* method_state = find_method(m); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
361 |
if (method_state == NULL) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
362 |
add_method(m, state); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
363 |
} else if (state == DISQUALIFIED) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
364 |
method_state->_state = DISQUALIFIED; |
14385 | 365 |
} |
366 |
} |
|
367 |
||
368 |
bool has_target() const { return _selected_target != NULL; } |
|
369 |
bool throws_exception() { return _exception_message != NULL; } |
|
370 |
||
371 |
Method* get_selected_target() { return _selected_target; } |
|
372 |
Symbol* get_exception_message() { return _exception_message; } |
|
20284
595a25ab9474
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
19966
diff
changeset
|
373 |
Symbol* get_exception_name() { return _exception_name; } |
14385 | 374 |
|
375 |
// Either sets the target or the exception error message |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
376 |
void determine_target_or_set_exception_message(InstanceKlass* root, TRAPS) { |
14385 | 377 |
if (has_target() || throws_exception()) { |
378 |
return; |
|
379 |
} |
|
380 |
||
21556
e75cd34a59e0
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
21516
diff
changeset
|
381 |
// Qualified methods are maximally-specific methods |
e75cd34a59e0
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
21516
diff
changeset
|
382 |
// These include public, instance concrete (=default) and abstract methods |
21516
8fa5308ab970
8027304: Lambda: inheriting abstract + 1 default -> default, not ICCE
acorn
parents:
20710
diff
changeset
|
383 |
int num_defaults = 0; |
8fa5308ab970
8027304: Lambda: inheriting abstract + 1 default -> default, not ICCE
acorn
parents:
20710
diff
changeset
|
384 |
int default_index = -1; |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
385 |
for (int i = 0; i < _members.length(); i++) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
386 |
MethodState &member = _members.at(i); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
387 |
if (member._state == QUALIFIED) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
388 |
if (member._method->is_default_method()) { |
21516
8fa5308ab970
8027304: Lambda: inheriting abstract + 1 default -> default, not ICCE
acorn
parents:
20710
diff
changeset
|
389 |
num_defaults++; |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
390 |
default_index = i; |
21516
8fa5308ab970
8027304: Lambda: inheriting abstract + 1 default -> default, not ICCE
acorn
parents:
20710
diff
changeset
|
391 |
} |
14385 | 392 |
} |
393 |
} |
|
394 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
395 |
if (num_defaults == 1) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
396 |
assert(_members.at(default_index)._state == QUALIFIED, ""); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
397 |
_selected_target = _members.at(default_index)._method; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
398 |
} else { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
399 |
generate_and_set_exception_message(root, num_defaults, default_index, CHECK); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
400 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
401 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
402 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
403 |
void generate_and_set_exception_message(InstanceKlass* root, int num_defaults, int default_index, TRAPS) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
404 |
assert(num_defaults != 1, "invariant - should've been handled calling method"); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
405 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
406 |
GrowableArray<Method*> qualified_methods; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
407 |
for (int i = 0; i < _members.length(); i++) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
408 |
MethodState& member = _members.at(i); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
409 |
if (member._state == QUALIFIED) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
410 |
qualified_methods.push(member._method); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
411 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
412 |
} |
22232
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
413 |
if (num_defaults == 0) { |
22493
af3de4cee5e5
8031059: invokestatic: ICCE trying to invoke static method when it clashes with an abstract method inherited from an interface
hseigel
parents:
22233
diff
changeset
|
414 |
// If the root klass has a static method with matching name and signature |
af3de4cee5e5
8031059: invokestatic: ICCE trying to invoke static method when it clashes with an abstract method inherited from an interface
hseigel
parents:
22233
diff
changeset
|
415 |
// then do not generate an overpass method because it will hide the |
af3de4cee5e5
8031059: invokestatic: ICCE trying to invoke static method when it clashes with an abstract method inherited from an interface
hseigel
parents:
22233
diff
changeset
|
416 |
// static method during resolution. |
23999
22eb7be3d99d
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
22493
diff
changeset
|
417 |
if (qualified_methods.length() == 0) { |
22eb7be3d99d
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
22493
diff
changeset
|
418 |
_exception_message = generate_no_defaults_message(CHECK); |
22eb7be3d99d
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
22493
diff
changeset
|
419 |
} else { |
22eb7be3d99d
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
22493
diff
changeset
|
420 |
assert(root != NULL, "Null root class"); |
22eb7be3d99d
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
22493
diff
changeset
|
421 |
_exception_message = generate_method_message(root->name(), qualified_methods.at(0), CHECK); |
22232
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
422 |
} |
23999
22eb7be3d99d
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
22493
diff
changeset
|
423 |
_exception_name = vmSymbols::java_lang_AbstractMethodError(); |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
424 |
} else { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
425 |
_exception_message = generate_conflicts_message(&_members,CHECK); |
22493
af3de4cee5e5
8031059: invokestatic: ICCE trying to invoke static method when it clashes with an abstract method inherited from an interface
hseigel
parents:
22233
diff
changeset
|
426 |
_exception_name = vmSymbols::java_lang_IncompatibleClassChangeError(); |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
427 |
LogTarget(Debug, defaultmethods) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
428 |
if (lt.is_enabled()) { |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
429 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
430 |
_exception_message->print_value_on(&ls); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
431 |
ls.cr(); |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
432 |
} |
14385 | 433 |
} |
434 |
} |
|
435 |
||
436 |
void print_selected(outputStream* str, int indent) const { |
|
437 |
assert(has_target(), "Should be called otherwise"); |
|
438 |
streamIndentor si(str, indent * 2); |
|
439 |
str->indent().print("Selected method: "); |
|
440 |
print_method(str, _selected_target); |
|
19966
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
441 |
Klass* method_holder = _selected_target->method_holder(); |
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
442 |
if (!method_holder->is_interface()) { |
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
443 |
str->print(" : in superclass"); |
19966
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
444 |
} |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23999
diff
changeset
|
445 |
str->cr(); |
14385 | 446 |
} |
447 |
||
448 |
void print_exception(outputStream* str, int indent) { |
|
449 |
assert(throws_exception(), "Should be called otherwise"); |
|
20284
595a25ab9474
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
19966
diff
changeset
|
450 |
assert(_exception_name != NULL, "exception_name should be set"); |
14385 | 451 |
streamIndentor si(str, indent * 2); |
20284
595a25ab9474
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
19966
diff
changeset
|
452 |
str->indent().print_cr("%s: %s", _exception_name->as_C_string(), _exception_message->as_C_string()); |
14385 | 453 |
} |
454 |
}; |
|
455 |
||
456 |
Symbol* MethodFamily::generate_no_defaults_message(TRAPS) const { |
|
54847
59ea39bb2809
8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents:
54786
diff
changeset
|
457 |
return SymbolTable::new_symbol("No qualifying defaults found"); |
14385 | 458 |
} |
459 |
||
22232
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
460 |
Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method, TRAPS) const { |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
461 |
stringStream ss; |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
462 |
ss.print("Method "); |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
463 |
Symbol* name = method->name(); |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
464 |
Symbol* signature = method->signature(); |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
465 |
ss.write((const char*)klass_name->bytes(), klass_name->utf8_length()); |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
466 |
ss.print("."); |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
467 |
ss.write((const char*)name->bytes(), name->utf8_length()); |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
468 |
ss.write((const char*)signature->bytes(), signature->utf8_length()); |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
469 |
ss.print(" is abstract"); |
54847
59ea39bb2809
8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents:
54786
diff
changeset
|
470 |
return SymbolTable::new_symbol(ss.base(), (int)ss.size()); |
22232
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
471 |
} |
26acfad336c0
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
21913
diff
changeset
|
472 |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
473 |
Symbol* MethodFamily::generate_conflicts_message(GrowableArray<MethodState>* methods, TRAPS) const { |
14385 | 474 |
stringStream ss; |
475 |
ss.print("Conflicting default methods:"); |
|
476 |
for (int i = 0; i < methods->length(); ++i) { |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
477 |
Method *method = methods->at(i)._method; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
478 |
Symbol *klass = method->klass_name(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
479 |
Symbol *name = method->name(); |
14385 | 480 |
ss.print(" "); |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
481 |
ss.write((const char*) klass->bytes(), klass->utf8_length()); |
14385 | 482 |
ss.print("."); |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
483 |
ss.write((const char*) name->bytes(), name->utf8_length()); |
14385 | 484 |
} |
54847
59ea39bb2809
8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents:
54786
diff
changeset
|
485 |
return SymbolTable::new_symbol(ss.base(), (int)ss.size()); |
14385 | 486 |
} |
487 |
||
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
488 |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
489 |
class StateRestorerScope; |
14385 | 490 |
|
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
491 |
// StatefulMethodFamily is a wrapper around a MethodFamily that maintains the |
14385 | 492 |
// qualification state during hierarchy visitation, and applies that state |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
493 |
// when adding members to the MethodFamily |
14385 | 494 |
class StatefulMethodFamily : public ResourceObj { |
495 |
friend class StateRestorer; |
|
496 |
private: |
|
497 |
QualifiedState _qualification_state; |
|
498 |
||
499 |
void set_qualification_state(QualifiedState state) { |
|
500 |
_qualification_state = state; |
|
501 |
} |
|
502 |
||
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
503 |
protected: |
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
504 |
MethodFamily _method_family; |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
505 |
|
14385 | 506 |
public: |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
507 |
StatefulMethodFamily() { |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
508 |
_qualification_state = QUALIFIED; |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
509 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
510 |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
511 |
void set_target_if_empty(Method* m) { _method_family.set_target_if_empty(m); } |
14385 | 512 |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
513 |
MethodFamily* get_method_family() { return &_method_family; } |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
514 |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
515 |
void record_method_and_dq_further(StateRestorerScope* scope, Method* mo); |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
516 |
}; |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
517 |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
518 |
// Because we use an iterative algorithm when iterating over the type |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
519 |
// hierarchy, we can't use traditional scoped objects which automatically do |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
520 |
// cleanup in the destructor when the scope is exited. StateRestorerScope (and |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
521 |
// StateRestorer) provides a similar functionality, but for when you want a |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
522 |
// scoped object in non-stack memory (such as in resource memory, as we do |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
523 |
// here). You've just got to remember to call 'restore_state()' on the scope when |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
524 |
// leaving it (and marks have to be explicitly added). The scope is reusable after |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
525 |
// 'restore_state()' has been called. |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
526 |
class StateRestorer : public ResourceObj { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
527 |
public: |
14385 | 528 |
StatefulMethodFamily* _method; |
529 |
QualifiedState _state_to_restore; |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
530 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
531 |
StateRestorer() : _method(NULL), _state_to_restore(DISQUALIFIED) {} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
532 |
|
14385 | 533 |
void restore_state() { _method->set_qualification_state(_state_to_restore); } |
534 |
}; |
|
535 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
536 |
class StateRestorerScope : public ResourceObj { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
537 |
private: |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
538 |
GrowableArray<StateRestorer*> _marks; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
539 |
GrowableArray<StateRestorer*>* _free_list; // Shared between scopes |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
540 |
public: |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
541 |
StateRestorerScope(GrowableArray<StateRestorer*>* free_list) : _marks(), _free_list(free_list) {} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
542 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
543 |
static StateRestorerScope* cast(void* data) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
544 |
return static_cast<StateRestorerScope*>(data); |
14385 | 545 |
} |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
546 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
547 |
void mark(StatefulMethodFamily* family, QualifiedState qualification_state) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
548 |
StateRestorer* restorer; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
549 |
if (!_free_list->is_empty()) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
550 |
restorer = _free_list->pop(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
551 |
} else { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
552 |
restorer = new StateRestorer(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
553 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
554 |
restorer->_method = family; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
555 |
restorer->_state_to_restore = qualification_state; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
556 |
_marks.append(restorer); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
557 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
558 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
559 |
#ifdef ASSERT |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
560 |
bool is_empty() { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
561 |
return _marks.is_empty(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
562 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
563 |
#endif |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
564 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
565 |
void restore_state() { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
566 |
while(!_marks.is_empty()) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
567 |
StateRestorer* restorer = _marks.pop(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
568 |
restorer->restore_state(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
569 |
_free_list->push(restorer); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
570 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
571 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
572 |
}; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
573 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
574 |
void StatefulMethodFamily::record_method_and_dq_further(StateRestorerScope* scope, Method* mo) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
575 |
scope->mark(this, _qualification_state); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
576 |
_method_family.record_method(mo, _qualification_state); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
577 |
|
14385 | 578 |
// Everything found "above"??? this method in the hierarchy walk is set to |
579 |
// disqualified |
|
580 |
set_qualification_state(DISQUALIFIED); |
|
581 |
} |
|
582 |
||
583 |
// Represents a location corresponding to a vtable slot for methods that |
|
584 |
// neither the class nor any of it's ancestors provide an implementaion. |
|
585 |
// Default methods may be present to fill this slot. |
|
586 |
class EmptyVtableSlot : public ResourceObj { |
|
587 |
private: |
|
588 |
Symbol* _name; |
|
589 |
Symbol* _signature; |
|
590 |
int _size_of_parameters; |
|
591 |
MethodFamily* _binding; |
|
592 |
||
593 |
public: |
|
594 |
EmptyVtableSlot(Method* method) |
|
595 |
: _name(method->name()), _signature(method->signature()), |
|
596 |
_size_of_parameters(method->size_of_parameters()), _binding(NULL) {} |
|
597 |
||
598 |
Symbol* name() const { return _name; } |
|
599 |
Symbol* signature() const { return _signature; } |
|
600 |
int size_of_parameters() const { return _size_of_parameters; } |
|
601 |
||
602 |
void bind_family(MethodFamily* lm) { _binding = lm; } |
|
603 |
bool is_bound() { return _binding != NULL; } |
|
604 |
MethodFamily* get_binding() { return _binding; } |
|
605 |
||
606 |
void print_on(outputStream* str) const { |
|
607 |
print_slot(str, name(), signature()); |
|
608 |
} |
|
609 |
}; |
|
610 |
||
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
611 |
static bool already_in_vtable_slots(GrowableArray<EmptyVtableSlot*>* slots, Method* m) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
612 |
bool found = false; |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
613 |
for (int j = 0; j < slots->length(); ++j) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
614 |
if (slots->at(j)->name() == m->name() && |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
615 |
slots->at(j)->signature() == m->signature() ) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
616 |
found = true; |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
617 |
break; |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
618 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
619 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
620 |
return found; |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
621 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
622 |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
623 |
static void find_empty_vtable_slots(GrowableArray<EmptyVtableSlot*>* slots, |
34666 | 624 |
InstanceKlass* klass, const GrowableArray<Method*>* mirandas, TRAPS) { |
14385 | 625 |
|
626 |
assert(klass != NULL, "Must be valid class"); |
|
627 |
||
628 |
// All miranda methods are obvious candidates |
|
629 |
for (int i = 0; i < mirandas->length(); ++i) { |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
630 |
Method* m = mirandas->at(i); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
631 |
if (!already_in_vtable_slots(slots, m)) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
632 |
slots->append(new EmptyVtableSlot(m)); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
633 |
} |
14385 | 634 |
} |
635 |
||
636 |
// Also any overpasses in our superclasses, that we haven't implemented. |
|
637 |
// (can't use the vtable because it is not guaranteed to be initialized yet) |
|
638 |
InstanceKlass* super = klass->java_super(); |
|
639 |
while (super != NULL) { |
|
640 |
for (int i = 0; i < super->methods()->length(); ++i) { |
|
641 |
Method* m = super->methods()->at(i); |
|
21913
0e2fd7282ac6
8028438: static superclass method masks default methods
acorn
parents:
21556
diff
changeset
|
642 |
if (m->is_overpass() || m->is_static()) { |
14385 | 643 |
// m is a method that would have been a miranda if not for the |
644 |
// default method processing that occurred on behalf of our superclass, |
|
645 |
// so it's a method we want to re-examine in this new context. That is, |
|
646 |
// unless we have a real implementation of it in the current class. |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
647 |
if (!already_in_vtable_slots(slots, m)) { |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
648 |
Method *impl = klass->lookup_method(m->name(), m->signature()); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
649 |
if (impl == NULL || impl->is_overpass() || impl->is_static()) { |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
650 |
slots->append(new EmptyVtableSlot(m)); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
651 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
652 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
653 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
654 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
655 |
|
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
656 |
// also any default methods in our superclasses |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
657 |
if (super->default_methods() != NULL) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
658 |
for (int i = 0; i < super->default_methods()->length(); ++i) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
659 |
Method* m = super->default_methods()->at(i); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
660 |
// m is a method that would have been a miranda if not for the |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
661 |
// default method processing that occurred on behalf of our superclass, |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
662 |
// so it's a method we want to re-examine in this new context. That is, |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
663 |
// unless we have a real implementation of it in the current class. |
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
664 |
if (!already_in_vtable_slots(slots, m)) { |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
665 |
Method* impl = klass->lookup_method(m->name(), m->signature()); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
666 |
if (impl == NULL || impl->is_overpass() || impl->is_static()) { |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
667 |
slots->append(new EmptyVtableSlot(m)); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
668 |
} |
14385 | 669 |
} |
670 |
} |
|
671 |
} |
|
672 |
super = super->java_super(); |
|
673 |
} |
|
674 |
||
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
675 |
LogTarget(Debug, defaultmethods) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
676 |
if (lt.is_enabled()) { |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
677 |
lt.print("Slots that need filling:"); |
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
678 |
ResourceMark rm; |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
679 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
680 |
streamIndentor si(&ls); |
14385 | 681 |
for (int i = 0; i < slots->length(); ++i) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
682 |
ls.indent(); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
683 |
slots->at(i)->print_on(&ls); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
684 |
ls.cr(); |
14385 | 685 |
} |
686 |
} |
|
687 |
} |
|
688 |
||
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
689 |
// Iterates over the superinterface type hierarchy looking for all methods |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
690 |
// with a specific erased signature. |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
691 |
class FindMethodsByErasedSig : public HierarchyVisitor<FindMethodsByErasedSig> { |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
692 |
private: |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
693 |
// Context data |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
694 |
Symbol* _method_name; |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
695 |
Symbol* _method_signature; |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
696 |
StatefulMethodFamily* _family; |
48463
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
697 |
bool _cur_class_is_interface; |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
698 |
// Free lists, used as an optimization |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
699 |
GrowableArray<StateRestorerScope*> _free_scopes; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
700 |
GrowableArray<StateRestorer*> _free_restorers; |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
701 |
public: |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
702 |
FindMethodsByErasedSig() : _free_scopes(6), _free_restorers(6) {}; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
703 |
|
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
704 |
void prepare(Symbol* name, Symbol* signature, bool is_interf) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
705 |
reset(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
706 |
_method_name = name; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
707 |
_method_signature = signature; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
708 |
_family = NULL; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
709 |
_cur_class_is_interface = is_interf; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
710 |
} |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
711 |
|
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
712 |
void get_discovered_family(MethodFamily** family) { |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
713 |
if (_family != NULL) { |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
714 |
*family = _family->get_method_family(); |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
715 |
} else { |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
716 |
*family = NULL; |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
717 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
718 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
719 |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
720 |
void* new_node_data() { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
721 |
if (!_free_scopes.is_empty()) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
722 |
StateRestorerScope* free_scope = _free_scopes.pop(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
723 |
assert(free_scope->is_empty(), "StateRestorerScope::_marks array not empty"); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
724 |
return free_scope; |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
725 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
726 |
return new StateRestorerScope(&_free_restorers); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
727 |
} |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
728 |
void free_node_data(void* node_data) { |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
729 |
StateRestorerScope* scope = StateRestorerScope::cast(node_data); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
730 |
scope->restore_state(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
731 |
// Reuse scopes |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
732 |
_free_scopes.push(scope); |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
733 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
734 |
|
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
735 |
// Find all methods on this hierarchy that match this |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
736 |
// method's erased (name, signature) |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
737 |
bool visit() { |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
738 |
StateRestorerScope* scope = StateRestorerScope::cast(current_data()); |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
739 |
InstanceKlass* iklass = current_class(); |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
740 |
|
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
741 |
Method* m = iklass->find_method(_method_name, _method_signature); |
48463
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
742 |
// Private interface methods are not candidates for default methods. |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
743 |
// invokespecial to private interface methods doesn't use default method logic. |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
744 |
// Private class methods are not candidates for default methods. |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
745 |
// Private methods do not override default methods, so need to perform |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
746 |
// default method inheritance without including private methods. |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
747 |
// The overpasses are your supertypes' errors, we do not include them. |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
748 |
// Non-public methods in java.lang.Object are not candidates for default |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
749 |
// methods. |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
750 |
// Future: take access controls into account for superclass methods |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
751 |
if (m != NULL && !m->is_static() && !m->is_overpass() && !m->is_private() && |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
752 |
(!_cur_class_is_interface || !SystemDictionary::is_nonpublic_Object_method(m))) { |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
753 |
if (_family == NULL) { |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
754 |
_family = new StatefulMethodFamily(); |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
755 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
756 |
|
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
757 |
if (iklass->is_interface()) { |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
758 |
_family->record_method_and_dq_further(scope, m); |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
759 |
} else { |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
760 |
// This is the rule that methods in classes "win" (bad word) over |
48463
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
761 |
// methods in interfaces. This works because of single inheritance. |
474cec233fb2
8154587: Resolution fails for default method named 'clone'
hseigel
parents:
47554
diff
changeset
|
762 |
// Private methods in classes do not "win", they will be found |
29871 | 763 |
// first on searching, but overriding for invokevirtual needs |
764 |
// to find default method candidates for the same signature |
|
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
765 |
_family->set_target_if_empty(m); |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
766 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
767 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
768 |
return true; |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
769 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
770 |
|
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
771 |
}; |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
772 |
|
14385 | 773 |
|
774 |
||
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
775 |
static void create_defaults_and_exceptions( |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
776 |
GrowableArray<EmptyVtableSlot*>* slots, InstanceKlass* klass, TRAPS); |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
777 |
|
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
778 |
static void generate_erased_defaults( |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
779 |
FindMethodsByErasedSig* visitor, |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
780 |
InstanceKlass* klass, EmptyVtableSlot* slot, bool is_intf, TRAPS) { |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
781 |
|
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
782 |
// the visitor needs to be initialized or re-initialized before use |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
783 |
// - this facilitates reusing the same visitor instance on multiple |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
784 |
// generation passes as an optimization |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
785 |
visitor->prepare(slot->name(), slot->signature(), is_intf); |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
786 |
// sets up a set of methods with the same exact erased signature |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
787 |
visitor->run(klass); |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
788 |
|
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
789 |
MethodFamily* family; |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
790 |
visitor->get_discovered_family(&family); |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
791 |
if (family != NULL) { |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
792 |
family->determine_target_or_set_exception_message(klass, CHECK); |
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
793 |
slot->bind_family(family); |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
794 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
795 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
796 |
|
14385 | 797 |
static void merge_in_new_methods(InstanceKlass* klass, |
798 |
GrowableArray<Method*>* new_methods, TRAPS); |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
799 |
static void create_default_methods( InstanceKlass* klass, |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
800 |
GrowableArray<Method*>* new_methods, TRAPS); |
14385 | 801 |
|
802 |
// This is the guts of the default methods implementation. This is called just |
|
803 |
// after the classfile has been parsed if some ancestor has default methods. |
|
804 |
// |
|
47554
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
805 |
// First it finds any name/signature slots that need any implementation (either |
14385 | 806 |
// because they are miranda or a superclass's implementation is an overpass |
19681
1b35da7b1d85
8012294: remove generic handling for default methods
acorn
parents:
18695
diff
changeset
|
807 |
// itself). For each slot, iterate over the hierarchy, to see if they contain a |
1b35da7b1d85
8012294: remove generic handling for default methods
acorn
parents:
18695
diff
changeset
|
808 |
// signature that matches the slot we are looking at. |
14385 | 809 |
// |
47554
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
810 |
// For each slot filled, we either record the default method candidate in the |
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
811 |
// klass default_methods list or, only to handle exception cases, we create an |
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
812 |
// overpass method that throws an exception and add it to the klass methods list. |
19681
1b35da7b1d85
8012294: remove generic handling for default methods
acorn
parents:
18695
diff
changeset
|
813 |
// The JVM does not create bridges nor handle generic signatures here. |
14385 | 814 |
void DefaultMethods::generate_default_methods( |
34666 | 815 |
InstanceKlass* klass, const GrowableArray<Method*>* mirandas, TRAPS) { |
816 |
assert(klass != NULL, "invariant"); |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
817 |
assert(klass != SystemDictionary::Object_klass(), "Shouldn't be called for Object"); |
14385 | 818 |
|
819 |
// This resource mark is the bound for all memory allocation that takes |
|
820 |
// place during default method processing. After this goes out of scope, |
|
821 |
// all (Resource) objects' memory will be reclaimed. Be careful if adding an |
|
822 |
// embedded resource mark under here as that memory can't be used outside |
|
823 |
// whatever scope it's in. |
|
824 |
ResourceMark rm(THREAD); |
|
825 |
||
826 |
// Keep entire hierarchy alive for the duration of the computation |
|
34666 | 827 |
constantPoolHandle cp(THREAD, klass->constants()); |
14385 | 828 |
KeepAliveRegistrar keepAlive(THREAD); |
829 |
KeepAliveVisitor loadKeepAlive(&keepAlive); |
|
830 |
loadKeepAlive.run(klass); |
|
831 |
||
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
832 |
LogTarget(Debug, defaultmethods) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
833 |
if (lt.is_enabled()) { |
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
834 |
ResourceMark rm; |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
835 |
lt.print("%s %s requires default method processing", |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
836 |
klass->is_interface() ? "Interface" : "Class", |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
837 |
klass->name()->as_klass_external_name()); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
838 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
839 |
PrintHierarchy printer(&ls); |
14385 | 840 |
printer.run(klass); |
841 |
} |
|
842 |
||
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
843 |
GrowableArray<EmptyVtableSlot*> empty_slots; |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
844 |
find_empty_vtable_slots(&empty_slots, klass, mirandas, CHECK); |
14385 | 845 |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
846 |
if (empty_slots.length() > 0) { |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
847 |
FindMethodsByErasedSig findMethodsByErasedSig; |
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
848 |
for (int i = 0; i < empty_slots.length(); ++i) { |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
849 |
EmptyVtableSlot* slot = empty_slots.at(i); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
850 |
LogTarget(Debug, defaultmethods) lt; |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
851 |
if (lt.is_enabled()) { |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
852 |
LogStream ls(lt); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
853 |
streamIndentor si(&ls, 2); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
854 |
ls.indent().print("Looking for default methods for slot "); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
855 |
slot->print_on(&ls); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
856 |
ls.cr(); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
857 |
} |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
858 |
generate_erased_defaults(&findMethodsByErasedSig, klass, slot, klass->is_interface(), CHECK); |
14385 | 859 |
} |
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
860 |
log_debug(defaultmethods)("Creating defaults and overpasses..."); |
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
861 |
create_defaults_and_exceptions(&empty_slots, klass, CHECK); |
14385 | 862 |
} |
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
863 |
log_debug(defaultmethods)("Default method processing complete"); |
14385 | 864 |
} |
865 |
||
20284
595a25ab9474
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
19966
diff
changeset
|
866 |
static int assemble_method_error( |
595a25ab9474
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
19966
diff
changeset
|
867 |
BytecodeConstantPool* cp, BytecodeBuffer* buffer, Symbol* errorName, Symbol* message, TRAPS) { |
14385 | 868 |
|
869 |
Symbol* init = vmSymbols::object_initializer_name(); |
|
870 |
Symbol* sig = vmSymbols::string_void_signature(); |
|
871 |
||
872 |
BytecodeAssembler assem(buffer, cp); |
|
873 |
||
874 |
assem._new(errorName); |
|
875 |
assem.dup(); |
|
876 |
assem.load_string(message); |
|
877 |
assem.invokespecial(errorName, init, sig); |
|
878 |
assem.athrow(); |
|
879 |
||
880 |
return 3; // max stack size: [ exception, exception, string ] |
|
881 |
} |
|
882 |
||
883 |
static Method* new_method( |
|
884 |
BytecodeConstantPool* cp, BytecodeBuffer* bytecodes, Symbol* name, |
|
885 |
Symbol* sig, AccessFlags flags, int max_stack, int params, |
|
886 |
ConstMethod::MethodType mt, TRAPS) { |
|
887 |
||
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
888 |
address code_start = 0; |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
889 |
int code_length = 0; |
15601 | 890 |
InlineTableSizes sizes; |
14385 | 891 |
|
18695
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
892 |
if (bytecodes != NULL && bytecodes->length() > 0) { |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
893 |
code_start = static_cast<address>(bytecodes->adr_at(0)); |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
894 |
code_length = bytecodes->length(); |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
895 |
} |
be902722fe0a
8013635: VM should no longer create bridges for generic signatures.
acorn
parents:
17859
diff
changeset
|
896 |
|
14385 | 897 |
Method* m = Method::allocate(cp->pool_holder()->class_loader_data(), |
15601 | 898 |
code_length, flags, &sizes, |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
14586
diff
changeset
|
899 |
mt, CHECK_NULL); |
14385 | 900 |
|
901 |
m->set_constants(NULL); // This will get filled in later |
|
902 |
m->set_name_index(cp->utf8(name)); |
|
903 |
m->set_signature_index(cp->utf8(sig)); |
|
904 |
ResultTypeFinder rtf(sig); |
|
37480 | 905 |
m->constMethod()->set_result_type(rtf.type()); |
14385 | 906 |
m->set_size_of_parameters(params); |
907 |
m->set_max_stack(max_stack); |
|
908 |
m->set_max_locals(params); |
|
909 |
m->constMethod()->set_stackmap_data(NULL); |
|
910 |
m->set_code(code_start); |
|
911 |
||
912 |
return m; |
|
913 |
} |
|
914 |
||
915 |
static void switchover_constant_pool(BytecodeConstantPool* bpool, |
|
916 |
InstanceKlass* klass, GrowableArray<Method*>* new_methods, TRAPS) { |
|
917 |
||
918 |
if (new_methods->length() > 0) { |
|
919 |
ConstantPool* cp = bpool->create_constant_pool(CHECK); |
|
920 |
if (cp != klass->constants()) { |
|
49677 | 921 |
// Copy resolved anonymous class into new constant pool. |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51334
diff
changeset
|
922 |
if (klass->is_unsafe_anonymous()) { |
49677 | 923 |
cp->klass_at_put(klass->this_class_index(), klass); |
924 |
} |
|
14385 | 925 |
klass->class_loader_data()->add_to_deallocate_list(klass->constants()); |
926 |
klass->set_constants(cp); |
|
927 |
cp->set_pool_holder(klass); |
|
928 |
||
929 |
for (int i = 0; i < new_methods->length(); ++i) { |
|
930 |
new_methods->at(i)->set_constants(cp); |
|
931 |
} |
|
932 |
for (int i = 0; i < klass->methods()->length(); ++i) { |
|
933 |
Method* mo = klass->methods()->at(i); |
|
934 |
mo->set_constants(cp); |
|
935 |
} |
|
936 |
} |
|
937 |
} |
|
938 |
} |
|
939 |
||
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
940 |
// Create default_methods list for the current class. |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
941 |
// With the VM only processing erased signatures, the VM only |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
942 |
// creates an overpass in a conflict case or a case with no candidates. |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
943 |
// This allows virtual methods to override the overpass, but ensures |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
944 |
// that a local method search will find the exception rather than an abstract |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
945 |
// or default method that is not a valid candidate. |
47554
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
946 |
// |
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
947 |
// Note that if overpass method are ever created that are not exception |
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
948 |
// throwing methods then the loader constraint checking logic for vtable and |
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
949 |
// itable creation needs to be changed to check loader constraints for the |
bc112140e089
8186092: Unnecessary loader constraints produced when there are multiple defaults
hseigel
parents:
47216
diff
changeset
|
950 |
// overpass methods that do not throw exceptions. |
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
951 |
static void create_defaults_and_exceptions(GrowableArray<EmptyVtableSlot*>* slots, |
14385 | 952 |
InstanceKlass* klass, TRAPS) { |
953 |
||
954 |
GrowableArray<Method*> overpasses; |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
955 |
GrowableArray<Method*> defaults; |
14385 | 956 |
BytecodeConstantPool bpool(klass->constants()); |
957 |
||
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
958 |
BytecodeBuffer* buffer = NULL; // Lazily create a reusable buffer |
14385 | 959 |
for (int i = 0; i < slots->length(); ++i) { |
960 |
EmptyVtableSlot* slot = slots->at(i); |
|
961 |
||
962 |
if (slot->is_bound()) { |
|
963 |
MethodFamily* method = slot->get_binding(); |
|
964 |
||
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
965 |
LogTarget(Debug, defaultmethods) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
966 |
if (lt.is_enabled()) { |
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
37480
diff
changeset
|
967 |
ResourceMark rm(THREAD); |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
968 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
969 |
ls.print("for slot: "); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
970 |
slot->print_on(&ls); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
971 |
ls.cr(); |
14385 | 972 |
if (method->has_target()) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
973 |
method->print_selected(&ls, 1); |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
974 |
} else if (method->throws_exception()) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
42059
diff
changeset
|
975 |
method->print_exception(&ls, 1); |
14385 | 976 |
} |
977 |
} |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
978 |
|
14385 | 979 |
if (method->has_target()) { |
980 |
Method* selected = method->get_selected_target(); |
|
19966
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
981 |
if (selected->method_holder()->is_interface()) { |
41669
2091069b6851
8081800: AbstractMethodError when evaluating a private method in an interface via debugger
dholmes
parents:
37480
diff
changeset
|
982 |
assert(!selected->is_private(), "pushing private interface method as default"); |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
983 |
defaults.push(selected); |
19966
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
984 |
} |
14385 | 985 |
} else if (method->throws_exception()) { |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
986 |
if (buffer == NULL) { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
987 |
buffer = new BytecodeBuffer(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
988 |
} else { |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
989 |
buffer->clear(); |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
990 |
} |
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
991 |
int max_stack = assemble_method_error(&bpool, buffer, |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
992 |
method->get_exception_name(), method->get_exception_message(), CHECK); |
19966
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
993 |
AccessFlags flags = accessFlags_from( |
14385 | 994 |
JVM_ACC_PUBLIC | JVM_ACC_SYNTHETIC | JVM_ACC_BRIDGE); |
59140
f68fd04fe463
8233497: Optimize default method generation by data structure reuse
redestad
parents:
58760
diff
changeset
|
995 |
Method* m = new_method(&bpool, buffer, slot->name(), slot->signature(), |
14385 | 996 |
flags, max_stack, slot->size_of_parameters(), |
997 |
ConstMethod::OVERPASS, CHECK); |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
998 |
// We push to the methods list: |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
999 |
// overpass methods which are exception throwing methods |
19966
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
1000 |
if (m != NULL) { |
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
1001 |
overpasses.push(m); |
64732b96b5f5
8024647: Default method resolution with private superclass method
acorn
parents:
19690
diff
changeset
|
1002 |
} |
14385 | 1003 |
} |
1004 |
} |
|
1005 |
} |
|
1006 |
||
33736
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
1007 |
|
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
1008 |
log_debug(defaultmethods)("Created %d overpass methods", overpasses.length()); |
1b3950243443
8139564: Convert TraceDefaultMethods to Unified Logging
rprotacio
parents:
29871
diff
changeset
|
1009 |
log_debug(defaultmethods)("Created %d default methods", defaults.length()); |
14385 | 1010 |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1011 |
if (overpasses.length() > 0) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1012 |
switchover_constant_pool(&bpool, klass, &overpasses, CHECK); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1013 |
merge_in_new_methods(klass, &overpasses, CHECK); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1014 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1015 |
if (defaults.length() > 0) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1016 |
create_default_methods(klass, &defaults, CHECK); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1017 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1018 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1019 |
|
54013
c5cf23055fcb
8219713: Reduce work in DefaultMethods::generate_default_methods
redestad
parents:
53432
diff
changeset
|
1020 |
static void create_default_methods(InstanceKlass* klass, |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1021 |
GrowableArray<Method*>* new_methods, TRAPS) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1022 |
|
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1023 |
int new_size = new_methods->length(); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1024 |
Array<Method*>* total_default_methods = MetadataFactory::new_array<Method*>( |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1025 |
klass->class_loader_data(), new_size, NULL, CHECK); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1026 |
for (int index = 0; index < new_size; index++ ) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1027 |
total_default_methods->at_put(index, new_methods->at(index)); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1028 |
} |
53432
1ec56532ae0c
8217424: Remove the idempotent parameter to Method::sort_methods
iklam
parents:
51444
diff
changeset
|
1029 |
Method::sort_methods(total_default_methods, /*set_idnums=*/false); |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1030 |
|
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20300
diff
changeset
|
1031 |
klass->set_default_methods(total_default_methods); |
14385 | 1032 |
} |
1033 |
||
1034 |
static void sort_methods(GrowableArray<Method*>* methods) { |
|
1035 |
// Note that this must sort using the same key as is used for sorting |
|
1036 |
// methods in InstanceKlass. |
|
1037 |
bool sorted = true; |
|
1038 |
for (int i = methods->length() - 1; i > 0; --i) { |
|
1039 |
for (int j = 0; j < i; ++j) { |
|
1040 |
Method* m1 = methods->at(j); |
|
1041 |
Method* m2 = methods->at(j + 1); |
|
1042 |
if ((uintptr_t)m1->name() > (uintptr_t)m2->name()) { |
|
1043 |
methods->at_put(j, m2); |
|
1044 |
methods->at_put(j + 1, m1); |
|
1045 |
sorted = false; |
|
1046 |
} |
|
1047 |
} |
|
1048 |
if (sorted) break; |
|
1049 |
sorted = true; |
|
1050 |
} |
|
1051 |
#ifdef ASSERT |
|
1052 |
uintptr_t prev = 0; |
|
1053 |
for (int i = 0; i < methods->length(); ++i) { |
|
1054 |
Method* mh = methods->at(i); |
|
1055 |
uintptr_t nv = (uintptr_t)mh->name(); |
|
1056 |
assert(nv >= prev, "Incorrect overpass method ordering"); |
|
1057 |
prev = nv; |
|
1058 |
} |
|
1059 |
#endif |
|
1060 |
} |
|
1061 |
||
1062 |
static void merge_in_new_methods(InstanceKlass* klass, |
|
1063 |
GrowableArray<Method*>* new_methods, TRAPS) { |
|
1064 |
||
1065 |
enum { ANNOTATIONS, PARAMETERS, DEFAULTS, NUM_ARRAYS }; |
|
1066 |
||
1067 |
Array<Method*>* original_methods = klass->methods(); |
|
1068 |
Array<int>* original_ordering = klass->method_ordering(); |
|
1069 |
Array<int>* merged_ordering = Universe::the_empty_int_array(); |
|
1070 |
||
1071 |
int new_size = klass->methods()->length() + new_methods->length(); |
|
1072 |
||
1073 |
Array<Method*>* merged_methods = MetadataFactory::new_array<Method*>( |
|
1074 |
klass->class_loader_data(), new_size, NULL, CHECK); |
|
15601 | 1075 |
|
22233
f0028de67b30
8030633: nsk/jvmti/RedefineClasses/StressRedefine failed invalid method ordering length on Solaris
coleenp
parents:
22232
diff
changeset
|
1076 |
// original_ordering might be empty if this class has no methods of its own |
58689
72e605a88500
8232030: HelloDynamic.java fails with latest Graal
ccheung
parents:
54847
diff
changeset
|
1077 |
if (JvmtiExport::can_maintain_original_method_order() || Arguments::is_dumping_archive()) { |
14385 | 1078 |
merged_ordering = MetadataFactory::new_array<int>( |
1079 |
klass->class_loader_data(), new_size, CHECK); |
|
1080 |
} |
|
1081 |
int method_order_index = klass->methods()->length(); |
|
1082 |
||
1083 |
sort_methods(new_methods); |
|
1084 |
||
1085 |
// Perform grand merge of existing methods and new methods |
|
1086 |
int orig_idx = 0; |
|
1087 |
int new_idx = 0; |
|
1088 |
||
1089 |
for (int i = 0; i < new_size; ++i) { |
|
1090 |
Method* orig_method = NULL; |
|
1091 |
Method* new_method = NULL; |
|
1092 |
if (orig_idx < original_methods->length()) { |
|
1093 |
orig_method = original_methods->at(orig_idx); |
|
1094 |
} |
|
1095 |
if (new_idx < new_methods->length()) { |
|
1096 |
new_method = new_methods->at(new_idx); |
|
1097 |
} |
|
1098 |
||
1099 |
if (orig_method != NULL && |
|
1100 |
(new_method == NULL || orig_method->name() < new_method->name())) { |
|
1101 |
merged_methods->at_put(i, orig_method); |
|
1102 |
original_methods->at_put(orig_idx, NULL); |
|
1103 |
if (merged_ordering->length() > 0) { |
|
22233
f0028de67b30
8030633: nsk/jvmti/RedefineClasses/StressRedefine failed invalid method ordering length on Solaris
coleenp
parents:
22232
diff
changeset
|
1104 |
assert(original_ordering != NULL && original_ordering->length() > 0, |
f0028de67b30
8030633: nsk/jvmti/RedefineClasses/StressRedefine failed invalid method ordering length on Solaris
coleenp
parents:
22232
diff
changeset
|
1105 |
"should have original order information for this method"); |
14385 | 1106 |
merged_ordering->at_put(i, original_ordering->at(orig_idx)); |
1107 |
} |
|
1108 |
++orig_idx; |
|
1109 |
} else { |
|
1110 |
merged_methods->at_put(i, new_method); |
|
1111 |
if (merged_ordering->length() > 0) { |
|
1112 |
merged_ordering->at_put(i, method_order_index++); |
|
1113 |
} |
|
1114 |
++new_idx; |
|
1115 |
} |
|
1116 |
// update idnum for new location |
|
1117 |
merged_methods->at(i)->set_method_idnum(i); |
|
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
27680
diff
changeset
|
1118 |
merged_methods->at(i)->set_orig_method_idnum(i); |
14385 | 1119 |
} |
1120 |
||
1121 |
// Verify correct order |
|
1122 |
#ifdef ASSERT |
|
1123 |
uintptr_t prev = 0; |
|
1124 |
for (int i = 0; i < merged_methods->length(); ++i) { |
|
1125 |
Method* mo = merged_methods->at(i); |
|
1126 |
uintptr_t nv = (uintptr_t)mo->name(); |
|
1127 |
assert(nv >= prev, "Incorrect method ordering"); |
|
1128 |
prev = nv; |
|
1129 |
} |
|
1130 |
#endif |
|
1131 |
||
1132 |
// Replace klass methods with new merged lists |
|
1133 |
klass->set_methods(merged_methods); |
|
17859
cda7f55ca4dc
8015436: compiler/ciReplay/TestSA.sh fails with assert() index is out of bounds
sspitsyn
parents:
16379
diff
changeset
|
1134 |
klass->set_initial_method_idnum(new_size); |
22233
f0028de67b30
8030633: nsk/jvmti/RedefineClasses/StressRedefine failed invalid method ordering length on Solaris
coleenp
parents:
22232
diff
changeset
|
1135 |
klass->set_method_ordering(merged_ordering); |
14385 | 1136 |
|
22233
f0028de67b30
8030633: nsk/jvmti/RedefineClasses/StressRedefine failed invalid method ordering length on Solaris
coleenp
parents:
22232
diff
changeset
|
1137 |
// Free metadata |
14385 | 1138 |
ClassLoaderData* cld = klass->class_loader_data(); |
22233
f0028de67b30
8030633: nsk/jvmti/RedefineClasses/StressRedefine failed invalid method ordering length on Solaris
coleenp
parents:
22232
diff
changeset
|
1139 |
if (original_methods->length() > 0) { |
21556
e75cd34a59e0
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
21516
diff
changeset
|
1140 |
MetadataFactory::free_array(cld, original_methods); |
e75cd34a59e0
8027229: ICCE expected for >=2 maximally specific default methods.
acorn
parents:
21516
diff
changeset
|
1141 |
} |
22233
f0028de67b30
8030633: nsk/jvmti/RedefineClasses/StressRedefine failed invalid method ordering length on Solaris
coleenp
parents:
22232
diff
changeset
|
1142 |
if (original_ordering != NULL && original_ordering->length() > 0) { |
14385 | 1143 |
MetadataFactory::free_array(cld, original_ordering); |
1144 |
} |
|
1145 |
} |