Thu, 26 Sep 2013 12:18:21 +0200
Merge
kamg@4245 | 1 | /* |
coleenp@4572 | 2 | * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. |
kamg@4245 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
kamg@4245 | 4 | * |
kamg@4245 | 5 | * This code is free software; you can redistribute it and/or modify it |
kamg@4245 | 6 | * under the terms of the GNU General Public License version 2 only, as |
kamg@4245 | 7 | * published by the Free Software Foundation. |
kamg@4245 | 8 | * |
kamg@4245 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
kamg@4245 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
kamg@4245 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
kamg@4245 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
kamg@4245 | 13 | * accompanied this code). |
kamg@4245 | 14 | * |
kamg@4245 | 15 | * You should have received a copy of the GNU General Public License version |
kamg@4245 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
kamg@4245 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
kamg@4245 | 18 | * |
kamg@4245 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
kamg@4245 | 20 | * or visit www.oracle.com if you need additional information or have any |
kamg@4245 | 21 | * questions. |
kamg@4245 | 22 | * |
kamg@4245 | 23 | */ |
kamg@4245 | 24 | |
kamg@4245 | 25 | #include "precompiled.hpp" |
kamg@4245 | 26 | #include "classfile/bytecodeAssembler.hpp" |
kamg@4245 | 27 | #include "classfile/defaultMethods.hpp" |
kamg@4245 | 28 | #include "classfile/symbolTable.hpp" |
kamg@4245 | 29 | #include "memory/allocation.hpp" |
kamg@4245 | 30 | #include "memory/metadataFactory.hpp" |
kamg@4245 | 31 | #include "memory/resourceArea.hpp" |
kamg@4245 | 32 | #include "runtime/signature.hpp" |
kamg@4245 | 33 | #include "runtime/thread.hpp" |
kamg@4245 | 34 | #include "oops/instanceKlass.hpp" |
kamg@4245 | 35 | #include "oops/klass.hpp" |
kamg@4245 | 36 | #include "oops/method.hpp" |
kamg@4245 | 37 | #include "utilities/accessFlags.hpp" |
kamg@4245 | 38 | #include "utilities/exceptions.hpp" |
kamg@4245 | 39 | #include "utilities/ostream.hpp" |
kamg@4245 | 40 | #include "utilities/pair.hpp" |
kamg@4245 | 41 | #include "utilities/resourceHash.hpp" |
kamg@4245 | 42 | |
kamg@4245 | 43 | typedef enum { QUALIFIED, DISQUALIFIED } QualifiedState; |
kamg@4245 | 44 | |
kamg@4245 | 45 | // Because we use an iterative algorithm when iterating over the type |
kamg@4245 | 46 | // hierarchy, we can't use traditional scoped objects which automatically do |
kamg@4245 | 47 | // cleanup in the destructor when the scope is exited. PseudoScope (and |
kamg@4245 | 48 | // PseudoScopeMark) provides a similar functionality, but for when you want a |
kamg@4245 | 49 | // scoped object in non-stack memory (such as in resource memory, as we do |
kamg@4245 | 50 | // here). You've just got to remember to call 'destroy()' on the scope when |
kamg@4245 | 51 | // leaving it (and marks have to be explicitly added). |
kamg@4245 | 52 | class PseudoScopeMark : public ResourceObj { |
kamg@4245 | 53 | public: |
kamg@4245 | 54 | virtual void destroy() = 0; |
kamg@4245 | 55 | }; |
kamg@4245 | 56 | |
kamg@4245 | 57 | class PseudoScope : public ResourceObj { |
kamg@4245 | 58 | private: |
kamg@4245 | 59 | GrowableArray<PseudoScopeMark*> _marks; |
kamg@4245 | 60 | public: |
kamg@4245 | 61 | |
kamg@4245 | 62 | static PseudoScope* cast(void* data) { |
kamg@4245 | 63 | return static_cast<PseudoScope*>(data); |
kamg@4245 | 64 | } |
kamg@4245 | 65 | |
kamg@4245 | 66 | void add_mark(PseudoScopeMark* psm) { |
kamg@4245 | 67 | _marks.append(psm); |
kamg@4245 | 68 | } |
kamg@4245 | 69 | |
kamg@4245 | 70 | void destroy() { |
kamg@4245 | 71 | for (int i = 0; i < _marks.length(); ++i) { |
kamg@4245 | 72 | _marks.at(i)->destroy(); |
kamg@4245 | 73 | } |
kamg@4245 | 74 | } |
kamg@4245 | 75 | }; |
kamg@4245 | 76 | |
kamg@4245 | 77 | #ifndef PRODUCT |
kamg@4245 | 78 | static void print_slot(outputStream* str, Symbol* name, Symbol* signature) { |
kamg@4245 | 79 | ResourceMark rm; |
kamg@4245 | 80 | str->print("%s%s", name->as_C_string(), signature->as_C_string()); |
kamg@4245 | 81 | } |
kamg@4245 | 82 | |
kamg@4245 | 83 | static void print_method(outputStream* str, Method* mo, bool with_class=true) { |
kamg@4245 | 84 | ResourceMark rm; |
kamg@4245 | 85 | if (with_class) { |
kamg@4245 | 86 | str->print("%s.", mo->klass_name()->as_C_string()); |
kamg@4245 | 87 | } |
kamg@4245 | 88 | print_slot(str, mo->name(), mo->signature()); |
kamg@4245 | 89 | } |
kamg@4245 | 90 | #endif // ndef PRODUCT |
kamg@4245 | 91 | |
kamg@4245 | 92 | /** |
kamg@4245 | 93 | * Perform a depth-first iteration over the class hierarchy, applying |
kamg@4245 | 94 | * algorithmic logic as it goes. |
kamg@4245 | 95 | * |
kamg@4245 | 96 | * This class is one half of the inheritance hierarchy analysis mechanism. |
kamg@4245 | 97 | * It is meant to be used in conjunction with another class, the algorithm, |
kamg@4245 | 98 | * which is indicated by the ALGO template parameter. This class can be |
kamg@4245 | 99 | * paired with any algorithm class that provides the required methods. |
kamg@4245 | 100 | * |
kamg@4245 | 101 | * This class contains all the mechanics for iterating over the class hierarchy |
kamg@4245 | 102 | * starting at a particular root, without recursing (thus limiting stack growth |
kamg@4245 | 103 | * from this point). It visits each superclass (if present) and superinterface |
kamg@4245 | 104 | * in a depth-first manner, with callbacks to the ALGO class as each class is |
kamg@4245 | 105 | * encountered (visit()), The algorithm can cut-off further exploration of a |
kamg@4245 | 106 | * particular branch by returning 'false' from a visit() call. |
kamg@4245 | 107 | * |
kamg@4245 | 108 | * The ALGO class, must provide a visit() method, which each of which will be |
kamg@4245 | 109 | * called once for each node in the inheritance tree during the iteration. In |
kamg@4245 | 110 | * addition, it can provide a memory block via new_node_data(InstanceKlass*), |
kamg@4245 | 111 | * which it can use for node-specific storage (and access via the |
kamg@4245 | 112 | * current_data() and data_at_depth(int) methods). |
kamg@4245 | 113 | * |
kamg@4245 | 114 | * Bare minimum needed to be an ALGO class: |
kamg@4245 | 115 | * class Algo : public HierarchyVisitor<Algo> { |
kamg@4245 | 116 | * void* new_node_data(InstanceKlass* cls) { return NULL; } |
kamg@4245 | 117 | * void free_node_data(void* data) { return; } |
kamg@4245 | 118 | * bool visit() { return true; } |
kamg@4245 | 119 | * }; |
kamg@4245 | 120 | */ |
kamg@4245 | 121 | template <class ALGO> |
kamg@4245 | 122 | class HierarchyVisitor : StackObj { |
kamg@4245 | 123 | private: |
kamg@4245 | 124 | |
kamg@4245 | 125 | class Node : public ResourceObj { |
kamg@4245 | 126 | public: |
kamg@4245 | 127 | InstanceKlass* _class; |
kamg@4245 | 128 | bool _super_was_visited; |
kamg@4245 | 129 | int _interface_index; |
kamg@4245 | 130 | void* _algorithm_data; |
kamg@4245 | 131 | |
kamg@4245 | 132 | Node(InstanceKlass* cls, void* data, bool visit_super) |
kamg@4245 | 133 | : _class(cls), _super_was_visited(!visit_super), |
kamg@4245 | 134 | _interface_index(0), _algorithm_data(data) {} |
kamg@4245 | 135 | |
kamg@4245 | 136 | int number_of_interfaces() { return _class->local_interfaces()->length(); } |
kamg@4245 | 137 | int interface_index() { return _interface_index; } |
kamg@4245 | 138 | void set_super_visited() { _super_was_visited = true; } |
kamg@4245 | 139 | void increment_visited_interface() { ++_interface_index; } |
kamg@4245 | 140 | void set_all_interfaces_visited() { |
kamg@4245 | 141 | _interface_index = number_of_interfaces(); |
kamg@4245 | 142 | } |
kamg@4245 | 143 | bool has_visited_super() { return _super_was_visited; } |
kamg@4245 | 144 | bool has_visited_all_interfaces() { |
kamg@4245 | 145 | return interface_index() >= number_of_interfaces(); |
kamg@4245 | 146 | } |
kamg@4245 | 147 | InstanceKlass* interface_at(int index) { |
kamg@4245 | 148 | return InstanceKlass::cast(_class->local_interfaces()->at(index)); |
kamg@4245 | 149 | } |
kamg@4245 | 150 | InstanceKlass* next_super() { return _class->java_super(); } |
kamg@4245 | 151 | InstanceKlass* next_interface() { |
kamg@4245 | 152 | return interface_at(interface_index()); |
kamg@4245 | 153 | } |
kamg@4245 | 154 | }; |
kamg@4245 | 155 | |
kamg@4245 | 156 | bool _cancelled; |
kamg@4245 | 157 | GrowableArray<Node*> _path; |
kamg@4245 | 158 | |
kamg@4245 | 159 | Node* current_top() const { return _path.top(); } |
kamg@4245 | 160 | bool has_more_nodes() const { return !_path.is_empty(); } |
kamg@4245 | 161 | void push(InstanceKlass* cls, void* data) { |
kamg@4245 | 162 | assert(cls != NULL, "Requires a valid instance class"); |
kamg@4245 | 163 | Node* node = new Node(cls, data, has_super(cls)); |
kamg@4245 | 164 | _path.push(node); |
kamg@4245 | 165 | } |
kamg@4245 | 166 | void pop() { _path.pop(); } |
kamg@4245 | 167 | |
kamg@4245 | 168 | void reset_iteration() { |
kamg@4245 | 169 | _cancelled = false; |
kamg@4245 | 170 | _path.clear(); |
kamg@4245 | 171 | } |
kamg@4245 | 172 | bool is_cancelled() const { return _cancelled; } |
kamg@4245 | 173 | |
kamg@4245 | 174 | static bool has_super(InstanceKlass* cls) { |
kamg@4245 | 175 | return cls->super() != NULL && !cls->is_interface(); |
kamg@4245 | 176 | } |
kamg@4245 | 177 | |
kamg@4245 | 178 | Node* node_at_depth(int i) const { |
kamg@4245 | 179 | return (i >= _path.length()) ? NULL : _path.at(_path.length() - i - 1); |
kamg@4245 | 180 | } |
kamg@4245 | 181 | |
kamg@4245 | 182 | protected: |
kamg@4245 | 183 | |
kamg@4245 | 184 | // Accessors available to the algorithm |
kamg@4245 | 185 | int current_depth() const { return _path.length() - 1; } |
kamg@4245 | 186 | |
kamg@4245 | 187 | InstanceKlass* class_at_depth(int i) { |
kamg@4245 | 188 | Node* n = node_at_depth(i); |
kamg@4245 | 189 | return n == NULL ? NULL : n->_class; |
kamg@4245 | 190 | } |
kamg@4245 | 191 | InstanceKlass* current_class() { return class_at_depth(0); } |
kamg@4245 | 192 | |
kamg@4245 | 193 | void* data_at_depth(int i) { |
kamg@4245 | 194 | Node* n = node_at_depth(i); |
kamg@4245 | 195 | return n == NULL ? NULL : n->_algorithm_data; |
kamg@4245 | 196 | } |
kamg@4245 | 197 | void* current_data() { return data_at_depth(0); } |
kamg@4245 | 198 | |
kamg@4245 | 199 | void cancel_iteration() { _cancelled = true; } |
kamg@4245 | 200 | |
kamg@4245 | 201 | public: |
kamg@4245 | 202 | |
kamg@4245 | 203 | void run(InstanceKlass* root) { |
kamg@4245 | 204 | ALGO* algo = static_cast<ALGO*>(this); |
kamg@4245 | 205 | |
kamg@4245 | 206 | reset_iteration(); |
kamg@4245 | 207 | |
kamg@4245 | 208 | void* algo_data = algo->new_node_data(root); |
kamg@4245 | 209 | push(root, algo_data); |
kamg@4245 | 210 | bool top_needs_visit = true; |
kamg@4245 | 211 | |
kamg@4245 | 212 | do { |
kamg@4245 | 213 | Node* top = current_top(); |
kamg@4245 | 214 | if (top_needs_visit) { |
kamg@4245 | 215 | if (algo->visit() == false) { |
kamg@4245 | 216 | // algorithm does not want to continue along this path. Arrange |
kamg@4245 | 217 | // it so that this state is immediately popped off the stack |
kamg@4245 | 218 | top->set_super_visited(); |
kamg@4245 | 219 | top->set_all_interfaces_visited(); |
kamg@4245 | 220 | } |
kamg@4245 | 221 | top_needs_visit = false; |
kamg@4245 | 222 | } |
kamg@4245 | 223 | |
kamg@4245 | 224 | if (top->has_visited_super() && top->has_visited_all_interfaces()) { |
kamg@4245 | 225 | algo->free_node_data(top->_algorithm_data); |
kamg@4245 | 226 | pop(); |
kamg@4245 | 227 | } else { |
kamg@4245 | 228 | InstanceKlass* next = NULL; |
kamg@4245 | 229 | if (top->has_visited_super() == false) { |
kamg@4245 | 230 | next = top->next_super(); |
kamg@4245 | 231 | top->set_super_visited(); |
kamg@4245 | 232 | } else { |
kamg@4245 | 233 | next = top->next_interface(); |
kamg@4245 | 234 | top->increment_visited_interface(); |
kamg@4245 | 235 | } |
kamg@4245 | 236 | assert(next != NULL, "Otherwise we shouldn't be here"); |
kamg@4245 | 237 | algo_data = algo->new_node_data(next); |
kamg@4245 | 238 | push(next, algo_data); |
kamg@4245 | 239 | top_needs_visit = true; |
kamg@4245 | 240 | } |
kamg@4245 | 241 | } while (!is_cancelled() && has_more_nodes()); |
kamg@4245 | 242 | } |
kamg@4245 | 243 | }; |
kamg@4245 | 244 | |
kamg@4245 | 245 | #ifndef PRODUCT |
kamg@4245 | 246 | class PrintHierarchy : public HierarchyVisitor<PrintHierarchy> { |
kamg@4245 | 247 | public: |
kamg@4245 | 248 | |
kamg@4245 | 249 | bool visit() { |
kamg@4245 | 250 | InstanceKlass* cls = current_class(); |
kamg@4245 | 251 | streamIndentor si(tty, current_depth() * 2); |
kamg@4245 | 252 | tty->indent().print_cr("%s", cls->name()->as_C_string()); |
kamg@4245 | 253 | return true; |
kamg@4245 | 254 | } |
kamg@4245 | 255 | |
kamg@4245 | 256 | void* new_node_data(InstanceKlass* cls) { return NULL; } |
kamg@4245 | 257 | void free_node_data(void* data) { return; } |
kamg@4245 | 258 | }; |
kamg@4245 | 259 | #endif // ndef PRODUCT |
kamg@4245 | 260 | |
kamg@4245 | 261 | // Used to register InstanceKlass objects and all related metadata structures |
kamg@4245 | 262 | // (Methods, ConstantPools) as "in-use" by the current thread so that they can't |
kamg@4245 | 263 | // be deallocated by class redefinition while we're using them. The classes are |
kamg@4245 | 264 | // de-registered when this goes out of scope. |
kamg@4245 | 265 | // |
kamg@4245 | 266 | // Once a class is registered, we need not bother with methodHandles or |
kamg@4245 | 267 | // constantPoolHandles for it's associated metadata. |
kamg@4245 | 268 | class KeepAliveRegistrar : public StackObj { |
kamg@4245 | 269 | private: |
kamg@4245 | 270 | Thread* _thread; |
kamg@4245 | 271 | GrowableArray<ConstantPool*> _keep_alive; |
kamg@4245 | 272 | |
kamg@4245 | 273 | public: |
kamg@4245 | 274 | KeepAliveRegistrar(Thread* thread) : _thread(thread), _keep_alive(20) { |
kamg@4245 | 275 | assert(thread == Thread::current(), "Must be current thread"); |
kamg@4245 | 276 | } |
kamg@4245 | 277 | |
kamg@4245 | 278 | ~KeepAliveRegistrar() { |
kamg@4245 | 279 | for (int i = _keep_alive.length() - 1; i >= 0; --i) { |
kamg@4245 | 280 | ConstantPool* cp = _keep_alive.at(i); |
kamg@4245 | 281 | int idx = _thread->metadata_handles()->find_from_end(cp); |
kamg@4245 | 282 | assert(idx > 0, "Must be in the list"); |
kamg@4245 | 283 | _thread->metadata_handles()->remove_at(idx); |
kamg@4245 | 284 | } |
kamg@4245 | 285 | } |
kamg@4245 | 286 | |
kamg@4245 | 287 | // Register a class as 'in-use' by the thread. It's fine to register a class |
kamg@4245 | 288 | // multiple times (though perhaps inefficient) |
kamg@4245 | 289 | void register_class(InstanceKlass* ik) { |
kamg@4245 | 290 | ConstantPool* cp = ik->constants(); |
kamg@4245 | 291 | _keep_alive.push(cp); |
kamg@4245 | 292 | _thread->metadata_handles()->push(cp); |
kamg@4245 | 293 | } |
kamg@4245 | 294 | }; |
kamg@4245 | 295 | |
kamg@4245 | 296 | class KeepAliveVisitor : public HierarchyVisitor<KeepAliveVisitor> { |
kamg@4245 | 297 | private: |
kamg@4245 | 298 | KeepAliveRegistrar* _registrar; |
kamg@4245 | 299 | |
kamg@4245 | 300 | public: |
kamg@4245 | 301 | KeepAliveVisitor(KeepAliveRegistrar* registrar) : _registrar(registrar) {} |
kamg@4245 | 302 | |
kamg@4245 | 303 | void* new_node_data(InstanceKlass* cls) { return NULL; } |
kamg@4245 | 304 | void free_node_data(void* data) { return; } |
kamg@4245 | 305 | |
kamg@4245 | 306 | bool visit() { |
kamg@4245 | 307 | _registrar->register_class(current_class()); |
kamg@4245 | 308 | return true; |
kamg@4245 | 309 | } |
kamg@4245 | 310 | }; |
kamg@4245 | 311 | |
acorn@5377 | 312 | |
kamg@4245 | 313 | // A method family contains a set of all methods that implement a single |
acorn@5377 | 314 | // erased method. As members of the set are collected while walking over the |
kamg@4245 | 315 | // hierarchy, they are tagged with a qualification state. The qualification |
kamg@4245 | 316 | // state for an erased method is set to disqualified if there exists a path |
kamg@4245 | 317 | // from the root of hierarchy to the method that contains an interleaving |
acorn@5377 | 318 | // erased method defined in an interface. |
acorn@5377 | 319 | |
kamg@4245 | 320 | class MethodFamily : public ResourceObj { |
kamg@4245 | 321 | private: |
kamg@4245 | 322 | |
kamg@4245 | 323 | GrowableArray<Pair<Method*,QualifiedState> > _members; |
kamg@4245 | 324 | ResourceHashtable<Method*, int> _member_index; |
kamg@4245 | 325 | |
kamg@4245 | 326 | Method* _selected_target; // Filled in later, if a unique target exists |
kamg@4245 | 327 | Symbol* _exception_message; // If no unique target is found |
kamg@4245 | 328 | |
kamg@4245 | 329 | bool contains_method(Method* method) { |
kamg@4245 | 330 | int* lookup = _member_index.get(method); |
kamg@4245 | 331 | return lookup != NULL; |
kamg@4245 | 332 | } |
kamg@4245 | 333 | |
kamg@4245 | 334 | void add_method(Method* method, QualifiedState state) { |
kamg@4245 | 335 | Pair<Method*,QualifiedState> entry(method, state); |
kamg@4245 | 336 | _member_index.put(method, _members.length()); |
kamg@4245 | 337 | _members.append(entry); |
kamg@4245 | 338 | } |
kamg@4245 | 339 | |
kamg@4245 | 340 | void disqualify_method(Method* method) { |
kamg@4245 | 341 | int* index = _member_index.get(method); |
morris@4778 | 342 | guarantee(index != NULL && *index >= 0 && *index < _members.length(), "bad index"); |
kamg@4245 | 343 | _members.at(*index).second = DISQUALIFIED; |
kamg@4245 | 344 | } |
kamg@4245 | 345 | |
kamg@4245 | 346 | Symbol* generate_no_defaults_message(TRAPS) const; |
kamg@4245 | 347 | Symbol* generate_abstract_method_message(Method* method, TRAPS) const; |
kamg@4245 | 348 | Symbol* generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const; |
kamg@4245 | 349 | |
kamg@4245 | 350 | public: |
kamg@4245 | 351 | |
acorn@5377 | 352 | MethodFamily() |
acorn@5377 | 353 | : _selected_target(NULL), _exception_message(NULL) {} |
kamg@4245 | 354 | |
kamg@4245 | 355 | void set_target_if_empty(Method* m) { |
kamg@4245 | 356 | if (_selected_target == NULL && !m->is_overpass()) { |
kamg@4245 | 357 | _selected_target = m; |
kamg@4245 | 358 | } |
kamg@4245 | 359 | } |
kamg@4245 | 360 | |
kamg@4245 | 361 | void record_qualified_method(Method* m) { |
kamg@4245 | 362 | // If the method already exists in the set as qualified, this operation is |
kamg@4245 | 363 | // redundant. If it already exists as disqualified, then we leave it as |
kamg@4245 | 364 | // disqualfied. Thus we only add to the set if it's not already in the |
kamg@4245 | 365 | // set. |
kamg@4245 | 366 | if (!contains_method(m)) { |
kamg@4245 | 367 | add_method(m, QUALIFIED); |
kamg@4245 | 368 | } |
kamg@4245 | 369 | } |
kamg@4245 | 370 | |
kamg@4245 | 371 | void record_disqualified_method(Method* m) { |
kamg@4245 | 372 | // If not in the set, add it as disqualified. If it's already in the set, |
kamg@4245 | 373 | // then set the state to disqualified no matter what the previous state was. |
kamg@4245 | 374 | if (!contains_method(m)) { |
kamg@4245 | 375 | add_method(m, DISQUALIFIED); |
kamg@4245 | 376 | } else { |
kamg@4245 | 377 | disqualify_method(m); |
kamg@4245 | 378 | } |
kamg@4245 | 379 | } |
kamg@4245 | 380 | |
kamg@4245 | 381 | bool has_target() const { return _selected_target != NULL; } |
kamg@4245 | 382 | bool throws_exception() { return _exception_message != NULL; } |
kamg@4245 | 383 | |
kamg@4245 | 384 | Method* get_selected_target() { return _selected_target; } |
kamg@4245 | 385 | Symbol* get_exception_message() { return _exception_message; } |
kamg@4245 | 386 | |
kamg@4245 | 387 | // Either sets the target or the exception error message |
kamg@4245 | 388 | void determine_target(InstanceKlass* root, TRAPS) { |
kamg@4245 | 389 | if (has_target() || throws_exception()) { |
kamg@4245 | 390 | return; |
kamg@4245 | 391 | } |
kamg@4245 | 392 | |
kamg@4245 | 393 | GrowableArray<Method*> qualified_methods; |
kamg@4245 | 394 | for (int i = 0; i < _members.length(); ++i) { |
kamg@4245 | 395 | Pair<Method*,QualifiedState> entry = _members.at(i); |
kamg@4245 | 396 | if (entry.second == QUALIFIED) { |
kamg@4245 | 397 | qualified_methods.append(entry.first); |
kamg@4245 | 398 | } |
kamg@4245 | 399 | } |
kamg@4245 | 400 | |
kamg@4245 | 401 | if (qualified_methods.length() == 0) { |
kamg@4245 | 402 | _exception_message = generate_no_defaults_message(CHECK); |
kamg@4245 | 403 | } else if (qualified_methods.length() == 1) { |
kamg@4245 | 404 | Method* method = qualified_methods.at(0); |
kamg@4245 | 405 | if (method->is_abstract()) { |
kamg@4245 | 406 | _exception_message = generate_abstract_method_message(method, CHECK); |
kamg@4245 | 407 | } else { |
kamg@4245 | 408 | _selected_target = qualified_methods.at(0); |
kamg@4245 | 409 | } |
kamg@4245 | 410 | } else { |
kamg@4245 | 411 | _exception_message = generate_conflicts_message(&qualified_methods,CHECK); |
kamg@4245 | 412 | } |
kamg@4245 | 413 | |
kamg@4245 | 414 | assert((has_target() ^ throws_exception()) == 1, |
kamg@4245 | 415 | "One and only one must be true"); |
kamg@4245 | 416 | } |
kamg@4245 | 417 | |
kamg@4245 | 418 | bool contains_signature(Symbol* query) { |
kamg@4245 | 419 | for (int i = 0; i < _members.length(); ++i) { |
kamg@4245 | 420 | if (query == _members.at(i).first->signature()) { |
kamg@4245 | 421 | return true; |
kamg@4245 | 422 | } |
kamg@4245 | 423 | } |
kamg@4245 | 424 | return false; |
kamg@4245 | 425 | } |
kamg@4245 | 426 | |
kamg@4245 | 427 | #ifndef PRODUCT |
acorn@5377 | 428 | void print_sig_on(outputStream* str, Symbol* signature, int indent) const { |
kamg@4245 | 429 | streamIndentor si(str, indent * 2); |
kamg@4245 | 430 | |
acorn@5377 | 431 | str->indent().print_cr("Logical Method %s:", signature->as_C_string()); |
kamg@4245 | 432 | |
kamg@4245 | 433 | streamIndentor si2(str); |
kamg@4245 | 434 | for (int i = 0; i < _members.length(); ++i) { |
kamg@4245 | 435 | str->indent(); |
kamg@4245 | 436 | print_method(str, _members.at(i).first); |
kamg@4245 | 437 | if (_members.at(i).second == DISQUALIFIED) { |
kamg@4245 | 438 | str->print(" (disqualified)"); |
kamg@4245 | 439 | } |
kamg@4245 | 440 | str->print_cr(""); |
kamg@4245 | 441 | } |
kamg@4245 | 442 | |
kamg@4245 | 443 | if (_selected_target != NULL) { |
kamg@4245 | 444 | print_selected(str, 1); |
kamg@4245 | 445 | } |
kamg@4245 | 446 | } |
kamg@4245 | 447 | |
kamg@4245 | 448 | void print_selected(outputStream* str, int indent) const { |
kamg@4245 | 449 | assert(has_target(), "Should be called otherwise"); |
kamg@4245 | 450 | streamIndentor si(str, indent * 2); |
kamg@4245 | 451 | str->indent().print("Selected method: "); |
kamg@4245 | 452 | print_method(str, _selected_target); |
acorn@5681 | 453 | Klass* method_holder = _selected_target->method_holder(); |
acorn@5681 | 454 | if (!method_holder->is_interface()) { |
acorn@5681 | 455 | tty->print(" : in superclass"); |
acorn@5681 | 456 | } |
kamg@4245 | 457 | str->print_cr(""); |
kamg@4245 | 458 | } |
kamg@4245 | 459 | |
kamg@4245 | 460 | void print_exception(outputStream* str, int indent) { |
kamg@4245 | 461 | assert(throws_exception(), "Should be called otherwise"); |
kamg@4245 | 462 | streamIndentor si(str, indent * 2); |
kamg@4245 | 463 | str->indent().print_cr("%s", _exception_message->as_C_string()); |
kamg@4245 | 464 | } |
kamg@4245 | 465 | #endif // ndef PRODUCT |
kamg@4245 | 466 | }; |
kamg@4245 | 467 | |
kamg@4245 | 468 | Symbol* MethodFamily::generate_no_defaults_message(TRAPS) const { |
kamg@4245 | 469 | return SymbolTable::new_symbol("No qualifying defaults found", CHECK_NULL); |
kamg@4245 | 470 | } |
kamg@4245 | 471 | |
kamg@4245 | 472 | Symbol* MethodFamily::generate_abstract_method_message(Method* method, TRAPS) const { |
kamg@4245 | 473 | Symbol* klass = method->klass_name(); |
kamg@4245 | 474 | Symbol* name = method->name(); |
kamg@4245 | 475 | Symbol* sig = method->signature(); |
kamg@4245 | 476 | stringStream ss; |
kamg@4245 | 477 | ss.print("Method "); |
kamg@4245 | 478 | ss.write((const char*)klass->bytes(), klass->utf8_length()); |
kamg@4245 | 479 | ss.print("."); |
kamg@4245 | 480 | ss.write((const char*)name->bytes(), name->utf8_length()); |
kamg@4245 | 481 | ss.write((const char*)sig->bytes(), sig->utf8_length()); |
kamg@4245 | 482 | ss.print(" is abstract"); |
kamg@4245 | 483 | return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL); |
kamg@4245 | 484 | } |
kamg@4245 | 485 | |
kamg@4245 | 486 | Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const { |
kamg@4245 | 487 | stringStream ss; |
kamg@4245 | 488 | ss.print("Conflicting default methods:"); |
kamg@4245 | 489 | for (int i = 0; i < methods->length(); ++i) { |
kamg@4245 | 490 | Method* method = methods->at(i); |
kamg@4245 | 491 | Symbol* klass = method->klass_name(); |
kamg@4245 | 492 | Symbol* name = method->name(); |
kamg@4245 | 493 | ss.print(" "); |
kamg@4245 | 494 | ss.write((const char*)klass->bytes(), klass->utf8_length()); |
kamg@4245 | 495 | ss.print("."); |
kamg@4245 | 496 | ss.write((const char*)name->bytes(), name->utf8_length()); |
kamg@4245 | 497 | } |
kamg@4245 | 498 | return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL); |
kamg@4245 | 499 | } |
kamg@4245 | 500 | |
acorn@5377 | 501 | |
kamg@4245 | 502 | class StateRestorer; |
kamg@4245 | 503 | |
acorn@5377 | 504 | // StatefulMethodFamily is a wrapper around a MethodFamily that maintains the |
kamg@4245 | 505 | // qualification state during hierarchy visitation, and applies that state |
acorn@5377 | 506 | // when adding members to the MethodFamily |
kamg@4245 | 507 | class StatefulMethodFamily : public ResourceObj { |
kamg@4245 | 508 | friend class StateRestorer; |
kamg@4245 | 509 | private: |
kamg@4245 | 510 | QualifiedState _qualification_state; |
kamg@4245 | 511 | |
kamg@4245 | 512 | void set_qualification_state(QualifiedState state) { |
kamg@4245 | 513 | _qualification_state = state; |
kamg@4245 | 514 | } |
kamg@4245 | 515 | |
acorn@5377 | 516 | protected: |
acorn@5377 | 517 | MethodFamily* _method_family; |
acorn@5377 | 518 | |
kamg@4245 | 519 | public: |
acorn@5377 | 520 | StatefulMethodFamily() { |
acorn@5377 | 521 | _method_family = new MethodFamily(); |
acorn@5377 | 522 | _qualification_state = QUALIFIED; |
kamg@4245 | 523 | } |
kamg@4245 | 524 | |
acorn@5377 | 525 | StatefulMethodFamily(MethodFamily* mf) { |
acorn@5377 | 526 | _method_family = mf; |
acorn@5377 | 527 | _qualification_state = QUALIFIED; |
acorn@5377 | 528 | } |
kamg@4245 | 529 | |
acorn@5377 | 530 | void set_target_if_empty(Method* m) { _method_family->set_target_if_empty(m); } |
acorn@5377 | 531 | |
acorn@5377 | 532 | MethodFamily* get_method_family() { return _method_family; } |
acorn@5377 | 533 | |
acorn@5377 | 534 | StateRestorer* record_method_and_dq_further(Method* mo); |
acorn@5377 | 535 | }; |
acorn@5377 | 536 | |
kamg@4245 | 537 | class StateRestorer : public PseudoScopeMark { |
kamg@4245 | 538 | private: |
kamg@4245 | 539 | StatefulMethodFamily* _method; |
kamg@4245 | 540 | QualifiedState _state_to_restore; |
kamg@4245 | 541 | public: |
kamg@4245 | 542 | StateRestorer(StatefulMethodFamily* dm, QualifiedState state) |
kamg@4245 | 543 | : _method(dm), _state_to_restore(state) {} |
kamg@4245 | 544 | ~StateRestorer() { destroy(); } |
kamg@4245 | 545 | void restore_state() { _method->set_qualification_state(_state_to_restore); } |
kamg@4245 | 546 | virtual void destroy() { restore_state(); } |
kamg@4245 | 547 | }; |
kamg@4245 | 548 | |
kamg@4245 | 549 | StateRestorer* StatefulMethodFamily::record_method_and_dq_further(Method* mo) { |
kamg@4245 | 550 | StateRestorer* mark = new StateRestorer(this, _qualification_state); |
kamg@4245 | 551 | if (_qualification_state == QUALIFIED) { |
acorn@5377 | 552 | _method_family->record_qualified_method(mo); |
kamg@4245 | 553 | } else { |
acorn@5377 | 554 | _method_family->record_disqualified_method(mo); |
kamg@4245 | 555 | } |
kamg@4245 | 556 | // Everything found "above"??? this method in the hierarchy walk is set to |
kamg@4245 | 557 | // disqualified |
kamg@4245 | 558 | set_qualification_state(DISQUALIFIED); |
kamg@4245 | 559 | return mark; |
kamg@4245 | 560 | } |
kamg@4245 | 561 | |
kamg@4245 | 562 | // Represents a location corresponding to a vtable slot for methods that |
kamg@4245 | 563 | // neither the class nor any of it's ancestors provide an implementaion. |
kamg@4245 | 564 | // Default methods may be present to fill this slot. |
kamg@4245 | 565 | class EmptyVtableSlot : public ResourceObj { |
kamg@4245 | 566 | private: |
kamg@4245 | 567 | Symbol* _name; |
kamg@4245 | 568 | Symbol* _signature; |
kamg@4245 | 569 | int _size_of_parameters; |
kamg@4245 | 570 | MethodFamily* _binding; |
kamg@4245 | 571 | |
kamg@4245 | 572 | public: |
kamg@4245 | 573 | EmptyVtableSlot(Method* method) |
kamg@4245 | 574 | : _name(method->name()), _signature(method->signature()), |
kamg@4245 | 575 | _size_of_parameters(method->size_of_parameters()), _binding(NULL) {} |
kamg@4245 | 576 | |
kamg@4245 | 577 | Symbol* name() const { return _name; } |
kamg@4245 | 578 | Symbol* signature() const { return _signature; } |
kamg@4245 | 579 | int size_of_parameters() const { return _size_of_parameters; } |
kamg@4245 | 580 | |
kamg@4245 | 581 | void bind_family(MethodFamily* lm) { _binding = lm; } |
kamg@4245 | 582 | bool is_bound() { return _binding != NULL; } |
kamg@4245 | 583 | MethodFamily* get_binding() { return _binding; } |
kamg@4245 | 584 | |
kamg@4245 | 585 | #ifndef PRODUCT |
kamg@4245 | 586 | void print_on(outputStream* str) const { |
kamg@4245 | 587 | print_slot(str, name(), signature()); |
kamg@4245 | 588 | } |
kamg@4245 | 589 | #endif // ndef PRODUCT |
kamg@4245 | 590 | }; |
kamg@4245 | 591 | |
kamg@4245 | 592 | static GrowableArray<EmptyVtableSlot*>* find_empty_vtable_slots( |
kamg@4245 | 593 | InstanceKlass* klass, GrowableArray<Method*>* mirandas, TRAPS) { |
kamg@4245 | 594 | |
kamg@4245 | 595 | assert(klass != NULL, "Must be valid class"); |
kamg@4245 | 596 | |
kamg@4245 | 597 | GrowableArray<EmptyVtableSlot*>* slots = new GrowableArray<EmptyVtableSlot*>(); |
kamg@4245 | 598 | |
kamg@4245 | 599 | // All miranda methods are obvious candidates |
kamg@4245 | 600 | for (int i = 0; i < mirandas->length(); ++i) { |
kamg@4245 | 601 | EmptyVtableSlot* slot = new EmptyVtableSlot(mirandas->at(i)); |
kamg@4245 | 602 | slots->append(slot); |
kamg@4245 | 603 | } |
kamg@4245 | 604 | |
kamg@4245 | 605 | // Also any overpasses in our superclasses, that we haven't implemented. |
kamg@4245 | 606 | // (can't use the vtable because it is not guaranteed to be initialized yet) |
kamg@4245 | 607 | InstanceKlass* super = klass->java_super(); |
kamg@4245 | 608 | while (super != NULL) { |
kamg@4245 | 609 | for (int i = 0; i < super->methods()->length(); ++i) { |
kamg@4245 | 610 | Method* m = super->methods()->at(i); |
kamg@4245 | 611 | if (m->is_overpass()) { |
kamg@4245 | 612 | // m is a method that would have been a miranda if not for the |
kamg@4245 | 613 | // default method processing that occurred on behalf of our superclass, |
kamg@4245 | 614 | // so it's a method we want to re-examine in this new context. That is, |
kamg@4245 | 615 | // unless we have a real implementation of it in the current class. |
kamg@4245 | 616 | Method* impl = klass->lookup_method(m->name(), m->signature()); |
kamg@4245 | 617 | if (impl == NULL || impl->is_overpass()) { |
kamg@4245 | 618 | slots->append(new EmptyVtableSlot(m)); |
kamg@4245 | 619 | } |
kamg@4245 | 620 | } |
kamg@4245 | 621 | } |
kamg@4245 | 622 | super = super->java_super(); |
kamg@4245 | 623 | } |
kamg@4245 | 624 | |
kamg@4245 | 625 | #ifndef PRODUCT |
kamg@4245 | 626 | if (TraceDefaultMethods) { |
kamg@4245 | 627 | tty->print_cr("Slots that need filling:"); |
kamg@4245 | 628 | streamIndentor si(tty); |
kamg@4245 | 629 | for (int i = 0; i < slots->length(); ++i) { |
kamg@4245 | 630 | tty->indent(); |
kamg@4245 | 631 | slots->at(i)->print_on(tty); |
kamg@4245 | 632 | tty->print_cr(""); |
kamg@4245 | 633 | } |
kamg@4245 | 634 | } |
kamg@4245 | 635 | #endif // ndef PRODUCT |
kamg@4245 | 636 | return slots; |
kamg@4245 | 637 | } |
kamg@4245 | 638 | |
acorn@5377 | 639 | // Iterates over the superinterface type hierarchy looking for all methods |
acorn@5377 | 640 | // with a specific erased signature. |
acorn@5377 | 641 | class FindMethodsByErasedSig : public HierarchyVisitor<FindMethodsByErasedSig> { |
acorn@5377 | 642 | private: |
acorn@5377 | 643 | // Context data |
acorn@5377 | 644 | Symbol* _method_name; |
acorn@5377 | 645 | Symbol* _method_signature; |
acorn@5377 | 646 | StatefulMethodFamily* _family; |
acorn@5377 | 647 | |
acorn@5377 | 648 | public: |
acorn@5377 | 649 | FindMethodsByErasedSig(Symbol* name, Symbol* signature) : |
acorn@5377 | 650 | _method_name(name), _method_signature(signature), |
acorn@5377 | 651 | _family(NULL) {} |
acorn@5377 | 652 | |
acorn@5377 | 653 | void get_discovered_family(MethodFamily** family) { |
acorn@5377 | 654 | if (_family != NULL) { |
acorn@5377 | 655 | *family = _family->get_method_family(); |
acorn@5377 | 656 | } else { |
acorn@5377 | 657 | *family = NULL; |
acorn@5377 | 658 | } |
acorn@5377 | 659 | } |
acorn@5377 | 660 | |
acorn@5377 | 661 | void* new_node_data(InstanceKlass* cls) { return new PseudoScope(); } |
acorn@5377 | 662 | void free_node_data(void* node_data) { |
acorn@5377 | 663 | PseudoScope::cast(node_data)->destroy(); |
acorn@5377 | 664 | } |
acorn@5377 | 665 | |
acorn@5377 | 666 | // Find all methods on this hierarchy that match this |
acorn@5377 | 667 | // method's erased (name, signature) |
acorn@5377 | 668 | bool visit() { |
acorn@5377 | 669 | PseudoScope* scope = PseudoScope::cast(current_data()); |
acorn@5377 | 670 | InstanceKlass* iklass = current_class(); |
acorn@5377 | 671 | |
acorn@5377 | 672 | Method* m = iklass->find_method(_method_name, _method_signature); |
acorn@5377 | 673 | if (m != NULL) { |
acorn@5377 | 674 | if (_family == NULL) { |
acorn@5377 | 675 | _family = new StatefulMethodFamily(); |
acorn@5377 | 676 | } |
acorn@5377 | 677 | |
acorn@5377 | 678 | if (iklass->is_interface()) { |
acorn@5377 | 679 | StateRestorer* restorer = _family->record_method_and_dq_further(m); |
acorn@5377 | 680 | scope->add_mark(restorer); |
acorn@5377 | 681 | } else { |
acorn@5377 | 682 | // This is the rule that methods in classes "win" (bad word) over |
acorn@5377 | 683 | // methods in interfaces. This works because of single inheritance |
acorn@5377 | 684 | _family->set_target_if_empty(m); |
acorn@5377 | 685 | } |
acorn@5377 | 686 | } |
acorn@5377 | 687 | return true; |
acorn@5377 | 688 | } |
acorn@5377 | 689 | |
acorn@5377 | 690 | }; |
acorn@5377 | 691 | |
kamg@4245 | 692 | |
kamg@4245 | 693 | |
acorn@5377 | 694 | static void create_overpasses( |
acorn@5377 | 695 | GrowableArray<EmptyVtableSlot*>* slots, InstanceKlass* klass, TRAPS); |
acorn@5377 | 696 | |
acorn@5377 | 697 | static void generate_erased_defaults( |
acorn@5377 | 698 | InstanceKlass* klass, GrowableArray<EmptyVtableSlot*>* empty_slots, |
acorn@5377 | 699 | EmptyVtableSlot* slot, TRAPS) { |
acorn@5377 | 700 | |
acorn@5377 | 701 | // sets up a set of methods with the same exact erased signature |
acorn@5377 | 702 | FindMethodsByErasedSig visitor(slot->name(), slot->signature()); |
acorn@5377 | 703 | visitor.run(klass); |
acorn@5377 | 704 | |
acorn@5377 | 705 | MethodFamily* family; |
acorn@5377 | 706 | visitor.get_discovered_family(&family); |
acorn@5377 | 707 | if (family != NULL) { |
acorn@5377 | 708 | family->determine_target(klass, CHECK); |
acorn@5377 | 709 | slot->bind_family(family); |
acorn@5377 | 710 | } |
acorn@5377 | 711 | } |
acorn@5377 | 712 | |
kamg@4245 | 713 | static void merge_in_new_methods(InstanceKlass* klass, |
kamg@4245 | 714 | GrowableArray<Method*>* new_methods, TRAPS); |
kamg@4245 | 715 | |
kamg@4245 | 716 | // This is the guts of the default methods implementation. This is called just |
kamg@4245 | 717 | // after the classfile has been parsed if some ancestor has default methods. |
kamg@4245 | 718 | // |
kamg@4245 | 719 | // First if finds any name/signature slots that need any implementation (either |
kamg@4245 | 720 | // because they are miranda or a superclass's implementation is an overpass |
acorn@5599 | 721 | // itself). For each slot, iterate over the hierarchy, to see if they contain a |
acorn@5599 | 722 | // signature that matches the slot we are looking at. |
kamg@4245 | 723 | // |
kamg@4245 | 724 | // For each slot filled, we generate an overpass method that either calls the |
kamg@4245 | 725 | // unique default method candidate using invokespecial, or throws an exception |
kamg@4245 | 726 | // (in the case of no default method candidates, or more than one valid |
acorn@5599 | 727 | // candidate). These methods are then added to the class's method list. |
acorn@5599 | 728 | // The JVM does not create bridges nor handle generic signatures here. |
kamg@4245 | 729 | void DefaultMethods::generate_default_methods( |
kamg@4245 | 730 | InstanceKlass* klass, GrowableArray<Method*>* mirandas, TRAPS) { |
kamg@4245 | 731 | |
kamg@4245 | 732 | // This resource mark is the bound for all memory allocation that takes |
kamg@4245 | 733 | // place during default method processing. After this goes out of scope, |
kamg@4245 | 734 | // all (Resource) objects' memory will be reclaimed. Be careful if adding an |
kamg@4245 | 735 | // embedded resource mark under here as that memory can't be used outside |
kamg@4245 | 736 | // whatever scope it's in. |
kamg@4245 | 737 | ResourceMark rm(THREAD); |
kamg@4245 | 738 | |
kamg@4245 | 739 | // Keep entire hierarchy alive for the duration of the computation |
kamg@4245 | 740 | KeepAliveRegistrar keepAlive(THREAD); |
kamg@4245 | 741 | KeepAliveVisitor loadKeepAlive(&keepAlive); |
kamg@4245 | 742 | loadKeepAlive.run(klass); |
kamg@4245 | 743 | |
kamg@4245 | 744 | #ifndef PRODUCT |
kamg@4245 | 745 | if (TraceDefaultMethods) { |
kamg@4245 | 746 | ResourceMark rm; // be careful with these! |
kamg@4245 | 747 | tty->print_cr("Class %s requires default method processing", |
kamg@4245 | 748 | klass->name()->as_klass_external_name()); |
kamg@4245 | 749 | PrintHierarchy printer; |
kamg@4245 | 750 | printer.run(klass); |
kamg@4245 | 751 | } |
kamg@4245 | 752 | #endif // ndef PRODUCT |
kamg@4245 | 753 | |
kamg@4245 | 754 | GrowableArray<EmptyVtableSlot*>* empty_slots = |
kamg@4245 | 755 | find_empty_vtable_slots(klass, mirandas, CHECK); |
kamg@4245 | 756 | |
kamg@4245 | 757 | for (int i = 0; i < empty_slots->length(); ++i) { |
kamg@4245 | 758 | EmptyVtableSlot* slot = empty_slots->at(i); |
kamg@4245 | 759 | #ifndef PRODUCT |
kamg@4245 | 760 | if (TraceDefaultMethods) { |
kamg@4245 | 761 | streamIndentor si(tty, 2); |
kamg@4245 | 762 | tty->indent().print("Looking for default methods for slot "); |
kamg@4245 | 763 | slot->print_on(tty); |
kamg@4245 | 764 | tty->print_cr(""); |
kamg@4245 | 765 | } |
kamg@4245 | 766 | #endif // ndef PRODUCT |
acorn@5377 | 767 | |
acorn@5599 | 768 | generate_erased_defaults(klass, empty_slots, slot, CHECK); |
acorn@5377 | 769 | } |
kamg@4245 | 770 | #ifndef PRODUCT |
kamg@4245 | 771 | if (TraceDefaultMethods) { |
kamg@4245 | 772 | tty->print_cr("Creating overpasses..."); |
kamg@4245 | 773 | } |
kamg@4245 | 774 | #endif // ndef PRODUCT |
kamg@4245 | 775 | |
kamg@4245 | 776 | create_overpasses(empty_slots, klass, CHECK); |
kamg@4245 | 777 | |
kamg@4245 | 778 | #ifndef PRODUCT |
kamg@4245 | 779 | if (TraceDefaultMethods) { |
kamg@4245 | 780 | tty->print_cr("Default method processing complete"); |
kamg@4245 | 781 | } |
kamg@4245 | 782 | #endif // ndef PRODUCT |
kamg@4245 | 783 | } |
kamg@4245 | 784 | |
kamg@4245 | 785 | /** |
acorn@5599 | 786 | * Interface inheritance rules were used to find a unique default method |
acorn@5599 | 787 | * candidate for the resolved class. This |
kamg@4245 | 788 | * method is only viable if it would also be in the set of default method |
kamg@4245 | 789 | * candidates if we ran a full analysis on the current class. |
kamg@4245 | 790 | * |
kamg@4245 | 791 | * The only reason that the method would not be in the set of candidates for |
acorn@5599 | 792 | * the current class is if that there's another matching method |
kamg@4245 | 793 | * which is "more specific" than the found method -- i.e., one could find a |
kamg@4245 | 794 | * path in the interface hierarchy in which the matching method appears |
kamg@4245 | 795 | * before we get to '_target'. |
kamg@4245 | 796 | * |
kamg@4245 | 797 | * In order to determine this, we examine all of the implemented |
kamg@4245 | 798 | * interfaces. If we find path that leads to the '_target' interface, then |
kamg@4245 | 799 | * we examine that path to see if there are any methods that would shadow |
kamg@4245 | 800 | * the selected method along that path. |
kamg@4245 | 801 | */ |
kamg@4245 | 802 | class ShadowChecker : public HierarchyVisitor<ShadowChecker> { |
acorn@5377 | 803 | protected: |
kamg@4245 | 804 | Thread* THREAD; |
kamg@4245 | 805 | |
kamg@4245 | 806 | InstanceKlass* _target; |
kamg@4245 | 807 | |
kamg@4245 | 808 | Symbol* _method_name; |
kamg@4245 | 809 | InstanceKlass* _method_holder; |
acorn@5377 | 810 | bool _found_shadow; |
acorn@5377 | 811 | |
acorn@5377 | 812 | |
acorn@5377 | 813 | public: |
acorn@5377 | 814 | |
acorn@5377 | 815 | ShadowChecker(Thread* thread, Symbol* name, InstanceKlass* holder, |
acorn@5377 | 816 | InstanceKlass* target) |
acorn@5377 | 817 | : THREAD(thread), _method_name(name), _method_holder(holder), |
acorn@5377 | 818 | _target(target), _found_shadow(false) {} |
acorn@5377 | 819 | |
acorn@5377 | 820 | void* new_node_data(InstanceKlass* cls) { return NULL; } |
acorn@5377 | 821 | void free_node_data(void* data) { return; } |
acorn@5377 | 822 | |
acorn@5377 | 823 | bool visit() { |
acorn@5377 | 824 | InstanceKlass* ik = current_class(); |
acorn@5377 | 825 | if (ik == _target && current_depth() == 1) { |
acorn@5377 | 826 | return false; // This was the specified super -- no need to search it |
acorn@5377 | 827 | } |
acorn@5377 | 828 | if (ik == _method_holder || ik == _target) { |
acorn@5377 | 829 | // We found a path that should be examined to see if it shadows _method |
acorn@5377 | 830 | if (path_has_shadow()) { |
acorn@5377 | 831 | _found_shadow = true; |
acorn@5377 | 832 | cancel_iteration(); |
acorn@5377 | 833 | } |
acorn@5377 | 834 | return false; // no need to continue up hierarchy |
acorn@5377 | 835 | } |
acorn@5377 | 836 | return true; |
acorn@5377 | 837 | } |
acorn@5377 | 838 | |
acorn@5377 | 839 | virtual bool path_has_shadow() = 0; |
acorn@5377 | 840 | bool found_shadow() { return _found_shadow; } |
acorn@5377 | 841 | }; |
acorn@5377 | 842 | |
acorn@5377 | 843 | // Used for Invokespecial. |
acorn@5377 | 844 | // Invokespecial is allowed to invoke a concrete interface method |
acorn@5377 | 845 | // and can be used to disambuiguate among qualified candidates, |
acorn@5377 | 846 | // which are methods in immediate superinterfaces, |
acorn@5377 | 847 | // but may not be used to invoke a candidate that would be shadowed |
acorn@5377 | 848 | // from the perspective of the caller. |
acorn@5377 | 849 | // Invokespecial is also used in the overpass generation today |
acorn@5377 | 850 | // We re-run the shadowchecker because we can't distinguish this case, |
acorn@5377 | 851 | // but it should return the same answer, since the overpass target |
acorn@5377 | 852 | // is now the invokespecial caller. |
acorn@5377 | 853 | class ErasedShadowChecker : public ShadowChecker { |
acorn@5377 | 854 | private: |
acorn@5377 | 855 | bool path_has_shadow() { |
acorn@5377 | 856 | |
acorn@5377 | 857 | for (int i = current_depth() - 1; i > 0; --i) { |
acorn@5377 | 858 | InstanceKlass* ik = class_at_depth(i); |
acorn@5377 | 859 | |
acorn@5377 | 860 | if (ik->is_interface()) { |
acorn@5377 | 861 | int end; |
acorn@5377 | 862 | int start = ik->find_method_by_name(_method_name, &end); |
acorn@5377 | 863 | if (start != -1) { |
acorn@5377 | 864 | return true; |
acorn@5377 | 865 | } |
acorn@5377 | 866 | } |
acorn@5377 | 867 | } |
acorn@5377 | 868 | return false; |
acorn@5377 | 869 | } |
acorn@5377 | 870 | public: |
acorn@5377 | 871 | |
acorn@5377 | 872 | ErasedShadowChecker(Thread* thread, Symbol* name, InstanceKlass* holder, |
acorn@5377 | 873 | InstanceKlass* target) |
acorn@5377 | 874 | : ShadowChecker(thread, name, holder, target) {} |
acorn@5377 | 875 | }; |
acorn@5377 | 876 | |
acorn@5377 | 877 | // Find the unique qualified candidate from the perspective of the super_class |
acorn@5377 | 878 | // which is the resolved_klass, which must be an immediate superinterface |
acorn@5377 | 879 | // of klass |
acorn@5377 | 880 | Method* find_erased_super_default(InstanceKlass* current_class, InstanceKlass* super_class, Symbol* method_name, Symbol* sig, TRAPS) { |
acorn@5377 | 881 | |
acorn@5377 | 882 | FindMethodsByErasedSig visitor(method_name, sig); |
acorn@5377 | 883 | visitor.run(super_class); // find candidates from resolved_klass |
acorn@5377 | 884 | |
acorn@5377 | 885 | MethodFamily* family; |
acorn@5377 | 886 | visitor.get_discovered_family(&family); |
acorn@5377 | 887 | |
acorn@5377 | 888 | if (family != NULL) { |
acorn@5377 | 889 | family->determine_target(current_class, CHECK_NULL); // get target from current_class |
kamg@4245 | 890 | |
acorn@5608 | 891 | if (family->has_target()) { |
acorn@5608 | 892 | Method* target = family->get_selected_target(); |
acorn@5608 | 893 | InstanceKlass* holder = InstanceKlass::cast(target->method_holder()); |
kamg@4245 | 894 | |
acorn@5608 | 895 | // Verify that the identified method is valid from the context of |
acorn@5608 | 896 | // the current class, which is the caller class for invokespecial |
acorn@5608 | 897 | // link resolution, i.e. ensure there it is not shadowed. |
acorn@5608 | 898 | // You can use invokespecial to disambiguate interface methods, but |
acorn@5608 | 899 | // you can not use it to skip over an interface method that would shadow it. |
acorn@5608 | 900 | ErasedShadowChecker checker(THREAD, target->name(), holder, super_class); |
acorn@5608 | 901 | checker.run(current_class); |
kamg@4245 | 902 | |
acorn@5608 | 903 | if (checker.found_shadow()) { |
kamg@4245 | 904 | #ifndef PRODUCT |
acorn@5608 | 905 | if (TraceDefaultMethods) { |
acorn@5608 | 906 | tty->print_cr(" Only candidate found was shadowed."); |
acorn@5608 | 907 | } |
acorn@5608 | 908 | #endif // ndef PRODUCT |
acorn@5608 | 909 | THROW_MSG_(vmSymbols::java_lang_AbstractMethodError(), |
acorn@5608 | 910 | "Accessible default method not found", NULL); |
acorn@5608 | 911 | } else { |
acorn@5608 | 912 | #ifndef PRODUCT |
acorn@5608 | 913 | if (TraceDefaultMethods) { |
acorn@5608 | 914 | family->print_sig_on(tty, target->signature(), 1); |
acorn@5608 | 915 | } |
acorn@5608 | 916 | #endif // ndef PRODUCT |
acorn@5608 | 917 | return target; |
kamg@4245 | 918 | } |
acorn@5608 | 919 | } else { |
acorn@5608 | 920 | assert(family->throws_exception(), "must have target or throw"); |
kamg@4245 | 921 | THROW_MSG_(vmSymbols::java_lang_AbstractMethodError(), |
acorn@5608 | 922 | family->get_exception_message()->as_C_string(), NULL); |
acorn@5608 | 923 | } |
kamg@4245 | 924 | } else { |
acorn@5608 | 925 | // no method found |
acorn@5608 | 926 | ResourceMark rm(THREAD); |
acorn@5608 | 927 | THROW_MSG_(vmSymbols::java_lang_NoSuchMethodError(), |
acorn@5608 | 928 | Method::name_and_sig_as_C_string(current_class, |
acorn@5608 | 929 | method_name, sig), NULL); |
acorn@5377 | 930 | } |
acorn@5377 | 931 | } |
acorn@5377 | 932 | // This is called during linktime when we find an invokespecial call that |
acorn@5377 | 933 | // refers to a direct superinterface. It indicates that we should find the |
acorn@5377 | 934 | // default method in the hierarchy of that superinterface, and if that method |
acorn@5377 | 935 | // would have been a candidate from the point of view of 'this' class, then we |
acorn@5377 | 936 | // return that method. |
acorn@5377 | 937 | // This logic assumes that the super is a direct superclass of the caller |
acorn@5377 | 938 | Method* DefaultMethods::find_super_default( |
acorn@5377 | 939 | Klass* cls, Klass* super, Symbol* method_name, Symbol* sig, TRAPS) { |
acorn@5377 | 940 | |
acorn@5377 | 941 | ResourceMark rm(THREAD); |
acorn@5377 | 942 | |
acorn@5377 | 943 | assert(cls != NULL && super != NULL, "Need real classes"); |
acorn@5377 | 944 | |
acorn@5377 | 945 | InstanceKlass* current_class = InstanceKlass::cast(cls); |
acorn@5377 | 946 | InstanceKlass* super_class = InstanceKlass::cast(super); |
acorn@5377 | 947 | |
acorn@5377 | 948 | // Keep entire hierarchy alive for the duration of the computation |
acorn@5377 | 949 | KeepAliveRegistrar keepAlive(THREAD); |
acorn@5377 | 950 | KeepAliveVisitor loadKeepAlive(&keepAlive); |
acorn@5377 | 951 | loadKeepAlive.run(current_class); // get hierarchy from current class |
acorn@5377 | 952 | |
acorn@5377 | 953 | #ifndef PRODUCT |
acorn@5377 | 954 | if (TraceDefaultMethods) { |
acorn@5377 | 955 | tty->print_cr("Finding super default method %s.%s%s from %s", |
acorn@5377 | 956 | super_class->name()->as_C_string(), |
acorn@5377 | 957 | method_name->as_C_string(), sig->as_C_string(), |
acorn@5377 | 958 | current_class->name()->as_C_string()); |
acorn@5377 | 959 | } |
acorn@5377 | 960 | #endif // ndef PRODUCT |
acorn@5377 | 961 | |
acorn@5377 | 962 | assert(super_class->is_interface(), "only call for default methods"); |
acorn@5377 | 963 | |
acorn@5377 | 964 | Method* target = NULL; |
acorn@5599 | 965 | target = find_erased_super_default(current_class, super_class, |
acorn@5599 | 966 | method_name, sig, CHECK_NULL); |
acorn@5377 | 967 | |
acorn@5377 | 968 | #ifndef PRODUCT |
acorn@5377 | 969 | if (target != NULL) { |
acorn@5377 | 970 | if (TraceDefaultMethods) { |
acorn@5377 | 971 | tty->print(" Returning "); |
acorn@5377 | 972 | print_method(tty, target, true); |
acorn@5377 | 973 | tty->print_cr(""); |
acorn@5377 | 974 | } |
acorn@5377 | 975 | } |
acorn@5377 | 976 | #endif // ndef PRODUCT |
acorn@5377 | 977 | return target; |
acorn@5377 | 978 | } |
acorn@5377 | 979 | |
acorn@5377 | 980 | #ifndef PRODUCT |
acorn@5377 | 981 | // Return true is broad type is a covariant return of narrow type |
acorn@5377 | 982 | static bool covariant_return_type(BasicType narrow, BasicType broad) { |
acorn@5377 | 983 | if (narrow == broad) { |
acorn@5377 | 984 | return true; |
acorn@5377 | 985 | } |
acorn@5377 | 986 | if (broad == T_OBJECT) { |
acorn@5377 | 987 | return true; |
acorn@5377 | 988 | } |
acorn@5377 | 989 | return false; |
acorn@5377 | 990 | } |
acorn@5377 | 991 | #endif // ndef PRODUCT |
kamg@4245 | 992 | |
kamg@4245 | 993 | static int assemble_redirect( |
kamg@4245 | 994 | BytecodeConstantPool* cp, BytecodeBuffer* buffer, |
kamg@4245 | 995 | Symbol* incoming, Method* target, TRAPS) { |
kamg@4245 | 996 | |
kamg@4245 | 997 | BytecodeAssembler assem(buffer, cp); |
kamg@4245 | 998 | |
kamg@4245 | 999 | SignatureStream in(incoming, true); |
kamg@4245 | 1000 | SignatureStream out(target->signature(), true); |
kamg@4245 | 1001 | u2 parameter_count = 0; |
kamg@4245 | 1002 | |
kamg@4245 | 1003 | assem.aload(parameter_count++); // load 'this' |
kamg@4245 | 1004 | |
kamg@4245 | 1005 | while (!in.at_return_type()) { |
kamg@4245 | 1006 | assert(!out.at_return_type(), "Parameter counts do not match"); |
kamg@4245 | 1007 | BasicType bt = in.type(); |
kamg@4245 | 1008 | assert(out.type() == bt, "Parameter types are not compatible"); |
kamg@4245 | 1009 | assem.load(bt, parameter_count); |
kamg@4245 | 1010 | if (in.is_object() && in.as_symbol(THREAD) != out.as_symbol(THREAD)) { |
kamg@4245 | 1011 | assem.checkcast(out.as_symbol(THREAD)); |
kamg@4245 | 1012 | } else if (bt == T_LONG || bt == T_DOUBLE) { |
kamg@4245 | 1013 | ++parameter_count; // longs and doubles use two slots |
kamg@4245 | 1014 | } |
kamg@4245 | 1015 | ++parameter_count; |
kamg@4245 | 1016 | in.next(); |
kamg@4245 | 1017 | out.next(); |
kamg@4245 | 1018 | } |
kamg@4245 | 1019 | assert(out.at_return_type(), "Parameter counts do not match"); |
acorn@5377 | 1020 | assert(covariant_return_type(out.type(), in.type()), "Return types are not compatible"); |
kamg@4245 | 1021 | |
kamg@4245 | 1022 | if (parameter_count == 1 && (in.type() == T_LONG || in.type() == T_DOUBLE)) { |
kamg@4245 | 1023 | ++parameter_count; // need room for return value |
kamg@4245 | 1024 | } |
kamg@4245 | 1025 | if (target->method_holder()->is_interface()) { |
kamg@4245 | 1026 | assem.invokespecial(target); |
kamg@4245 | 1027 | } else { |
kamg@4245 | 1028 | assem.invokevirtual(target); |
kamg@4245 | 1029 | } |
kamg@4245 | 1030 | |
kamg@4245 | 1031 | if (in.is_object() && in.as_symbol(THREAD) != out.as_symbol(THREAD)) { |
kamg@4245 | 1032 | assem.checkcast(in.as_symbol(THREAD)); |
kamg@4245 | 1033 | } |
kamg@4245 | 1034 | assem._return(in.type()); |
kamg@4245 | 1035 | return parameter_count; |
kamg@4245 | 1036 | } |
kamg@4245 | 1037 | |
kamg@4245 | 1038 | static int assemble_abstract_method_error( |
kamg@4245 | 1039 | BytecodeConstantPool* cp, BytecodeBuffer* buffer, Symbol* message, TRAPS) { |
kamg@4245 | 1040 | |
kamg@4245 | 1041 | Symbol* errorName = vmSymbols::java_lang_AbstractMethodError(); |
kamg@4245 | 1042 | Symbol* init = vmSymbols::object_initializer_name(); |
kamg@4245 | 1043 | Symbol* sig = vmSymbols::string_void_signature(); |
kamg@4245 | 1044 | |
kamg@4245 | 1045 | BytecodeAssembler assem(buffer, cp); |
kamg@4245 | 1046 | |
kamg@4245 | 1047 | assem._new(errorName); |
kamg@4245 | 1048 | assem.dup(); |
kamg@4245 | 1049 | assem.load_string(message); |
kamg@4245 | 1050 | assem.invokespecial(errorName, init, sig); |
kamg@4245 | 1051 | assem.athrow(); |
kamg@4245 | 1052 | |
kamg@4245 | 1053 | return 3; // max stack size: [ exception, exception, string ] |
kamg@4245 | 1054 | } |
kamg@4245 | 1055 | |
kamg@4245 | 1056 | static Method* new_method( |
kamg@4245 | 1057 | BytecodeConstantPool* cp, BytecodeBuffer* bytecodes, Symbol* name, |
kamg@4245 | 1058 | Symbol* sig, AccessFlags flags, int max_stack, int params, |
kamg@4245 | 1059 | ConstMethod::MethodType mt, TRAPS) { |
kamg@4245 | 1060 | |
acorn@5377 | 1061 | address code_start = 0; |
acorn@5377 | 1062 | int code_length = 0; |
coleenp@4572 | 1063 | InlineTableSizes sizes; |
kamg@4245 | 1064 | |
acorn@5377 | 1065 | if (bytecodes != NULL && bytecodes->length() > 0) { |
acorn@5377 | 1066 | code_start = static_cast<address>(bytecodes->adr_at(0)); |
acorn@5377 | 1067 | code_length = bytecodes->length(); |
acorn@5377 | 1068 | } |
acorn@5377 | 1069 | |
kamg@4245 | 1070 | Method* m = Method::allocate(cp->pool_holder()->class_loader_data(), |
coleenp@4572 | 1071 | code_length, flags, &sizes, |
coleenp@4398 | 1072 | mt, CHECK_NULL); |
kamg@4245 | 1073 | |
kamg@4245 | 1074 | m->set_constants(NULL); // This will get filled in later |
kamg@4245 | 1075 | m->set_name_index(cp->utf8(name)); |
kamg@4245 | 1076 | m->set_signature_index(cp->utf8(sig)); |
kamg@4245 | 1077 | #ifdef CC_INTERP |
kamg@4245 | 1078 | ResultTypeFinder rtf(sig); |
kamg@4245 | 1079 | m->set_result_index(rtf.type()); |
kamg@4245 | 1080 | #endif |
kamg@4245 | 1081 | m->set_size_of_parameters(params); |
kamg@4245 | 1082 | m->set_max_stack(max_stack); |
kamg@4245 | 1083 | m->set_max_locals(params); |
kamg@4245 | 1084 | m->constMethod()->set_stackmap_data(NULL); |
kamg@4245 | 1085 | m->set_code(code_start); |
kamg@4245 | 1086 | m->set_force_inline(true); |
kamg@4245 | 1087 | |
kamg@4245 | 1088 | return m; |
kamg@4245 | 1089 | } |
kamg@4245 | 1090 | |
kamg@4245 | 1091 | static void switchover_constant_pool(BytecodeConstantPool* bpool, |
kamg@4245 | 1092 | InstanceKlass* klass, GrowableArray<Method*>* new_methods, TRAPS) { |
kamg@4245 | 1093 | |
kamg@4245 | 1094 | if (new_methods->length() > 0) { |
kamg@4245 | 1095 | ConstantPool* cp = bpool->create_constant_pool(CHECK); |
kamg@4245 | 1096 | if (cp != klass->constants()) { |
kamg@4245 | 1097 | klass->class_loader_data()->add_to_deallocate_list(klass->constants()); |
kamg@4245 | 1098 | klass->set_constants(cp); |
kamg@4245 | 1099 | cp->set_pool_holder(klass); |
kamg@4245 | 1100 | |
kamg@4245 | 1101 | for (int i = 0; i < new_methods->length(); ++i) { |
kamg@4245 | 1102 | new_methods->at(i)->set_constants(cp); |
kamg@4245 | 1103 | } |
kamg@4245 | 1104 | for (int i = 0; i < klass->methods()->length(); ++i) { |
kamg@4245 | 1105 | Method* mo = klass->methods()->at(i); |
kamg@4245 | 1106 | mo->set_constants(cp); |
kamg@4245 | 1107 | } |
kamg@4245 | 1108 | } |
kamg@4245 | 1109 | } |
kamg@4245 | 1110 | } |
kamg@4245 | 1111 | |
kamg@4245 | 1112 | // A "bridge" is a method created by javac to bridge the gap between |
kamg@4245 | 1113 | // an implementation and a generically-compatible, but different, signature. |
kamg@4245 | 1114 | // Bridges have actual bytecode implementation in classfiles. |
kamg@4245 | 1115 | // An "overpass", on the other hand, performs the same function as a bridge |
kamg@4245 | 1116 | // but does not occur in a classfile; the VM creates overpass itself, |
kamg@4245 | 1117 | // when it needs a path to get from a call site to an default method, and |
kamg@4245 | 1118 | // a bridge doesn't exist. |
kamg@4245 | 1119 | static void create_overpasses( |
kamg@4245 | 1120 | GrowableArray<EmptyVtableSlot*>* slots, |
kamg@4245 | 1121 | InstanceKlass* klass, TRAPS) { |
kamg@4245 | 1122 | |
kamg@4245 | 1123 | GrowableArray<Method*> overpasses; |
kamg@4245 | 1124 | BytecodeConstantPool bpool(klass->constants()); |
kamg@4245 | 1125 | |
kamg@4245 | 1126 | for (int i = 0; i < slots->length(); ++i) { |
kamg@4245 | 1127 | EmptyVtableSlot* slot = slots->at(i); |
kamg@4245 | 1128 | |
kamg@4245 | 1129 | if (slot->is_bound()) { |
kamg@4245 | 1130 | MethodFamily* method = slot->get_binding(); |
kamg@4245 | 1131 | int max_stack = 0; |
kamg@4245 | 1132 | BytecodeBuffer buffer; |
kamg@4245 | 1133 | |
kamg@4245 | 1134 | #ifndef PRODUCT |
kamg@4245 | 1135 | if (TraceDefaultMethods) { |
kamg@4245 | 1136 | tty->print("for slot: "); |
kamg@4245 | 1137 | slot->print_on(tty); |
kamg@4245 | 1138 | tty->print_cr(""); |
kamg@4245 | 1139 | if (method->has_target()) { |
kamg@4245 | 1140 | method->print_selected(tty, 1); |
kamg@4245 | 1141 | } else { |
kamg@4245 | 1142 | method->print_exception(tty, 1); |
kamg@4245 | 1143 | } |
kamg@4245 | 1144 | } |
kamg@4245 | 1145 | #endif // ndef PRODUCT |
kamg@4245 | 1146 | if (method->has_target()) { |
kamg@4245 | 1147 | Method* selected = method->get_selected_target(); |
acorn@5681 | 1148 | if (selected->method_holder()->is_interface()) { |
acorn@5681 | 1149 | max_stack = assemble_redirect( |
kamg@4245 | 1150 | &bpool, &buffer, slot->signature(), selected, CHECK); |
acorn@5681 | 1151 | } |
kamg@4245 | 1152 | } else if (method->throws_exception()) { |
kamg@4245 | 1153 | max_stack = assemble_abstract_method_error( |
kamg@4245 | 1154 | &bpool, &buffer, method->get_exception_message(), CHECK); |
kamg@4245 | 1155 | } |
acorn@5681 | 1156 | if (max_stack != 0) { |
acorn@5681 | 1157 | AccessFlags flags = accessFlags_from( |
kamg@4245 | 1158 | JVM_ACC_PUBLIC | JVM_ACC_SYNTHETIC | JVM_ACC_BRIDGE); |
acorn@5681 | 1159 | Method* m = new_method(&bpool, &buffer, slot->name(), slot->signature(), |
kamg@4245 | 1160 | flags, max_stack, slot->size_of_parameters(), |
kamg@4245 | 1161 | ConstMethod::OVERPASS, CHECK); |
acorn@5681 | 1162 | if (m != NULL) { |
acorn@5681 | 1163 | overpasses.push(m); |
acorn@5681 | 1164 | } |
kamg@4245 | 1165 | } |
kamg@4245 | 1166 | } |
kamg@4245 | 1167 | } |
kamg@4245 | 1168 | |
kamg@4245 | 1169 | #ifndef PRODUCT |
kamg@4245 | 1170 | if (TraceDefaultMethods) { |
kamg@4245 | 1171 | tty->print_cr("Created %d overpass methods", overpasses.length()); |
kamg@4245 | 1172 | } |
kamg@4245 | 1173 | #endif // ndef PRODUCT |
kamg@4245 | 1174 | |
kamg@4245 | 1175 | switchover_constant_pool(&bpool, klass, &overpasses, CHECK); |
kamg@4245 | 1176 | merge_in_new_methods(klass, &overpasses, CHECK); |
kamg@4245 | 1177 | } |
kamg@4245 | 1178 | |
kamg@4245 | 1179 | static void sort_methods(GrowableArray<Method*>* methods) { |
kamg@4245 | 1180 | // Note that this must sort using the same key as is used for sorting |
kamg@4245 | 1181 | // methods in InstanceKlass. |
kamg@4245 | 1182 | bool sorted = true; |
kamg@4245 | 1183 | for (int i = methods->length() - 1; i > 0; --i) { |
kamg@4245 | 1184 | for (int j = 0; j < i; ++j) { |
kamg@4245 | 1185 | Method* m1 = methods->at(j); |
kamg@4245 | 1186 | Method* m2 = methods->at(j + 1); |
kamg@4245 | 1187 | if ((uintptr_t)m1->name() > (uintptr_t)m2->name()) { |
kamg@4245 | 1188 | methods->at_put(j, m2); |
kamg@4245 | 1189 | methods->at_put(j + 1, m1); |
kamg@4245 | 1190 | sorted = false; |
kamg@4245 | 1191 | } |
kamg@4245 | 1192 | } |
kamg@4245 | 1193 | if (sorted) break; |
kamg@4245 | 1194 | sorted = true; |
kamg@4245 | 1195 | } |
kamg@4245 | 1196 | #ifdef ASSERT |
kamg@4245 | 1197 | uintptr_t prev = 0; |
kamg@4245 | 1198 | for (int i = 0; i < methods->length(); ++i) { |
kamg@4245 | 1199 | Method* mh = methods->at(i); |
kamg@4245 | 1200 | uintptr_t nv = (uintptr_t)mh->name(); |
kamg@4245 | 1201 | assert(nv >= prev, "Incorrect overpass method ordering"); |
kamg@4245 | 1202 | prev = nv; |
kamg@4245 | 1203 | } |
kamg@4245 | 1204 | #endif |
kamg@4245 | 1205 | } |
kamg@4245 | 1206 | |
kamg@4245 | 1207 | static void merge_in_new_methods(InstanceKlass* klass, |
kamg@4245 | 1208 | GrowableArray<Method*>* new_methods, TRAPS) { |
kamg@4245 | 1209 | |
kamg@4245 | 1210 | enum { ANNOTATIONS, PARAMETERS, DEFAULTS, NUM_ARRAYS }; |
kamg@4245 | 1211 | |
kamg@4245 | 1212 | Array<Method*>* original_methods = klass->methods(); |
kamg@4245 | 1213 | Array<int>* original_ordering = klass->method_ordering(); |
kamg@4245 | 1214 | Array<int>* merged_ordering = Universe::the_empty_int_array(); |
kamg@4245 | 1215 | |
kamg@4245 | 1216 | int new_size = klass->methods()->length() + new_methods->length(); |
kamg@4245 | 1217 | |
kamg@4245 | 1218 | Array<Method*>* merged_methods = MetadataFactory::new_array<Method*>( |
kamg@4245 | 1219 | klass->class_loader_data(), new_size, NULL, CHECK); |
coleenp@4572 | 1220 | |
kamg@4245 | 1221 | if (original_ordering != NULL && original_ordering->length() > 0) { |
kamg@4245 | 1222 | merged_ordering = MetadataFactory::new_array<int>( |
kamg@4245 | 1223 | klass->class_loader_data(), new_size, CHECK); |
kamg@4245 | 1224 | } |
kamg@4245 | 1225 | int method_order_index = klass->methods()->length(); |
kamg@4245 | 1226 | |
kamg@4245 | 1227 | sort_methods(new_methods); |
kamg@4245 | 1228 | |
kamg@4245 | 1229 | // Perform grand merge of existing methods and new methods |
kamg@4245 | 1230 | int orig_idx = 0; |
kamg@4245 | 1231 | int new_idx = 0; |
kamg@4245 | 1232 | |
kamg@4245 | 1233 | for (int i = 0; i < new_size; ++i) { |
kamg@4245 | 1234 | Method* orig_method = NULL; |
kamg@4245 | 1235 | Method* new_method = NULL; |
kamg@4245 | 1236 | if (orig_idx < original_methods->length()) { |
kamg@4245 | 1237 | orig_method = original_methods->at(orig_idx); |
kamg@4245 | 1238 | } |
kamg@4245 | 1239 | if (new_idx < new_methods->length()) { |
kamg@4245 | 1240 | new_method = new_methods->at(new_idx); |
kamg@4245 | 1241 | } |
kamg@4245 | 1242 | |
kamg@4245 | 1243 | if (orig_method != NULL && |
kamg@4245 | 1244 | (new_method == NULL || orig_method->name() < new_method->name())) { |
kamg@4245 | 1245 | merged_methods->at_put(i, orig_method); |
kamg@4245 | 1246 | original_methods->at_put(orig_idx, NULL); |
kamg@4245 | 1247 | if (merged_ordering->length() > 0) { |
kamg@4245 | 1248 | merged_ordering->at_put(i, original_ordering->at(orig_idx)); |
kamg@4245 | 1249 | } |
kamg@4245 | 1250 | ++orig_idx; |
kamg@4245 | 1251 | } else { |
kamg@4245 | 1252 | merged_methods->at_put(i, new_method); |
kamg@4245 | 1253 | if (merged_ordering->length() > 0) { |
kamg@4245 | 1254 | merged_ordering->at_put(i, method_order_index++); |
kamg@4245 | 1255 | } |
kamg@4245 | 1256 | ++new_idx; |
kamg@4245 | 1257 | } |
kamg@4245 | 1258 | // update idnum for new location |
kamg@4245 | 1259 | merged_methods->at(i)->set_method_idnum(i); |
kamg@4245 | 1260 | } |
kamg@4245 | 1261 | |
kamg@4245 | 1262 | // Verify correct order |
kamg@4245 | 1263 | #ifdef ASSERT |
kamg@4245 | 1264 | uintptr_t prev = 0; |
kamg@4245 | 1265 | for (int i = 0; i < merged_methods->length(); ++i) { |
kamg@4245 | 1266 | Method* mo = merged_methods->at(i); |
kamg@4245 | 1267 | uintptr_t nv = (uintptr_t)mo->name(); |
kamg@4245 | 1268 | assert(nv >= prev, "Incorrect method ordering"); |
kamg@4245 | 1269 | prev = nv; |
kamg@4245 | 1270 | } |
kamg@4245 | 1271 | #endif |
kamg@4245 | 1272 | |
kamg@4245 | 1273 | // Replace klass methods with new merged lists |
kamg@4245 | 1274 | klass->set_methods(merged_methods); |
sspitsyn@5209 | 1275 | klass->set_initial_method_idnum(new_size); |
kamg@4245 | 1276 | |
kamg@4245 | 1277 | ClassLoaderData* cld = klass->class_loader_data(); |
kamg@4245 | 1278 | MetadataFactory::free_array(cld, original_methods); |
kamg@4245 | 1279 | if (original_ordering->length() > 0) { |
kamg@4245 | 1280 | klass->set_method_ordering(merged_ordering); |
kamg@4245 | 1281 | MetadataFactory::free_array(cld, original_ordering); |
kamg@4245 | 1282 | } |
kamg@4245 | 1283 | } |
kamg@4245 | 1284 |