kamg@4245: /* hseigel@6256: * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. kamg@4245: * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. kamg@4245: * kamg@4245: * This code is free software; you can redistribute it and/or modify it kamg@4245: * under the terms of the GNU General Public License version 2 only, as kamg@4245: * published by the Free Software Foundation. kamg@4245: * kamg@4245: * This code is distributed in the hope that it will be useful, but WITHOUT kamg@4245: * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or kamg@4245: * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License kamg@4245: * version 2 for more details (a copy is included in the LICENSE file that kamg@4245: * accompanied this code). kamg@4245: * kamg@4245: * You should have received a copy of the GNU General Public License version kamg@4245: * 2 along with this work; if not, write to the Free Software Foundation, kamg@4245: * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. kamg@4245: * kamg@4245: * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA kamg@4245: * or visit www.oracle.com if you need additional information or have any kamg@4245: * questions. kamg@4245: * kamg@4245: */ kamg@4245: kamg@4245: #include "precompiled.hpp" kamg@4245: #include "classfile/bytecodeAssembler.hpp" kamg@4245: #include "classfile/defaultMethods.hpp" kamg@4245: #include "classfile/symbolTable.hpp" kamg@4245: #include "memory/allocation.hpp" kamg@4245: #include "memory/metadataFactory.hpp" kamg@4245: #include "memory/resourceArea.hpp" kamg@4245: #include "runtime/signature.hpp" kamg@4245: #include "runtime/thread.hpp" kamg@4245: #include "oops/instanceKlass.hpp" kamg@4245: #include "oops/klass.hpp" kamg@4245: #include "oops/method.hpp" kamg@4245: #include "utilities/accessFlags.hpp" kamg@4245: #include "utilities/exceptions.hpp" kamg@4245: #include "utilities/ostream.hpp" kamg@4245: #include "utilities/pair.hpp" kamg@4245: #include "utilities/resourceHash.hpp" kamg@4245: kamg@4245: typedef enum { QUALIFIED, DISQUALIFIED } QualifiedState; kamg@4245: kamg@4245: // Because we use an iterative algorithm when iterating over the type kamg@4245: // hierarchy, we can't use traditional scoped objects which automatically do kamg@4245: // cleanup in the destructor when the scope is exited. PseudoScope (and kamg@4245: // PseudoScopeMark) provides a similar functionality, but for when you want a kamg@4245: // scoped object in non-stack memory (such as in resource memory, as we do kamg@4245: // here). You've just got to remember to call 'destroy()' on the scope when kamg@4245: // leaving it (and marks have to be explicitly added). kamg@4245: class PseudoScopeMark : public ResourceObj { kamg@4245: public: kamg@4245: virtual void destroy() = 0; kamg@4245: }; kamg@4245: kamg@4245: class PseudoScope : public ResourceObj { kamg@4245: private: kamg@4245: GrowableArray _marks; kamg@4245: public: kamg@4245: kamg@4245: static PseudoScope* cast(void* data) { kamg@4245: return static_cast(data); kamg@4245: } kamg@4245: kamg@4245: void add_mark(PseudoScopeMark* psm) { kamg@4245: _marks.append(psm); kamg@4245: } kamg@4245: kamg@4245: void destroy() { kamg@4245: for (int i = 0; i < _marks.length(); ++i) { kamg@4245: _marks.at(i)->destroy(); kamg@4245: } kamg@4245: } kamg@4245: }; kamg@4245: kamg@4245: #ifndef PRODUCT kamg@4245: static void print_slot(outputStream* str, Symbol* name, Symbol* signature) { kamg@4245: ResourceMark rm; kamg@4245: str->print("%s%s", name->as_C_string(), signature->as_C_string()); kamg@4245: } kamg@4245: kamg@4245: static void print_method(outputStream* str, Method* mo, bool with_class=true) { kamg@4245: ResourceMark rm; kamg@4245: if (with_class) { kamg@4245: str->print("%s.", mo->klass_name()->as_C_string()); kamg@4245: } kamg@4245: print_slot(str, mo->name(), mo->signature()); kamg@4245: } kamg@4245: #endif // ndef PRODUCT kamg@4245: kamg@4245: /** kamg@4245: * Perform a depth-first iteration over the class hierarchy, applying kamg@4245: * algorithmic logic as it goes. kamg@4245: * kamg@4245: * This class is one half of the inheritance hierarchy analysis mechanism. kamg@4245: * It is meant to be used in conjunction with another class, the algorithm, kamg@4245: * which is indicated by the ALGO template parameter. This class can be kamg@4245: * paired with any algorithm class that provides the required methods. kamg@4245: * kamg@4245: * This class contains all the mechanics for iterating over the class hierarchy kamg@4245: * starting at a particular root, without recursing (thus limiting stack growth kamg@4245: * from this point). It visits each superclass (if present) and superinterface kamg@4245: * in a depth-first manner, with callbacks to the ALGO class as each class is kamg@4245: * encountered (visit()), The algorithm can cut-off further exploration of a kamg@4245: * particular branch by returning 'false' from a visit() call. kamg@4245: * kamg@4245: * The ALGO class, must provide a visit() method, which each of which will be kamg@4245: * called once for each node in the inheritance tree during the iteration. In kamg@4245: * addition, it can provide a memory block via new_node_data(InstanceKlass*), kamg@4245: * which it can use for node-specific storage (and access via the kamg@4245: * current_data() and data_at_depth(int) methods). kamg@4245: * kamg@4245: * Bare minimum needed to be an ALGO class: kamg@4245: * class Algo : public HierarchyVisitor { kamg@4245: * void* new_node_data(InstanceKlass* cls) { return NULL; } kamg@4245: * void free_node_data(void* data) { return; } kamg@4245: * bool visit() { return true; } kamg@4245: * }; kamg@4245: */ kamg@4245: template kamg@4245: class HierarchyVisitor : StackObj { kamg@4245: private: kamg@4245: kamg@4245: class Node : public ResourceObj { kamg@4245: public: kamg@4245: InstanceKlass* _class; kamg@4245: bool _super_was_visited; kamg@4245: int _interface_index; kamg@4245: void* _algorithm_data; kamg@4245: kamg@4245: Node(InstanceKlass* cls, void* data, bool visit_super) kamg@4245: : _class(cls), _super_was_visited(!visit_super), kamg@4245: _interface_index(0), _algorithm_data(data) {} kamg@4245: kamg@4245: int number_of_interfaces() { return _class->local_interfaces()->length(); } kamg@4245: int interface_index() { return _interface_index; } kamg@4245: void set_super_visited() { _super_was_visited = true; } kamg@4245: void increment_visited_interface() { ++_interface_index; } kamg@4245: void set_all_interfaces_visited() { kamg@4245: _interface_index = number_of_interfaces(); kamg@4245: } kamg@4245: bool has_visited_super() { return _super_was_visited; } kamg@4245: bool has_visited_all_interfaces() { kamg@4245: return interface_index() >= number_of_interfaces(); kamg@4245: } kamg@4245: InstanceKlass* interface_at(int index) { kamg@4245: return InstanceKlass::cast(_class->local_interfaces()->at(index)); kamg@4245: } kamg@4245: InstanceKlass* next_super() { return _class->java_super(); } kamg@4245: InstanceKlass* next_interface() { kamg@4245: return interface_at(interface_index()); kamg@4245: } kamg@4245: }; kamg@4245: kamg@4245: bool _cancelled; kamg@4245: GrowableArray _path; kamg@4245: kamg@4245: Node* current_top() const { return _path.top(); } kamg@4245: bool has_more_nodes() const { return !_path.is_empty(); } kamg@4245: void push(InstanceKlass* cls, void* data) { kamg@4245: assert(cls != NULL, "Requires a valid instance class"); kamg@4245: Node* node = new Node(cls, data, has_super(cls)); kamg@4245: _path.push(node); kamg@4245: } kamg@4245: void pop() { _path.pop(); } kamg@4245: kamg@4245: void reset_iteration() { kamg@4245: _cancelled = false; kamg@4245: _path.clear(); kamg@4245: } kamg@4245: bool is_cancelled() const { return _cancelled; } kamg@4245: acorn@6080: // This code used to skip interface classes because their only acorn@6080: // superclass was j.l.Object which would be also covered by class acorn@6080: // superclass hierarchy walks. Now that the starting point can be acorn@6080: // an interface, we must ensure we catch j.l.Object as the super. kamg@4245: static bool has_super(InstanceKlass* cls) { acorn@6080: return cls->super() != NULL; kamg@4245: } kamg@4245: kamg@4245: Node* node_at_depth(int i) const { kamg@4245: return (i >= _path.length()) ? NULL : _path.at(_path.length() - i - 1); kamg@4245: } kamg@4245: kamg@4245: protected: kamg@4245: kamg@4245: // Accessors available to the algorithm kamg@4245: int current_depth() const { return _path.length() - 1; } kamg@4245: kamg@4245: InstanceKlass* class_at_depth(int i) { kamg@4245: Node* n = node_at_depth(i); kamg@4245: return n == NULL ? NULL : n->_class; kamg@4245: } kamg@4245: InstanceKlass* current_class() { return class_at_depth(0); } kamg@4245: kamg@4245: void* data_at_depth(int i) { kamg@4245: Node* n = node_at_depth(i); kamg@4245: return n == NULL ? NULL : n->_algorithm_data; kamg@4245: } kamg@4245: void* current_data() { return data_at_depth(0); } kamg@4245: kamg@4245: void cancel_iteration() { _cancelled = true; } kamg@4245: kamg@4245: public: kamg@4245: kamg@4245: void run(InstanceKlass* root) { kamg@4245: ALGO* algo = static_cast(this); kamg@4245: kamg@4245: reset_iteration(); kamg@4245: kamg@4245: void* algo_data = algo->new_node_data(root); kamg@4245: push(root, algo_data); kamg@4245: bool top_needs_visit = true; kamg@4245: kamg@4245: do { kamg@4245: Node* top = current_top(); kamg@4245: if (top_needs_visit) { kamg@4245: if (algo->visit() == false) { kamg@4245: // algorithm does not want to continue along this path. Arrange kamg@4245: // it so that this state is immediately popped off the stack kamg@4245: top->set_super_visited(); kamg@4245: top->set_all_interfaces_visited(); kamg@4245: } kamg@4245: top_needs_visit = false; kamg@4245: } kamg@4245: kamg@4245: if (top->has_visited_super() && top->has_visited_all_interfaces()) { kamg@4245: algo->free_node_data(top->_algorithm_data); kamg@4245: pop(); kamg@4245: } else { kamg@4245: InstanceKlass* next = NULL; kamg@4245: if (top->has_visited_super() == false) { kamg@4245: next = top->next_super(); kamg@4245: top->set_super_visited(); kamg@4245: } else { kamg@4245: next = top->next_interface(); kamg@4245: top->increment_visited_interface(); kamg@4245: } kamg@4245: assert(next != NULL, "Otherwise we shouldn't be here"); kamg@4245: algo_data = algo->new_node_data(next); kamg@4245: push(next, algo_data); kamg@4245: top_needs_visit = true; kamg@4245: } kamg@4245: } while (!is_cancelled() && has_more_nodes()); kamg@4245: } kamg@4245: }; kamg@4245: kamg@4245: #ifndef PRODUCT kamg@4245: class PrintHierarchy : public HierarchyVisitor { kamg@4245: public: kamg@4245: kamg@4245: bool visit() { kamg@4245: InstanceKlass* cls = current_class(); kamg@4245: streamIndentor si(tty, current_depth() * 2); kamg@4245: tty->indent().print_cr("%s", cls->name()->as_C_string()); kamg@4245: return true; kamg@4245: } kamg@4245: kamg@4245: void* new_node_data(InstanceKlass* cls) { return NULL; } kamg@4245: void free_node_data(void* data) { return; } kamg@4245: }; kamg@4245: #endif // ndef PRODUCT kamg@4245: kamg@4245: // Used to register InstanceKlass objects and all related metadata structures kamg@4245: // (Methods, ConstantPools) as "in-use" by the current thread so that they can't kamg@4245: // be deallocated by class redefinition while we're using them. The classes are kamg@4245: // de-registered when this goes out of scope. kamg@4245: // kamg@4245: // Once a class is registered, we need not bother with methodHandles or kamg@4245: // constantPoolHandles for it's associated metadata. kamg@4245: class KeepAliveRegistrar : public StackObj { kamg@4245: private: kamg@4245: Thread* _thread; kamg@4245: GrowableArray _keep_alive; kamg@4245: kamg@4245: public: kamg@4245: KeepAliveRegistrar(Thread* thread) : _thread(thread), _keep_alive(20) { kamg@4245: assert(thread == Thread::current(), "Must be current thread"); kamg@4245: } kamg@4245: kamg@4245: ~KeepAliveRegistrar() { kamg@4245: for (int i = _keep_alive.length() - 1; i >= 0; --i) { kamg@4245: ConstantPool* cp = _keep_alive.at(i); kamg@4245: int idx = _thread->metadata_handles()->find_from_end(cp); kamg@4245: assert(idx > 0, "Must be in the list"); kamg@4245: _thread->metadata_handles()->remove_at(idx); kamg@4245: } kamg@4245: } kamg@4245: kamg@4245: // Register a class as 'in-use' by the thread. It's fine to register a class kamg@4245: // multiple times (though perhaps inefficient) kamg@4245: void register_class(InstanceKlass* ik) { kamg@4245: ConstantPool* cp = ik->constants(); kamg@4245: _keep_alive.push(cp); kamg@4245: _thread->metadata_handles()->push(cp); kamg@4245: } kamg@4245: }; kamg@4245: kamg@4245: class KeepAliveVisitor : public HierarchyVisitor { kamg@4245: private: kamg@4245: KeepAliveRegistrar* _registrar; kamg@4245: kamg@4245: public: kamg@4245: KeepAliveVisitor(KeepAliveRegistrar* registrar) : _registrar(registrar) {} kamg@4245: kamg@4245: void* new_node_data(InstanceKlass* cls) { return NULL; } kamg@4245: void free_node_data(void* data) { return; } kamg@4245: kamg@4245: bool visit() { kamg@4245: _registrar->register_class(current_class()); kamg@4245: return true; kamg@4245: } kamg@4245: }; kamg@4245: acorn@5377: kamg@4245: // A method family contains a set of all methods that implement a single acorn@5377: // erased method. As members of the set are collected while walking over the kamg@4245: // hierarchy, they are tagged with a qualification state. The qualification kamg@4245: // state for an erased method is set to disqualified if there exists a path kamg@4245: // from the root of hierarchy to the method that contains an interleaving acorn@5377: // erased method defined in an interface. acorn@5377: kamg@4245: class MethodFamily : public ResourceObj { kamg@4245: private: kamg@4245: kamg@4245: GrowableArray > _members; kamg@4245: ResourceHashtable _member_index; kamg@4245: kamg@4245: Method* _selected_target; // Filled in later, if a unique target exists kamg@4245: Symbol* _exception_message; // If no unique target is found acorn@5786: Symbol* _exception_name; // If no unique target is found kamg@4245: kamg@4245: bool contains_method(Method* method) { kamg@4245: int* lookup = _member_index.get(method); kamg@4245: return lookup != NULL; kamg@4245: } kamg@4245: kamg@4245: void add_method(Method* method, QualifiedState state) { kamg@4245: Pair entry(method, state); kamg@4245: _member_index.put(method, _members.length()); kamg@4245: _members.append(entry); kamg@4245: } kamg@4245: kamg@4245: void disqualify_method(Method* method) { kamg@4245: int* index = _member_index.get(method); morris@4778: guarantee(index != NULL && *index >= 0 && *index < _members.length(), "bad index"); kamg@4245: _members.at(*index).second = DISQUALIFIED; kamg@4245: } kamg@4245: kamg@4245: Symbol* generate_no_defaults_message(TRAPS) const; hseigel@6195: Symbol* generate_method_message(Symbol *klass_name, Method* method, TRAPS) const; kamg@4245: Symbol* generate_conflicts_message(GrowableArray* methods, TRAPS) const; kamg@4245: kamg@4245: public: kamg@4245: acorn@5377: MethodFamily() acorn@5786: : _selected_target(NULL), _exception_message(NULL), _exception_name(NULL) {} kamg@4245: kamg@4245: void set_target_if_empty(Method* m) { kamg@4245: if (_selected_target == NULL && !m->is_overpass()) { kamg@4245: _selected_target = m; kamg@4245: } kamg@4245: } kamg@4245: kamg@4245: void record_qualified_method(Method* m) { kamg@4245: // If the method already exists in the set as qualified, this operation is kamg@4245: // redundant. If it already exists as disqualified, then we leave it as kamg@4245: // disqualfied. Thus we only add to the set if it's not already in the kamg@4245: // set. kamg@4245: if (!contains_method(m)) { kamg@4245: add_method(m, QUALIFIED); kamg@4245: } kamg@4245: } kamg@4245: kamg@4245: void record_disqualified_method(Method* m) { kamg@4245: // If not in the set, add it as disqualified. If it's already in the set, kamg@4245: // then set the state to disqualified no matter what the previous state was. kamg@4245: if (!contains_method(m)) { kamg@4245: add_method(m, DISQUALIFIED); kamg@4245: } else { kamg@4245: disqualify_method(m); kamg@4245: } kamg@4245: } kamg@4245: kamg@4245: bool has_target() const { return _selected_target != NULL; } kamg@4245: bool throws_exception() { return _exception_message != NULL; } kamg@4245: kamg@4245: Method* get_selected_target() { return _selected_target; } kamg@4245: Symbol* get_exception_message() { return _exception_message; } acorn@5786: Symbol* get_exception_name() { return _exception_name; } kamg@4245: hseigel@6256: // Return true if the specified klass has a static method that matches hseigel@6256: // the name and signature of the target method. hseigel@6256: bool has_matching_static(InstanceKlass* root) { hseigel@6256: if (_members.length() > 0) { hseigel@6256: Pair entry = _members.at(0); hseigel@6256: Method* impl = root->find_method(entry.first->name(), hseigel@6256: entry.first->signature()); hseigel@6256: if ((impl != NULL) && impl->is_static()) { hseigel@6256: return true; hseigel@6256: } hseigel@6256: } hseigel@6256: return false; hseigel@6256: } hseigel@6256: kamg@4245: // Either sets the target or the exception error message kamg@4245: void determine_target(InstanceKlass* root, TRAPS) { kamg@4245: if (has_target() || throws_exception()) { kamg@4245: return; kamg@4245: } kamg@4245: acorn@6080: // Qualified methods are maximally-specific methods acorn@6080: // These include public, instance concrete (=default) and abstract methods kamg@4245: GrowableArray qualified_methods; acorn@6060: int num_defaults = 0; acorn@6060: int default_index = -1; acorn@6080: int qualified_index = -1; kamg@4245: for (int i = 0; i < _members.length(); ++i) { kamg@4245: Pair entry = _members.at(i); kamg@4245: if (entry.second == QUALIFIED) { kamg@4245: qualified_methods.append(entry.first); acorn@6080: qualified_index++; acorn@6060: if (entry.first->is_default_method()) { acorn@6060: num_defaults++; acorn@6080: default_index = qualified_index; acorn@6080: acorn@6060: } kamg@4245: } kamg@4245: } kamg@4245: hseigel@6195: if (num_defaults == 0) { hseigel@6256: // If the root klass has a static method with matching name and signature hseigel@6256: // then do not generate an overpass method because it will hide the hseigel@6256: // static method during resolution. hseigel@6256: if (!has_matching_static(root)) { hseigel@6256: if (qualified_methods.length() == 0) { hseigel@6256: _exception_message = generate_no_defaults_message(CHECK); hseigel@6256: } else { hseigel@6256: assert(root != NULL, "Null root class"); hseigel@6256: _exception_message = generate_method_message(root->name(), qualified_methods.at(0), CHECK); hseigel@6256: } hseigel@6256: _exception_name = vmSymbols::java_lang_AbstractMethodError(); hseigel@6195: } hseigel@6256: acorn@6080: // If only one qualified method is default, select that acorn@6060: } else if (num_defaults == 1) { acorn@6060: _selected_target = qualified_methods.at(default_index); hseigel@6256: hseigel@6256: } else if (num_defaults > 1 && !has_matching_static(root)) { hseigel@6256: _exception_message = generate_conflicts_message(&qualified_methods,CHECK); hseigel@6256: _exception_name = vmSymbols::java_lang_IncompatibleClassChangeError(); acorn@5848: if (TraceDefaultMethods) { acorn@5848: _exception_message->print_value_on(tty); acorn@5848: tty->print_cr(""); acorn@5848: } kamg@4245: } kamg@4245: } kamg@4245: kamg@4245: bool contains_signature(Symbol* query) { kamg@4245: for (int i = 0; i < _members.length(); ++i) { kamg@4245: if (query == _members.at(i).first->signature()) { kamg@4245: return true; kamg@4245: } kamg@4245: } kamg@4245: return false; kamg@4245: } kamg@4245: kamg@4245: #ifndef PRODUCT acorn@5377: void print_sig_on(outputStream* str, Symbol* signature, int indent) const { kamg@4245: streamIndentor si(str, indent * 2); kamg@4245: acorn@5377: str->indent().print_cr("Logical Method %s:", signature->as_C_string()); kamg@4245: kamg@4245: streamIndentor si2(str); kamg@4245: for (int i = 0; i < _members.length(); ++i) { kamg@4245: str->indent(); kamg@4245: print_method(str, _members.at(i).first); kamg@4245: if (_members.at(i).second == DISQUALIFIED) { kamg@4245: str->print(" (disqualified)"); kamg@4245: } kamg@4245: str->print_cr(""); kamg@4245: } kamg@4245: kamg@4245: if (_selected_target != NULL) { kamg@4245: print_selected(str, 1); kamg@4245: } kamg@4245: } kamg@4245: kamg@4245: void print_selected(outputStream* str, int indent) const { kamg@4245: assert(has_target(), "Should be called otherwise"); kamg@4245: streamIndentor si(str, indent * 2); kamg@4245: str->indent().print("Selected method: "); kamg@4245: print_method(str, _selected_target); acorn@5681: Klass* method_holder = _selected_target->method_holder(); acorn@5681: if (!method_holder->is_interface()) { acorn@5681: tty->print(" : in superclass"); acorn@5681: } kamg@4245: str->print_cr(""); kamg@4245: } kamg@4245: kamg@4245: void print_exception(outputStream* str, int indent) { kamg@4245: assert(throws_exception(), "Should be called otherwise"); acorn@5786: assert(_exception_name != NULL, "exception_name should be set"); kamg@4245: streamIndentor si(str, indent * 2); acorn@5786: str->indent().print_cr("%s: %s", _exception_name->as_C_string(), _exception_message->as_C_string()); kamg@4245: } kamg@4245: #endif // ndef PRODUCT kamg@4245: }; kamg@4245: kamg@4245: Symbol* MethodFamily::generate_no_defaults_message(TRAPS) const { kamg@4245: return SymbolTable::new_symbol("No qualifying defaults found", CHECK_NULL); kamg@4245: } kamg@4245: hseigel@6195: Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method, TRAPS) const { hseigel@6195: stringStream ss; hseigel@6195: ss.print("Method "); hseigel@6195: Symbol* name = method->name(); hseigel@6195: Symbol* signature = method->signature(); hseigel@6195: ss.write((const char*)klass_name->bytes(), klass_name->utf8_length()); hseigel@6195: ss.print("."); hseigel@6195: ss.write((const char*)name->bytes(), name->utf8_length()); hseigel@6195: ss.write((const char*)signature->bytes(), signature->utf8_length()); hseigel@6195: ss.print(" is abstract"); hseigel@6195: return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL); hseigel@6195: } hseigel@6195: kamg@4245: Symbol* MethodFamily::generate_conflicts_message(GrowableArray* methods, TRAPS) const { kamg@4245: stringStream ss; kamg@4245: ss.print("Conflicting default methods:"); kamg@4245: for (int i = 0; i < methods->length(); ++i) { kamg@4245: Method* method = methods->at(i); kamg@4245: Symbol* klass = method->klass_name(); kamg@4245: Symbol* name = method->name(); kamg@4245: ss.print(" "); kamg@4245: ss.write((const char*)klass->bytes(), klass->utf8_length()); kamg@4245: ss.print("."); kamg@4245: ss.write((const char*)name->bytes(), name->utf8_length()); kamg@4245: } kamg@4245: return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL); kamg@4245: } kamg@4245: acorn@5377: kamg@4245: class StateRestorer; kamg@4245: acorn@5377: // StatefulMethodFamily is a wrapper around a MethodFamily that maintains the kamg@4245: // qualification state during hierarchy visitation, and applies that state acorn@5377: // when adding members to the MethodFamily kamg@4245: class StatefulMethodFamily : public ResourceObj { kamg@4245: friend class StateRestorer; kamg@4245: private: kamg@4245: QualifiedState _qualification_state; kamg@4245: kamg@4245: void set_qualification_state(QualifiedState state) { kamg@4245: _qualification_state = state; kamg@4245: } kamg@4245: acorn@5377: protected: acorn@5377: MethodFamily* _method_family; acorn@5377: kamg@4245: public: acorn@5377: StatefulMethodFamily() { acorn@5377: _method_family = new MethodFamily(); acorn@5377: _qualification_state = QUALIFIED; kamg@4245: } kamg@4245: acorn@5377: StatefulMethodFamily(MethodFamily* mf) { acorn@5377: _method_family = mf; acorn@5377: _qualification_state = QUALIFIED; acorn@5377: } kamg@4245: acorn@5377: void set_target_if_empty(Method* m) { _method_family->set_target_if_empty(m); } acorn@5377: acorn@5377: MethodFamily* get_method_family() { return _method_family; } acorn@5377: acorn@5377: StateRestorer* record_method_and_dq_further(Method* mo); acorn@5377: }; acorn@5377: kamg@4245: class StateRestorer : public PseudoScopeMark { kamg@4245: private: kamg@4245: StatefulMethodFamily* _method; kamg@4245: QualifiedState _state_to_restore; kamg@4245: public: kamg@4245: StateRestorer(StatefulMethodFamily* dm, QualifiedState state) kamg@4245: : _method(dm), _state_to_restore(state) {} kamg@4245: ~StateRestorer() { destroy(); } kamg@4245: void restore_state() { _method->set_qualification_state(_state_to_restore); } kamg@4245: virtual void destroy() { restore_state(); } kamg@4245: }; kamg@4245: kamg@4245: StateRestorer* StatefulMethodFamily::record_method_and_dq_further(Method* mo) { kamg@4245: StateRestorer* mark = new StateRestorer(this, _qualification_state); kamg@4245: if (_qualification_state == QUALIFIED) { acorn@5377: _method_family->record_qualified_method(mo); kamg@4245: } else { acorn@5377: _method_family->record_disqualified_method(mo); kamg@4245: } kamg@4245: // Everything found "above"??? this method in the hierarchy walk is set to kamg@4245: // disqualified kamg@4245: set_qualification_state(DISQUALIFIED); kamg@4245: return mark; kamg@4245: } kamg@4245: kamg@4245: // Represents a location corresponding to a vtable slot for methods that kamg@4245: // neither the class nor any of it's ancestors provide an implementaion. kamg@4245: // Default methods may be present to fill this slot. kamg@4245: class EmptyVtableSlot : public ResourceObj { kamg@4245: private: kamg@4245: Symbol* _name; kamg@4245: Symbol* _signature; kamg@4245: int _size_of_parameters; kamg@4245: MethodFamily* _binding; kamg@4245: kamg@4245: public: kamg@4245: EmptyVtableSlot(Method* method) kamg@4245: : _name(method->name()), _signature(method->signature()), kamg@4245: _size_of_parameters(method->size_of_parameters()), _binding(NULL) {} kamg@4245: kamg@4245: Symbol* name() const { return _name; } kamg@4245: Symbol* signature() const { return _signature; } kamg@4245: int size_of_parameters() const { return _size_of_parameters; } kamg@4245: kamg@4245: void bind_family(MethodFamily* lm) { _binding = lm; } kamg@4245: bool is_bound() { return _binding != NULL; } kamg@4245: MethodFamily* get_binding() { return _binding; } kamg@4245: kamg@4245: #ifndef PRODUCT kamg@4245: void print_on(outputStream* str) const { kamg@4245: print_slot(str, name(), signature()); kamg@4245: } kamg@4245: #endif // ndef PRODUCT kamg@4245: }; kamg@4245: acorn@5848: static bool already_in_vtable_slots(GrowableArray* slots, Method* m) { acorn@5848: bool found = false; acorn@5848: for (int j = 0; j < slots->length(); ++j) { acorn@5848: if (slots->at(j)->name() == m->name() && acorn@5848: slots->at(j)->signature() == m->signature() ) { acorn@5848: found = true; acorn@5848: break; acorn@5848: } acorn@5848: } acorn@5848: return found; acorn@5848: } acorn@5848: kamg@4245: static GrowableArray* find_empty_vtable_slots( kamg@4245: InstanceKlass* klass, GrowableArray* mirandas, TRAPS) { kamg@4245: kamg@4245: assert(klass != NULL, "Must be valid class"); kamg@4245: kamg@4245: GrowableArray* slots = new GrowableArray(); kamg@4245: kamg@4245: // All miranda methods are obvious candidates kamg@4245: for (int i = 0; i < mirandas->length(); ++i) { acorn@5848: Method* m = mirandas->at(i); acorn@5848: if (!already_in_vtable_slots(slots, m)) { acorn@5848: slots->append(new EmptyVtableSlot(m)); acorn@5848: } kamg@4245: } kamg@4245: kamg@4245: // Also any overpasses in our superclasses, that we haven't implemented. kamg@4245: // (can't use the vtable because it is not guaranteed to be initialized yet) kamg@4245: InstanceKlass* super = klass->java_super(); kamg@4245: while (super != NULL) { kamg@4245: for (int i = 0; i < super->methods()->length(); ++i) { kamg@4245: Method* m = super->methods()->at(i); acorn@6145: if (m->is_overpass() || m->is_static()) { kamg@4245: // m is a method that would have been a miranda if not for the kamg@4245: // default method processing that occurred on behalf of our superclass, kamg@4245: // so it's a method we want to re-examine in this new context. That is, kamg@4245: // unless we have a real implementation of it in the current class. kamg@4245: Method* impl = klass->lookup_method(m->name(), m->signature()); acorn@6145: if (impl == NULL || impl->is_overpass() || impl->is_static()) { acorn@5848: if (!already_in_vtable_slots(slots, m)) { acorn@5848: slots->append(new EmptyVtableSlot(m)); acorn@5848: } acorn@5848: } acorn@5848: } acorn@5848: } acorn@5848: acorn@5848: // also any default methods in our superclasses acorn@5848: if (super->default_methods() != NULL) { acorn@5848: for (int i = 0; i < super->default_methods()->length(); ++i) { acorn@5848: Method* m = super->default_methods()->at(i); acorn@5848: // m is a method that would have been a miranda if not for the acorn@5848: // default method processing that occurred on behalf of our superclass, acorn@5848: // so it's a method we want to re-examine in this new context. That is, acorn@5848: // unless we have a real implementation of it in the current class. acorn@5848: Method* impl = klass->lookup_method(m->name(), m->signature()); acorn@6145: if (impl == NULL || impl->is_overpass() || impl->is_static()) { acorn@5848: if (!already_in_vtable_slots(slots, m)) { acorn@5848: slots->append(new EmptyVtableSlot(m)); acorn@5848: } kamg@4245: } kamg@4245: } kamg@4245: } kamg@4245: super = super->java_super(); kamg@4245: } kamg@4245: kamg@4245: #ifndef PRODUCT kamg@4245: if (TraceDefaultMethods) { kamg@4245: tty->print_cr("Slots that need filling:"); kamg@4245: streamIndentor si(tty); kamg@4245: for (int i = 0; i < slots->length(); ++i) { kamg@4245: tty->indent(); kamg@4245: slots->at(i)->print_on(tty); kamg@4245: tty->print_cr(""); kamg@4245: } kamg@4245: } kamg@4245: #endif // ndef PRODUCT kamg@4245: return slots; kamg@4245: } kamg@4245: acorn@5377: // Iterates over the superinterface type hierarchy looking for all methods acorn@5377: // with a specific erased signature. acorn@5377: class FindMethodsByErasedSig : public HierarchyVisitor { acorn@5377: private: acorn@5377: // Context data acorn@5377: Symbol* _method_name; acorn@5377: Symbol* _method_signature; acorn@5377: StatefulMethodFamily* _family; acorn@5377: acorn@5377: public: acorn@5377: FindMethodsByErasedSig(Symbol* name, Symbol* signature) : acorn@5377: _method_name(name), _method_signature(signature), acorn@5377: _family(NULL) {} acorn@5377: acorn@5377: void get_discovered_family(MethodFamily** family) { acorn@5377: if (_family != NULL) { acorn@5377: *family = _family->get_method_family(); acorn@5377: } else { acorn@5377: *family = NULL; acorn@5377: } acorn@5377: } acorn@5377: acorn@5377: void* new_node_data(InstanceKlass* cls) { return new PseudoScope(); } acorn@5377: void free_node_data(void* node_data) { acorn@5377: PseudoScope::cast(node_data)->destroy(); acorn@5377: } acorn@5377: acorn@5377: // Find all methods on this hierarchy that match this acorn@5377: // method's erased (name, signature) acorn@5377: bool visit() { acorn@5377: PseudoScope* scope = PseudoScope::cast(current_data()); acorn@5377: InstanceKlass* iklass = current_class(); acorn@5377: acorn@5377: Method* m = iklass->find_method(_method_name, _method_signature); acorn@5786: // private interface methods are not candidates for default methods acorn@5786: // invokespecial to private interface methods doesn't use default method logic acorn@6080: // The overpasses are your supertypes' errors, we do not include them acorn@5786: // future: take access controls into account for superclass methods acorn@6080: if (m != NULL && !m->is_static() && !m->is_overpass() && acorn@6080: (!iklass->is_interface() || m->is_public())) { acorn@5377: if (_family == NULL) { acorn@5377: _family = new StatefulMethodFamily(); acorn@5377: } acorn@5377: acorn@5377: if (iklass->is_interface()) { acorn@5377: StateRestorer* restorer = _family->record_method_and_dq_further(m); acorn@5377: scope->add_mark(restorer); acorn@5377: } else { acorn@5377: // This is the rule that methods in classes "win" (bad word) over acorn@5377: // methods in interfaces. This works because of single inheritance acorn@5377: _family->set_target_if_empty(m); acorn@5377: } acorn@5377: } acorn@5377: return true; acorn@5377: } acorn@5377: acorn@5377: }; acorn@5377: kamg@4245: kamg@4245: acorn@5848: static void create_defaults_and_exceptions( acorn@5377: GrowableArray* slots, InstanceKlass* klass, TRAPS); acorn@5377: acorn@5377: static void generate_erased_defaults( acorn@5377: InstanceKlass* klass, GrowableArray* empty_slots, acorn@5377: EmptyVtableSlot* slot, TRAPS) { acorn@5377: acorn@5377: // sets up a set of methods with the same exact erased signature acorn@5377: FindMethodsByErasedSig visitor(slot->name(), slot->signature()); acorn@5377: visitor.run(klass); acorn@5377: acorn@5377: MethodFamily* family; acorn@5377: visitor.get_discovered_family(&family); acorn@5377: if (family != NULL) { acorn@5377: family->determine_target(klass, CHECK); acorn@5377: slot->bind_family(family); acorn@5377: } acorn@5377: } acorn@5377: kamg@4245: static void merge_in_new_methods(InstanceKlass* klass, kamg@4245: GrowableArray* new_methods, TRAPS); acorn@5848: static void create_default_methods( InstanceKlass* klass, acorn@5848: GrowableArray* new_methods, TRAPS); kamg@4245: kamg@4245: // This is the guts of the default methods implementation. This is called just kamg@4245: // after the classfile has been parsed if some ancestor has default methods. kamg@4245: // kamg@4245: // First if finds any name/signature slots that need any implementation (either kamg@4245: // because they are miranda or a superclass's implementation is an overpass acorn@5599: // itself). For each slot, iterate over the hierarchy, to see if they contain a acorn@5599: // signature that matches the slot we are looking at. kamg@4245: // kamg@4245: // For each slot filled, we generate an overpass method that either calls the kamg@4245: // unique default method candidate using invokespecial, or throws an exception kamg@4245: // (in the case of no default method candidates, or more than one valid acorn@5599: // candidate). These methods are then added to the class's method list. acorn@5599: // The JVM does not create bridges nor handle generic signatures here. kamg@4245: void DefaultMethods::generate_default_methods( kamg@4245: InstanceKlass* klass, GrowableArray* mirandas, TRAPS) { kamg@4245: kamg@4245: // This resource mark is the bound for all memory allocation that takes kamg@4245: // place during default method processing. After this goes out of scope, kamg@4245: // all (Resource) objects' memory will be reclaimed. Be careful if adding an kamg@4245: // embedded resource mark under here as that memory can't be used outside kamg@4245: // whatever scope it's in. kamg@4245: ResourceMark rm(THREAD); kamg@4245: kamg@4245: // Keep entire hierarchy alive for the duration of the computation kamg@4245: KeepAliveRegistrar keepAlive(THREAD); kamg@4245: KeepAliveVisitor loadKeepAlive(&keepAlive); kamg@4245: loadKeepAlive.run(klass); kamg@4245: kamg@4245: #ifndef PRODUCT kamg@4245: if (TraceDefaultMethods) { kamg@4245: ResourceMark rm; // be careful with these! acorn@6080: tty->print_cr("%s %s requires default method processing", acorn@6080: klass->is_interface() ? "Interface" : "Class", kamg@4245: klass->name()->as_klass_external_name()); kamg@4245: PrintHierarchy printer; kamg@4245: printer.run(klass); kamg@4245: } kamg@4245: #endif // ndef PRODUCT kamg@4245: kamg@4245: GrowableArray* empty_slots = kamg@4245: find_empty_vtable_slots(klass, mirandas, CHECK); kamg@4245: kamg@4245: for (int i = 0; i < empty_slots->length(); ++i) { kamg@4245: EmptyVtableSlot* slot = empty_slots->at(i); kamg@4245: #ifndef PRODUCT kamg@4245: if (TraceDefaultMethods) { kamg@4245: streamIndentor si(tty, 2); kamg@4245: tty->indent().print("Looking for default methods for slot "); kamg@4245: slot->print_on(tty); kamg@4245: tty->print_cr(""); kamg@4245: } kamg@4245: #endif // ndef PRODUCT acorn@5377: acorn@5599: generate_erased_defaults(klass, empty_slots, slot, CHECK); acorn@5377: } kamg@4245: #ifndef PRODUCT kamg@4245: if (TraceDefaultMethods) { acorn@6080: tty->print_cr("Creating defaults and overpasses..."); kamg@4245: } kamg@4245: #endif // ndef PRODUCT kamg@4245: acorn@5848: create_defaults_and_exceptions(empty_slots, klass, CHECK); kamg@4245: kamg@4245: #ifndef PRODUCT kamg@4245: if (TraceDefaultMethods) { kamg@4245: tty->print_cr("Default method processing complete"); kamg@4245: } kamg@4245: #endif // ndef PRODUCT kamg@4245: } kamg@4245: acorn@5786: static int assemble_method_error( acorn@5786: BytecodeConstantPool* cp, BytecodeBuffer* buffer, Symbol* errorName, Symbol* message, TRAPS) { kamg@4245: kamg@4245: Symbol* init = vmSymbols::object_initializer_name(); kamg@4245: Symbol* sig = vmSymbols::string_void_signature(); kamg@4245: kamg@4245: BytecodeAssembler assem(buffer, cp); kamg@4245: kamg@4245: assem._new(errorName); kamg@4245: assem.dup(); kamg@4245: assem.load_string(message); kamg@4245: assem.invokespecial(errorName, init, sig); kamg@4245: assem.athrow(); kamg@4245: kamg@4245: return 3; // max stack size: [ exception, exception, string ] kamg@4245: } kamg@4245: kamg@4245: static Method* new_method( kamg@4245: BytecodeConstantPool* cp, BytecodeBuffer* bytecodes, Symbol* name, kamg@4245: Symbol* sig, AccessFlags flags, int max_stack, int params, kamg@4245: ConstMethod::MethodType mt, TRAPS) { kamg@4245: acorn@5377: address code_start = 0; acorn@5377: int code_length = 0; coleenp@4572: InlineTableSizes sizes; kamg@4245: acorn@5377: if (bytecodes != NULL && bytecodes->length() > 0) { acorn@5377: code_start = static_cast
(bytecodes->adr_at(0)); acorn@5377: code_length = bytecodes->length(); acorn@5377: } acorn@5377: kamg@4245: Method* m = Method::allocate(cp->pool_holder()->class_loader_data(), coleenp@4572: code_length, flags, &sizes, coleenp@4398: mt, CHECK_NULL); kamg@4245: kamg@4245: m->set_constants(NULL); // This will get filled in later kamg@4245: m->set_name_index(cp->utf8(name)); kamg@4245: m->set_signature_index(cp->utf8(sig)); kamg@4245: #ifdef CC_INTERP kamg@4245: ResultTypeFinder rtf(sig); kamg@4245: m->set_result_index(rtf.type()); kamg@4245: #endif kamg@4245: m->set_size_of_parameters(params); kamg@4245: m->set_max_stack(max_stack); kamg@4245: m->set_max_locals(params); kamg@4245: m->constMethod()->set_stackmap_data(NULL); kamg@4245: m->set_code(code_start); kamg@4245: kamg@4245: return m; kamg@4245: } kamg@4245: kamg@4245: static void switchover_constant_pool(BytecodeConstantPool* bpool, kamg@4245: InstanceKlass* klass, GrowableArray* new_methods, TRAPS) { kamg@4245: kamg@4245: if (new_methods->length() > 0) { kamg@4245: ConstantPool* cp = bpool->create_constant_pool(CHECK); kamg@4245: if (cp != klass->constants()) { kamg@4245: klass->class_loader_data()->add_to_deallocate_list(klass->constants()); kamg@4245: klass->set_constants(cp); kamg@4245: cp->set_pool_holder(klass); kamg@4245: kamg@4245: for (int i = 0; i < new_methods->length(); ++i) { kamg@4245: new_methods->at(i)->set_constants(cp); kamg@4245: } kamg@4245: for (int i = 0; i < klass->methods()->length(); ++i) { kamg@4245: Method* mo = klass->methods()->at(i); kamg@4245: mo->set_constants(cp); kamg@4245: } kamg@4245: } kamg@4245: } kamg@4245: } kamg@4245: acorn@5848: // Create default_methods list for the current class. acorn@5848: // With the VM only processing erased signatures, the VM only acorn@5848: // creates an overpass in a conflict case or a case with no candidates. acorn@5848: // This allows virtual methods to override the overpass, but ensures acorn@5848: // that a local method search will find the exception rather than an abstract acorn@5848: // or default method that is not a valid candidate. acorn@5848: static void create_defaults_and_exceptions( kamg@4245: GrowableArray* slots, kamg@4245: InstanceKlass* klass, TRAPS) { kamg@4245: kamg@4245: GrowableArray overpasses; acorn@5848: GrowableArray defaults; kamg@4245: BytecodeConstantPool bpool(klass->constants()); kamg@4245: kamg@4245: for (int i = 0; i < slots->length(); ++i) { kamg@4245: EmptyVtableSlot* slot = slots->at(i); kamg@4245: kamg@4245: if (slot->is_bound()) { kamg@4245: MethodFamily* method = slot->get_binding(); kamg@4245: BytecodeBuffer buffer; kamg@4245: kamg@4245: #ifndef PRODUCT kamg@4245: if (TraceDefaultMethods) { kamg@4245: tty->print("for slot: "); kamg@4245: slot->print_on(tty); kamg@4245: tty->print_cr(""); kamg@4245: if (method->has_target()) { kamg@4245: method->print_selected(tty, 1); acorn@5848: } else if (method->throws_exception()) { kamg@4245: method->print_exception(tty, 1); kamg@4245: } kamg@4245: } kamg@4245: #endif // ndef PRODUCT acorn@5848: kamg@4245: if (method->has_target()) { kamg@4245: Method* selected = method->get_selected_target(); acorn@5681: if (selected->method_holder()->is_interface()) { acorn@5848: defaults.push(selected); acorn@5681: } kamg@4245: } else if (method->throws_exception()) { acorn@5848: int max_stack = assemble_method_error(&bpool, &buffer, acorn@5848: method->get_exception_name(), method->get_exception_message(), CHECK); acorn@5681: AccessFlags flags = accessFlags_from( kamg@4245: JVM_ACC_PUBLIC | JVM_ACC_SYNTHETIC | JVM_ACC_BRIDGE); acorn@5848: Method* m = new_method(&bpool, &buffer, slot->name(), slot->signature(), kamg@4245: flags, max_stack, slot->size_of_parameters(), kamg@4245: ConstMethod::OVERPASS, CHECK); acorn@5848: // We push to the methods list: acorn@5848: // overpass methods which are exception throwing methods acorn@5681: if (m != NULL) { acorn@5681: overpasses.push(m); acorn@5681: } kamg@4245: } kamg@4245: } kamg@4245: } kamg@4245: kamg@4245: #ifndef PRODUCT kamg@4245: if (TraceDefaultMethods) { kamg@4245: tty->print_cr("Created %d overpass methods", overpasses.length()); acorn@5848: tty->print_cr("Created %d default methods", defaults.length()); kamg@4245: } kamg@4245: #endif // ndef PRODUCT kamg@4245: acorn@5848: if (overpasses.length() > 0) { acorn@5848: switchover_constant_pool(&bpool, klass, &overpasses, CHECK); acorn@5848: merge_in_new_methods(klass, &overpasses, CHECK); acorn@5848: } acorn@5848: if (defaults.length() > 0) { acorn@5848: create_default_methods(klass, &defaults, CHECK); acorn@5848: } acorn@5848: } acorn@5848: acorn@5848: static void create_default_methods( InstanceKlass* klass, acorn@5848: GrowableArray* new_methods, TRAPS) { acorn@5848: acorn@5848: int new_size = new_methods->length(); acorn@5848: Array* total_default_methods = MetadataFactory::new_array( acorn@5848: klass->class_loader_data(), new_size, NULL, CHECK); acorn@5848: for (int index = 0; index < new_size; index++ ) { acorn@5848: total_default_methods->at_put(index, new_methods->at(index)); acorn@5848: } acorn@5848: Method::sort_methods(total_default_methods, false, false); acorn@5848: acorn@5848: klass->set_default_methods(total_default_methods); kamg@4245: } kamg@4245: kamg@4245: static void sort_methods(GrowableArray* methods) { kamg@4245: // Note that this must sort using the same key as is used for sorting kamg@4245: // methods in InstanceKlass. kamg@4245: bool sorted = true; kamg@4245: for (int i = methods->length() - 1; i > 0; --i) { kamg@4245: for (int j = 0; j < i; ++j) { kamg@4245: Method* m1 = methods->at(j); kamg@4245: Method* m2 = methods->at(j + 1); kamg@4245: if ((uintptr_t)m1->name() > (uintptr_t)m2->name()) { kamg@4245: methods->at_put(j, m2); kamg@4245: methods->at_put(j + 1, m1); kamg@4245: sorted = false; kamg@4245: } kamg@4245: } kamg@4245: if (sorted) break; kamg@4245: sorted = true; kamg@4245: } kamg@4245: #ifdef ASSERT kamg@4245: uintptr_t prev = 0; kamg@4245: for (int i = 0; i < methods->length(); ++i) { kamg@4245: Method* mh = methods->at(i); kamg@4245: uintptr_t nv = (uintptr_t)mh->name(); kamg@4245: assert(nv >= prev, "Incorrect overpass method ordering"); kamg@4245: prev = nv; kamg@4245: } kamg@4245: #endif kamg@4245: } kamg@4245: kamg@4245: static void merge_in_new_methods(InstanceKlass* klass, kamg@4245: GrowableArray* new_methods, TRAPS) { kamg@4245: kamg@4245: enum { ANNOTATIONS, PARAMETERS, DEFAULTS, NUM_ARRAYS }; kamg@4245: kamg@4245: Array* original_methods = klass->methods(); kamg@4245: Array* original_ordering = klass->method_ordering(); kamg@4245: Array* merged_ordering = Universe::the_empty_int_array(); kamg@4245: kamg@4245: int new_size = klass->methods()->length() + new_methods->length(); kamg@4245: kamg@4245: Array* merged_methods = MetadataFactory::new_array( kamg@4245: klass->class_loader_data(), new_size, NULL, CHECK); coleenp@4572: coleenp@6196: // original_ordering might be empty if this class has no methods of its own coleenp@6196: if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) { kamg@4245: merged_ordering = MetadataFactory::new_array( kamg@4245: klass->class_loader_data(), new_size, CHECK); kamg@4245: } kamg@4245: int method_order_index = klass->methods()->length(); kamg@4245: kamg@4245: sort_methods(new_methods); kamg@4245: kamg@4245: // Perform grand merge of existing methods and new methods kamg@4245: int orig_idx = 0; kamg@4245: int new_idx = 0; kamg@4245: kamg@4245: for (int i = 0; i < new_size; ++i) { kamg@4245: Method* orig_method = NULL; kamg@4245: Method* new_method = NULL; kamg@4245: if (orig_idx < original_methods->length()) { kamg@4245: orig_method = original_methods->at(orig_idx); kamg@4245: } kamg@4245: if (new_idx < new_methods->length()) { kamg@4245: new_method = new_methods->at(new_idx); kamg@4245: } kamg@4245: kamg@4245: if (orig_method != NULL && kamg@4245: (new_method == NULL || orig_method->name() < new_method->name())) { kamg@4245: merged_methods->at_put(i, orig_method); kamg@4245: original_methods->at_put(orig_idx, NULL); kamg@4245: if (merged_ordering->length() > 0) { coleenp@6196: assert(original_ordering != NULL && original_ordering->length() > 0, coleenp@6196: "should have original order information for this method"); kamg@4245: merged_ordering->at_put(i, original_ordering->at(orig_idx)); kamg@4245: } kamg@4245: ++orig_idx; kamg@4245: } else { kamg@4245: merged_methods->at_put(i, new_method); kamg@4245: if (merged_ordering->length() > 0) { kamg@4245: merged_ordering->at_put(i, method_order_index++); kamg@4245: } kamg@4245: ++new_idx; kamg@4245: } kamg@4245: // update idnum for new location kamg@4245: merged_methods->at(i)->set_method_idnum(i); kamg@4245: } kamg@4245: kamg@4245: // Verify correct order kamg@4245: #ifdef ASSERT kamg@4245: uintptr_t prev = 0; kamg@4245: for (int i = 0; i < merged_methods->length(); ++i) { kamg@4245: Method* mo = merged_methods->at(i); kamg@4245: uintptr_t nv = (uintptr_t)mo->name(); kamg@4245: assert(nv >= prev, "Incorrect method ordering"); kamg@4245: prev = nv; kamg@4245: } kamg@4245: #endif kamg@4245: kamg@4245: // Replace klass methods with new merged lists kamg@4245: klass->set_methods(merged_methods); sspitsyn@5209: klass->set_initial_method_idnum(new_size); coleenp@6196: klass->set_method_ordering(merged_ordering); kamg@4245: coleenp@6196: // Free metadata kamg@4245: ClassLoaderData* cld = klass->class_loader_data(); coleenp@6196: if (original_methods->length() > 0) { acorn@6080: MetadataFactory::free_array(cld, original_methods); acorn@6080: } coleenp@6196: if (original_ordering != NULL && original_ordering->length() > 0) { kamg@4245: MetadataFactory::free_array(cld, original_ordering); kamg@4245: } kamg@4245: }