src/share/vm/classfile/defaultMethods.cpp

Wed, 30 Oct 2013 09:11:04 -0700

author
acorn
date
Wed, 30 Oct 2013 09:11:04 -0700
changeset 6060
fdd464c8d62e
parent 5922
f50418dfb1b7
child 6080
fce21ac5968d
permissions
-rw-r--r--

8027304: Lambda: inheriting abstract + 1 default -> default, not ICCE
Reviewed-by: hseigel, zgu

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
acorn@5786 328 Symbol* _exception_name; // If no unique target is found
kamg@4245 329
kamg@4245 330 bool contains_method(Method* method) {
kamg@4245 331 int* lookup = _member_index.get(method);
kamg@4245 332 return lookup != NULL;
kamg@4245 333 }
kamg@4245 334
kamg@4245 335 void add_method(Method* method, QualifiedState state) {
kamg@4245 336 Pair<Method*,QualifiedState> entry(method, state);
kamg@4245 337 _member_index.put(method, _members.length());
kamg@4245 338 _members.append(entry);
kamg@4245 339 }
kamg@4245 340
kamg@4245 341 void disqualify_method(Method* method) {
kamg@4245 342 int* index = _member_index.get(method);
morris@4778 343 guarantee(index != NULL && *index >= 0 && *index < _members.length(), "bad index");
kamg@4245 344 _members.at(*index).second = DISQUALIFIED;
kamg@4245 345 }
kamg@4245 346
kamg@4245 347 Symbol* generate_no_defaults_message(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@5786 353 : _selected_target(NULL), _exception_message(NULL), _exception_name(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; }
acorn@5786 386 Symbol* get_exception_name() { return _exception_name; }
kamg@4245 387
kamg@4245 388 // Either sets the target or the exception error message
kamg@4245 389 void determine_target(InstanceKlass* root, TRAPS) {
kamg@4245 390 if (has_target() || throws_exception()) {
kamg@4245 391 return;
kamg@4245 392 }
kamg@4245 393
kamg@4245 394 GrowableArray<Method*> qualified_methods;
acorn@6060 395 int num_defaults = 0;
acorn@6060 396 int default_index = -1;
kamg@4245 397 for (int i = 0; i < _members.length(); ++i) {
kamg@4245 398 Pair<Method*,QualifiedState> entry = _members.at(i);
kamg@4245 399 if (entry.second == QUALIFIED) {
kamg@4245 400 qualified_methods.append(entry.first);
acorn@6060 401 default_index++;
acorn@6060 402 if (entry.first->is_default_method()) {
acorn@6060 403 num_defaults++;
acorn@6060 404 }
kamg@4245 405 }
kamg@4245 406 }
kamg@4245 407
kamg@4245 408 if (qualified_methods.length() == 0) {
kamg@4245 409 _exception_message = generate_no_defaults_message(CHECK);
acorn@5786 410 _exception_name = vmSymbols::java_lang_AbstractMethodError();
kamg@4245 411 } else if (qualified_methods.length() == 1) {
acorn@5848 412 // leave abstract methods alone, they will be found via normal search path
kamg@4245 413 Method* method = qualified_methods.at(0);
acorn@5848 414 if (!method->is_abstract()) {
kamg@4245 415 _selected_target = qualified_methods.at(0);
kamg@4245 416 }
acorn@6060 417 // If only one qualified method is default, select that
acorn@6060 418 } else if (num_defaults == 1) {
acorn@6060 419 _selected_target = qualified_methods.at(default_index);
kamg@4245 420 } else {
kamg@4245 421 _exception_message = generate_conflicts_message(&qualified_methods,CHECK);
acorn@5786 422 _exception_name = vmSymbols::java_lang_IncompatibleClassChangeError();
acorn@5848 423 if (TraceDefaultMethods) {
acorn@5848 424 _exception_message->print_value_on(tty);
acorn@5848 425 tty->print_cr("");
acorn@5848 426 }
kamg@4245 427 }
kamg@4245 428 }
kamg@4245 429
kamg@4245 430 bool contains_signature(Symbol* query) {
kamg@4245 431 for (int i = 0; i < _members.length(); ++i) {
kamg@4245 432 if (query == _members.at(i).first->signature()) {
kamg@4245 433 return true;
kamg@4245 434 }
kamg@4245 435 }
kamg@4245 436 return false;
kamg@4245 437 }
kamg@4245 438
kamg@4245 439 #ifndef PRODUCT
acorn@5377 440 void print_sig_on(outputStream* str, Symbol* signature, int indent) const {
kamg@4245 441 streamIndentor si(str, indent * 2);
kamg@4245 442
acorn@5377 443 str->indent().print_cr("Logical Method %s:", signature->as_C_string());
kamg@4245 444
kamg@4245 445 streamIndentor si2(str);
kamg@4245 446 for (int i = 0; i < _members.length(); ++i) {
kamg@4245 447 str->indent();
kamg@4245 448 print_method(str, _members.at(i).first);
kamg@4245 449 if (_members.at(i).second == DISQUALIFIED) {
kamg@4245 450 str->print(" (disqualified)");
kamg@4245 451 }
kamg@4245 452 str->print_cr("");
kamg@4245 453 }
kamg@4245 454
kamg@4245 455 if (_selected_target != NULL) {
kamg@4245 456 print_selected(str, 1);
kamg@4245 457 }
kamg@4245 458 }
kamg@4245 459
kamg@4245 460 void print_selected(outputStream* str, int indent) const {
kamg@4245 461 assert(has_target(), "Should be called otherwise");
kamg@4245 462 streamIndentor si(str, indent * 2);
kamg@4245 463 str->indent().print("Selected method: ");
kamg@4245 464 print_method(str, _selected_target);
acorn@5681 465 Klass* method_holder = _selected_target->method_holder();
acorn@5681 466 if (!method_holder->is_interface()) {
acorn@5681 467 tty->print(" : in superclass");
acorn@5681 468 }
kamg@4245 469 str->print_cr("");
kamg@4245 470 }
kamg@4245 471
kamg@4245 472 void print_exception(outputStream* str, int indent) {
kamg@4245 473 assert(throws_exception(), "Should be called otherwise");
acorn@5786 474 assert(_exception_name != NULL, "exception_name should be set");
kamg@4245 475 streamIndentor si(str, indent * 2);
acorn@5786 476 str->indent().print_cr("%s: %s", _exception_name->as_C_string(), _exception_message->as_C_string());
kamg@4245 477 }
kamg@4245 478 #endif // ndef PRODUCT
kamg@4245 479 };
kamg@4245 480
kamg@4245 481 Symbol* MethodFamily::generate_no_defaults_message(TRAPS) const {
kamg@4245 482 return SymbolTable::new_symbol("No qualifying defaults found", CHECK_NULL);
kamg@4245 483 }
kamg@4245 484
kamg@4245 485 Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
kamg@4245 486 stringStream ss;
kamg@4245 487 ss.print("Conflicting default methods:");
kamg@4245 488 for (int i = 0; i < methods->length(); ++i) {
kamg@4245 489 Method* method = methods->at(i);
kamg@4245 490 Symbol* klass = method->klass_name();
kamg@4245 491 Symbol* name = method->name();
kamg@4245 492 ss.print(" ");
kamg@4245 493 ss.write((const char*)klass->bytes(), klass->utf8_length());
kamg@4245 494 ss.print(".");
kamg@4245 495 ss.write((const char*)name->bytes(), name->utf8_length());
kamg@4245 496 }
kamg@4245 497 return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
kamg@4245 498 }
kamg@4245 499
acorn@5377 500
kamg@4245 501 class StateRestorer;
kamg@4245 502
acorn@5377 503 // StatefulMethodFamily is a wrapper around a MethodFamily that maintains the
kamg@4245 504 // qualification state during hierarchy visitation, and applies that state
acorn@5377 505 // when adding members to the MethodFamily
kamg@4245 506 class StatefulMethodFamily : public ResourceObj {
kamg@4245 507 friend class StateRestorer;
kamg@4245 508 private:
kamg@4245 509 QualifiedState _qualification_state;
kamg@4245 510
kamg@4245 511 void set_qualification_state(QualifiedState state) {
kamg@4245 512 _qualification_state = state;
kamg@4245 513 }
kamg@4245 514
acorn@5377 515 protected:
acorn@5377 516 MethodFamily* _method_family;
acorn@5377 517
kamg@4245 518 public:
acorn@5377 519 StatefulMethodFamily() {
acorn@5377 520 _method_family = new MethodFamily();
acorn@5377 521 _qualification_state = QUALIFIED;
kamg@4245 522 }
kamg@4245 523
acorn@5377 524 StatefulMethodFamily(MethodFamily* mf) {
acorn@5377 525 _method_family = mf;
acorn@5377 526 _qualification_state = QUALIFIED;
acorn@5377 527 }
kamg@4245 528
acorn@5377 529 void set_target_if_empty(Method* m) { _method_family->set_target_if_empty(m); }
acorn@5377 530
acorn@5377 531 MethodFamily* get_method_family() { return _method_family; }
acorn@5377 532
acorn@5377 533 StateRestorer* record_method_and_dq_further(Method* mo);
acorn@5377 534 };
acorn@5377 535
kamg@4245 536 class StateRestorer : public PseudoScopeMark {
kamg@4245 537 private:
kamg@4245 538 StatefulMethodFamily* _method;
kamg@4245 539 QualifiedState _state_to_restore;
kamg@4245 540 public:
kamg@4245 541 StateRestorer(StatefulMethodFamily* dm, QualifiedState state)
kamg@4245 542 : _method(dm), _state_to_restore(state) {}
kamg@4245 543 ~StateRestorer() { destroy(); }
kamg@4245 544 void restore_state() { _method->set_qualification_state(_state_to_restore); }
kamg@4245 545 virtual void destroy() { restore_state(); }
kamg@4245 546 };
kamg@4245 547
kamg@4245 548 StateRestorer* StatefulMethodFamily::record_method_and_dq_further(Method* mo) {
kamg@4245 549 StateRestorer* mark = new StateRestorer(this, _qualification_state);
kamg@4245 550 if (_qualification_state == QUALIFIED) {
acorn@5377 551 _method_family->record_qualified_method(mo);
kamg@4245 552 } else {
acorn@5377 553 _method_family->record_disqualified_method(mo);
kamg@4245 554 }
kamg@4245 555 // Everything found "above"??? this method in the hierarchy walk is set to
kamg@4245 556 // disqualified
kamg@4245 557 set_qualification_state(DISQUALIFIED);
kamg@4245 558 return mark;
kamg@4245 559 }
kamg@4245 560
kamg@4245 561 // Represents a location corresponding to a vtable slot for methods that
kamg@4245 562 // neither the class nor any of it's ancestors provide an implementaion.
kamg@4245 563 // Default methods may be present to fill this slot.
kamg@4245 564 class EmptyVtableSlot : public ResourceObj {
kamg@4245 565 private:
kamg@4245 566 Symbol* _name;
kamg@4245 567 Symbol* _signature;
kamg@4245 568 int _size_of_parameters;
kamg@4245 569 MethodFamily* _binding;
kamg@4245 570
kamg@4245 571 public:
kamg@4245 572 EmptyVtableSlot(Method* method)
kamg@4245 573 : _name(method->name()), _signature(method->signature()),
kamg@4245 574 _size_of_parameters(method->size_of_parameters()), _binding(NULL) {}
kamg@4245 575
kamg@4245 576 Symbol* name() const { return _name; }
kamg@4245 577 Symbol* signature() const { return _signature; }
kamg@4245 578 int size_of_parameters() const { return _size_of_parameters; }
kamg@4245 579
kamg@4245 580 void bind_family(MethodFamily* lm) { _binding = lm; }
kamg@4245 581 bool is_bound() { return _binding != NULL; }
kamg@4245 582 MethodFamily* get_binding() { return _binding; }
kamg@4245 583
kamg@4245 584 #ifndef PRODUCT
kamg@4245 585 void print_on(outputStream* str) const {
kamg@4245 586 print_slot(str, name(), signature());
kamg@4245 587 }
kamg@4245 588 #endif // ndef PRODUCT
kamg@4245 589 };
kamg@4245 590
acorn@5848 591 static bool already_in_vtable_slots(GrowableArray<EmptyVtableSlot*>* slots, Method* m) {
acorn@5848 592 bool found = false;
acorn@5848 593 for (int j = 0; j < slots->length(); ++j) {
acorn@5848 594 if (slots->at(j)->name() == m->name() &&
acorn@5848 595 slots->at(j)->signature() == m->signature() ) {
acorn@5848 596 found = true;
acorn@5848 597 break;
acorn@5848 598 }
acorn@5848 599 }
acorn@5848 600 return found;
acorn@5848 601 }
acorn@5848 602
kamg@4245 603 static GrowableArray<EmptyVtableSlot*>* find_empty_vtable_slots(
kamg@4245 604 InstanceKlass* klass, GrowableArray<Method*>* mirandas, TRAPS) {
kamg@4245 605
kamg@4245 606 assert(klass != NULL, "Must be valid class");
kamg@4245 607
kamg@4245 608 GrowableArray<EmptyVtableSlot*>* slots = new GrowableArray<EmptyVtableSlot*>();
kamg@4245 609
kamg@4245 610 // All miranda methods are obvious candidates
kamg@4245 611 for (int i = 0; i < mirandas->length(); ++i) {
acorn@5848 612 Method* m = mirandas->at(i);
acorn@5848 613 if (!already_in_vtable_slots(slots, m)) {
acorn@5848 614 slots->append(new EmptyVtableSlot(m));
acorn@5848 615 }
kamg@4245 616 }
kamg@4245 617
kamg@4245 618 // Also any overpasses in our superclasses, that we haven't implemented.
kamg@4245 619 // (can't use the vtable because it is not guaranteed to be initialized yet)
kamg@4245 620 InstanceKlass* super = klass->java_super();
kamg@4245 621 while (super != NULL) {
kamg@4245 622 for (int i = 0; i < super->methods()->length(); ++i) {
kamg@4245 623 Method* m = super->methods()->at(i);
kamg@4245 624 if (m->is_overpass()) {
kamg@4245 625 // m is a method that would have been a miranda if not for the
kamg@4245 626 // default method processing that occurred on behalf of our superclass,
kamg@4245 627 // so it's a method we want to re-examine in this new context. That is,
kamg@4245 628 // unless we have a real implementation of it in the current class.
kamg@4245 629 Method* impl = klass->lookup_method(m->name(), m->signature());
kamg@4245 630 if (impl == NULL || impl->is_overpass()) {
acorn@5848 631 if (!already_in_vtable_slots(slots, m)) {
acorn@5848 632 slots->append(new EmptyVtableSlot(m));
acorn@5848 633 }
acorn@5848 634 }
acorn@5848 635 }
acorn@5848 636 }
acorn@5848 637
acorn@5848 638 // also any default methods in our superclasses
acorn@5848 639 if (super->default_methods() != NULL) {
acorn@5848 640 for (int i = 0; i < super->default_methods()->length(); ++i) {
acorn@5848 641 Method* m = super->default_methods()->at(i);
acorn@5848 642 // m is a method that would have been a miranda if not for the
acorn@5848 643 // default method processing that occurred on behalf of our superclass,
acorn@5848 644 // so it's a method we want to re-examine in this new context. That is,
acorn@5848 645 // unless we have a real implementation of it in the current class.
acorn@5848 646 Method* impl = klass->lookup_method(m->name(), m->signature());
acorn@5848 647 if (impl == NULL || impl->is_overpass()) {
acorn@5848 648 if (!already_in_vtable_slots(slots, m)) {
acorn@5848 649 slots->append(new EmptyVtableSlot(m));
acorn@5848 650 }
kamg@4245 651 }
kamg@4245 652 }
kamg@4245 653 }
kamg@4245 654 super = super->java_super();
kamg@4245 655 }
kamg@4245 656
kamg@4245 657 #ifndef PRODUCT
kamg@4245 658 if (TraceDefaultMethods) {
kamg@4245 659 tty->print_cr("Slots that need filling:");
kamg@4245 660 streamIndentor si(tty);
kamg@4245 661 for (int i = 0; i < slots->length(); ++i) {
kamg@4245 662 tty->indent();
kamg@4245 663 slots->at(i)->print_on(tty);
kamg@4245 664 tty->print_cr("");
kamg@4245 665 }
kamg@4245 666 }
kamg@4245 667 #endif // ndef PRODUCT
kamg@4245 668 return slots;
kamg@4245 669 }
kamg@4245 670
acorn@5377 671 // Iterates over the superinterface type hierarchy looking for all methods
acorn@5377 672 // with a specific erased signature.
acorn@5377 673 class FindMethodsByErasedSig : public HierarchyVisitor<FindMethodsByErasedSig> {
acorn@5377 674 private:
acorn@5377 675 // Context data
acorn@5377 676 Symbol* _method_name;
acorn@5377 677 Symbol* _method_signature;
acorn@5377 678 StatefulMethodFamily* _family;
acorn@5377 679
acorn@5377 680 public:
acorn@5377 681 FindMethodsByErasedSig(Symbol* name, Symbol* signature) :
acorn@5377 682 _method_name(name), _method_signature(signature),
acorn@5377 683 _family(NULL) {}
acorn@5377 684
acorn@5377 685 void get_discovered_family(MethodFamily** family) {
acorn@5377 686 if (_family != NULL) {
acorn@5377 687 *family = _family->get_method_family();
acorn@5377 688 } else {
acorn@5377 689 *family = NULL;
acorn@5377 690 }
acorn@5377 691 }
acorn@5377 692
acorn@5377 693 void* new_node_data(InstanceKlass* cls) { return new PseudoScope(); }
acorn@5377 694 void free_node_data(void* node_data) {
acorn@5377 695 PseudoScope::cast(node_data)->destroy();
acorn@5377 696 }
acorn@5377 697
acorn@5377 698 // Find all methods on this hierarchy that match this
acorn@5377 699 // method's erased (name, signature)
acorn@5377 700 bool visit() {
acorn@5377 701 PseudoScope* scope = PseudoScope::cast(current_data());
acorn@5377 702 InstanceKlass* iklass = current_class();
acorn@5377 703
acorn@5377 704 Method* m = iklass->find_method(_method_name, _method_signature);
acorn@5786 705 // private interface methods are not candidates for default methods
acorn@5786 706 // invokespecial to private interface methods doesn't use default method logic
acorn@5786 707 // future: take access controls into account for superclass methods
acorn@5848 708 if (m != NULL && !m->is_static() && (!iklass->is_interface() || m->is_public())) {
acorn@5377 709 if (_family == NULL) {
acorn@5377 710 _family = new StatefulMethodFamily();
acorn@5377 711 }
acorn@5377 712
acorn@5377 713 if (iklass->is_interface()) {
acorn@5377 714 StateRestorer* restorer = _family->record_method_and_dq_further(m);
acorn@5377 715 scope->add_mark(restorer);
acorn@5377 716 } else {
acorn@5377 717 // This is the rule that methods in classes "win" (bad word) over
acorn@5377 718 // methods in interfaces. This works because of single inheritance
acorn@5377 719 _family->set_target_if_empty(m);
acorn@5377 720 }
acorn@5377 721 }
acorn@5377 722 return true;
acorn@5377 723 }
acorn@5377 724
acorn@5377 725 };
acorn@5377 726
kamg@4245 727
kamg@4245 728
acorn@5848 729 static void create_defaults_and_exceptions(
acorn@5377 730 GrowableArray<EmptyVtableSlot*>* slots, InstanceKlass* klass, TRAPS);
acorn@5377 731
acorn@5377 732 static void generate_erased_defaults(
acorn@5377 733 InstanceKlass* klass, GrowableArray<EmptyVtableSlot*>* empty_slots,
acorn@5377 734 EmptyVtableSlot* slot, TRAPS) {
acorn@5377 735
acorn@5377 736 // sets up a set of methods with the same exact erased signature
acorn@5377 737 FindMethodsByErasedSig visitor(slot->name(), slot->signature());
acorn@5377 738 visitor.run(klass);
acorn@5377 739
acorn@5377 740 MethodFamily* family;
acorn@5377 741 visitor.get_discovered_family(&family);
acorn@5377 742 if (family != NULL) {
acorn@5377 743 family->determine_target(klass, CHECK);
acorn@5377 744 slot->bind_family(family);
acorn@5377 745 }
acorn@5377 746 }
acorn@5377 747
kamg@4245 748 static void merge_in_new_methods(InstanceKlass* klass,
kamg@4245 749 GrowableArray<Method*>* new_methods, TRAPS);
acorn@5848 750 static void create_default_methods( InstanceKlass* klass,
acorn@5848 751 GrowableArray<Method*>* new_methods, TRAPS);
kamg@4245 752
kamg@4245 753 // This is the guts of the default methods implementation. This is called just
kamg@4245 754 // after the classfile has been parsed if some ancestor has default methods.
kamg@4245 755 //
kamg@4245 756 // First if finds any name/signature slots that need any implementation (either
kamg@4245 757 // because they are miranda or a superclass's implementation is an overpass
acorn@5599 758 // itself). For each slot, iterate over the hierarchy, to see if they contain a
acorn@5599 759 // signature that matches the slot we are looking at.
kamg@4245 760 //
kamg@4245 761 // For each slot filled, we generate an overpass method that either calls the
kamg@4245 762 // unique default method candidate using invokespecial, or throws an exception
kamg@4245 763 // (in the case of no default method candidates, or more than one valid
acorn@5599 764 // candidate). These methods are then added to the class's method list.
acorn@5599 765 // The JVM does not create bridges nor handle generic signatures here.
kamg@4245 766 void DefaultMethods::generate_default_methods(
kamg@4245 767 InstanceKlass* klass, GrowableArray<Method*>* mirandas, TRAPS) {
kamg@4245 768
kamg@4245 769 // This resource mark is the bound for all memory allocation that takes
kamg@4245 770 // place during default method processing. After this goes out of scope,
kamg@4245 771 // all (Resource) objects' memory will be reclaimed. Be careful if adding an
kamg@4245 772 // embedded resource mark under here as that memory can't be used outside
kamg@4245 773 // whatever scope it's in.
kamg@4245 774 ResourceMark rm(THREAD);
kamg@4245 775
kamg@4245 776 // Keep entire hierarchy alive for the duration of the computation
kamg@4245 777 KeepAliveRegistrar keepAlive(THREAD);
kamg@4245 778 KeepAliveVisitor loadKeepAlive(&keepAlive);
kamg@4245 779 loadKeepAlive.run(klass);
kamg@4245 780
kamg@4245 781 #ifndef PRODUCT
kamg@4245 782 if (TraceDefaultMethods) {
kamg@4245 783 ResourceMark rm; // be careful with these!
kamg@4245 784 tty->print_cr("Class %s requires default method processing",
kamg@4245 785 klass->name()->as_klass_external_name());
kamg@4245 786 PrintHierarchy printer;
kamg@4245 787 printer.run(klass);
kamg@4245 788 }
kamg@4245 789 #endif // ndef PRODUCT
kamg@4245 790
kamg@4245 791 GrowableArray<EmptyVtableSlot*>* empty_slots =
kamg@4245 792 find_empty_vtable_slots(klass, mirandas, CHECK);
kamg@4245 793
kamg@4245 794 for (int i = 0; i < empty_slots->length(); ++i) {
kamg@4245 795 EmptyVtableSlot* slot = empty_slots->at(i);
kamg@4245 796 #ifndef PRODUCT
kamg@4245 797 if (TraceDefaultMethods) {
kamg@4245 798 streamIndentor si(tty, 2);
kamg@4245 799 tty->indent().print("Looking for default methods for slot ");
kamg@4245 800 slot->print_on(tty);
kamg@4245 801 tty->print_cr("");
kamg@4245 802 }
kamg@4245 803 #endif // ndef PRODUCT
acorn@5377 804
acorn@5599 805 generate_erased_defaults(klass, empty_slots, slot, CHECK);
acorn@5377 806 }
kamg@4245 807 #ifndef PRODUCT
kamg@4245 808 if (TraceDefaultMethods) {
kamg@4245 809 tty->print_cr("Creating overpasses...");
kamg@4245 810 }
kamg@4245 811 #endif // ndef PRODUCT
kamg@4245 812
acorn@5848 813 create_defaults_and_exceptions(empty_slots, klass, CHECK);
kamg@4245 814
kamg@4245 815 #ifndef PRODUCT
kamg@4245 816 if (TraceDefaultMethods) {
kamg@4245 817 tty->print_cr("Default method processing complete");
kamg@4245 818 }
kamg@4245 819 #endif // ndef PRODUCT
kamg@4245 820 }
kamg@4245 821
acorn@5786 822 static int assemble_method_error(
acorn@5786 823 BytecodeConstantPool* cp, BytecodeBuffer* buffer, Symbol* errorName, Symbol* message, TRAPS) {
kamg@4245 824
kamg@4245 825 Symbol* init = vmSymbols::object_initializer_name();
kamg@4245 826 Symbol* sig = vmSymbols::string_void_signature();
kamg@4245 827
kamg@4245 828 BytecodeAssembler assem(buffer, cp);
kamg@4245 829
kamg@4245 830 assem._new(errorName);
kamg@4245 831 assem.dup();
kamg@4245 832 assem.load_string(message);
kamg@4245 833 assem.invokespecial(errorName, init, sig);
kamg@4245 834 assem.athrow();
kamg@4245 835
kamg@4245 836 return 3; // max stack size: [ exception, exception, string ]
kamg@4245 837 }
kamg@4245 838
kamg@4245 839 static Method* new_method(
kamg@4245 840 BytecodeConstantPool* cp, BytecodeBuffer* bytecodes, Symbol* name,
kamg@4245 841 Symbol* sig, AccessFlags flags, int max_stack, int params,
kamg@4245 842 ConstMethod::MethodType mt, TRAPS) {
kamg@4245 843
acorn@5377 844 address code_start = 0;
acorn@5377 845 int code_length = 0;
coleenp@4572 846 InlineTableSizes sizes;
kamg@4245 847
acorn@5377 848 if (bytecodes != NULL && bytecodes->length() > 0) {
acorn@5377 849 code_start = static_cast<address>(bytecodes->adr_at(0));
acorn@5377 850 code_length = bytecodes->length();
acorn@5377 851 }
acorn@5377 852
kamg@4245 853 Method* m = Method::allocate(cp->pool_holder()->class_loader_data(),
coleenp@4572 854 code_length, flags, &sizes,
coleenp@4398 855 mt, CHECK_NULL);
kamg@4245 856
kamg@4245 857 m->set_constants(NULL); // This will get filled in later
kamg@4245 858 m->set_name_index(cp->utf8(name));
kamg@4245 859 m->set_signature_index(cp->utf8(sig));
kamg@4245 860 #ifdef CC_INTERP
kamg@4245 861 ResultTypeFinder rtf(sig);
kamg@4245 862 m->set_result_index(rtf.type());
kamg@4245 863 #endif
kamg@4245 864 m->set_size_of_parameters(params);
kamg@4245 865 m->set_max_stack(max_stack);
kamg@4245 866 m->set_max_locals(params);
kamg@4245 867 m->constMethod()->set_stackmap_data(NULL);
kamg@4245 868 m->set_code(code_start);
kamg@4245 869
kamg@4245 870 return m;
kamg@4245 871 }
kamg@4245 872
kamg@4245 873 static void switchover_constant_pool(BytecodeConstantPool* bpool,
kamg@4245 874 InstanceKlass* klass, GrowableArray<Method*>* new_methods, TRAPS) {
kamg@4245 875
kamg@4245 876 if (new_methods->length() > 0) {
kamg@4245 877 ConstantPool* cp = bpool->create_constant_pool(CHECK);
kamg@4245 878 if (cp != klass->constants()) {
kamg@4245 879 klass->class_loader_data()->add_to_deallocate_list(klass->constants());
kamg@4245 880 klass->set_constants(cp);
kamg@4245 881 cp->set_pool_holder(klass);
kamg@4245 882
kamg@4245 883 for (int i = 0; i < new_methods->length(); ++i) {
kamg@4245 884 new_methods->at(i)->set_constants(cp);
kamg@4245 885 }
kamg@4245 886 for (int i = 0; i < klass->methods()->length(); ++i) {
kamg@4245 887 Method* mo = klass->methods()->at(i);
kamg@4245 888 mo->set_constants(cp);
kamg@4245 889 }
kamg@4245 890 }
kamg@4245 891 }
kamg@4245 892 }
kamg@4245 893
acorn@5848 894 // Create default_methods list for the current class.
acorn@5848 895 // With the VM only processing erased signatures, the VM only
acorn@5848 896 // creates an overpass in a conflict case or a case with no candidates.
acorn@5848 897 // This allows virtual methods to override the overpass, but ensures
acorn@5848 898 // that a local method search will find the exception rather than an abstract
acorn@5848 899 // or default method that is not a valid candidate.
acorn@5848 900 static void create_defaults_and_exceptions(
kamg@4245 901 GrowableArray<EmptyVtableSlot*>* slots,
kamg@4245 902 InstanceKlass* klass, TRAPS) {
kamg@4245 903
kamg@4245 904 GrowableArray<Method*> overpasses;
acorn@5848 905 GrowableArray<Method*> defaults;
kamg@4245 906 BytecodeConstantPool bpool(klass->constants());
kamg@4245 907
kamg@4245 908 for (int i = 0; i < slots->length(); ++i) {
kamg@4245 909 EmptyVtableSlot* slot = slots->at(i);
kamg@4245 910
kamg@4245 911 if (slot->is_bound()) {
kamg@4245 912 MethodFamily* method = slot->get_binding();
kamg@4245 913 BytecodeBuffer buffer;
kamg@4245 914
kamg@4245 915 #ifndef PRODUCT
kamg@4245 916 if (TraceDefaultMethods) {
kamg@4245 917 tty->print("for slot: ");
kamg@4245 918 slot->print_on(tty);
kamg@4245 919 tty->print_cr("");
kamg@4245 920 if (method->has_target()) {
kamg@4245 921 method->print_selected(tty, 1);
acorn@5848 922 } else if (method->throws_exception()) {
kamg@4245 923 method->print_exception(tty, 1);
kamg@4245 924 }
kamg@4245 925 }
kamg@4245 926 #endif // ndef PRODUCT
acorn@5848 927
kamg@4245 928 if (method->has_target()) {
kamg@4245 929 Method* selected = method->get_selected_target();
acorn@5681 930 if (selected->method_holder()->is_interface()) {
acorn@5848 931 defaults.push(selected);
acorn@5681 932 }
kamg@4245 933 } else if (method->throws_exception()) {
acorn@5848 934 int max_stack = assemble_method_error(&bpool, &buffer,
acorn@5848 935 method->get_exception_name(), method->get_exception_message(), CHECK);
acorn@5681 936 AccessFlags flags = accessFlags_from(
kamg@4245 937 JVM_ACC_PUBLIC | JVM_ACC_SYNTHETIC | JVM_ACC_BRIDGE);
acorn@5848 938 Method* m = new_method(&bpool, &buffer, slot->name(), slot->signature(),
kamg@4245 939 flags, max_stack, slot->size_of_parameters(),
kamg@4245 940 ConstMethod::OVERPASS, CHECK);
acorn@5848 941 // We push to the methods list:
acorn@5848 942 // overpass methods which are exception throwing methods
acorn@5681 943 if (m != NULL) {
acorn@5681 944 overpasses.push(m);
acorn@5681 945 }
kamg@4245 946 }
kamg@4245 947 }
kamg@4245 948 }
kamg@4245 949
kamg@4245 950 #ifndef PRODUCT
kamg@4245 951 if (TraceDefaultMethods) {
kamg@4245 952 tty->print_cr("Created %d overpass methods", overpasses.length());
acorn@5848 953 tty->print_cr("Created %d default methods", defaults.length());
kamg@4245 954 }
kamg@4245 955 #endif // ndef PRODUCT
kamg@4245 956
acorn@5848 957 if (overpasses.length() > 0) {
acorn@5848 958 switchover_constant_pool(&bpool, klass, &overpasses, CHECK);
acorn@5848 959 merge_in_new_methods(klass, &overpasses, CHECK);
acorn@5848 960 }
acorn@5848 961 if (defaults.length() > 0) {
acorn@5848 962 create_default_methods(klass, &defaults, CHECK);
acorn@5848 963 }
acorn@5848 964 }
acorn@5848 965
acorn@5848 966 static void create_default_methods( InstanceKlass* klass,
acorn@5848 967 GrowableArray<Method*>* new_methods, TRAPS) {
acorn@5848 968
acorn@5848 969 int new_size = new_methods->length();
acorn@5848 970 Array<Method*>* total_default_methods = MetadataFactory::new_array<Method*>(
acorn@5848 971 klass->class_loader_data(), new_size, NULL, CHECK);
acorn@5848 972 for (int index = 0; index < new_size; index++ ) {
acorn@5848 973 total_default_methods->at_put(index, new_methods->at(index));
acorn@5848 974 }
acorn@5848 975 Method::sort_methods(total_default_methods, false, false);
acorn@5848 976
acorn@5848 977 klass->set_default_methods(total_default_methods);
kamg@4245 978 }
kamg@4245 979
kamg@4245 980 static void sort_methods(GrowableArray<Method*>* methods) {
kamg@4245 981 // Note that this must sort using the same key as is used for sorting
kamg@4245 982 // methods in InstanceKlass.
kamg@4245 983 bool sorted = true;
kamg@4245 984 for (int i = methods->length() - 1; i > 0; --i) {
kamg@4245 985 for (int j = 0; j < i; ++j) {
kamg@4245 986 Method* m1 = methods->at(j);
kamg@4245 987 Method* m2 = methods->at(j + 1);
kamg@4245 988 if ((uintptr_t)m1->name() > (uintptr_t)m2->name()) {
kamg@4245 989 methods->at_put(j, m2);
kamg@4245 990 methods->at_put(j + 1, m1);
kamg@4245 991 sorted = false;
kamg@4245 992 }
kamg@4245 993 }
kamg@4245 994 if (sorted) break;
kamg@4245 995 sorted = true;
kamg@4245 996 }
kamg@4245 997 #ifdef ASSERT
kamg@4245 998 uintptr_t prev = 0;
kamg@4245 999 for (int i = 0; i < methods->length(); ++i) {
kamg@4245 1000 Method* mh = methods->at(i);
kamg@4245 1001 uintptr_t nv = (uintptr_t)mh->name();
kamg@4245 1002 assert(nv >= prev, "Incorrect overpass method ordering");
kamg@4245 1003 prev = nv;
kamg@4245 1004 }
kamg@4245 1005 #endif
kamg@4245 1006 }
kamg@4245 1007
kamg@4245 1008 static void merge_in_new_methods(InstanceKlass* klass,
kamg@4245 1009 GrowableArray<Method*>* new_methods, TRAPS) {
kamg@4245 1010
kamg@4245 1011 enum { ANNOTATIONS, PARAMETERS, DEFAULTS, NUM_ARRAYS };
kamg@4245 1012
kamg@4245 1013 Array<Method*>* original_methods = klass->methods();
kamg@4245 1014 Array<int>* original_ordering = klass->method_ordering();
kamg@4245 1015 Array<int>* merged_ordering = Universe::the_empty_int_array();
kamg@4245 1016
kamg@4245 1017 int new_size = klass->methods()->length() + new_methods->length();
kamg@4245 1018
kamg@4245 1019 Array<Method*>* merged_methods = MetadataFactory::new_array<Method*>(
kamg@4245 1020 klass->class_loader_data(), new_size, NULL, CHECK);
coleenp@4572 1021
kamg@4245 1022 if (original_ordering != NULL && original_ordering->length() > 0) {
kamg@4245 1023 merged_ordering = MetadataFactory::new_array<int>(
kamg@4245 1024 klass->class_loader_data(), new_size, CHECK);
kamg@4245 1025 }
kamg@4245 1026 int method_order_index = klass->methods()->length();
kamg@4245 1027
kamg@4245 1028 sort_methods(new_methods);
kamg@4245 1029
kamg@4245 1030 // Perform grand merge of existing methods and new methods
kamg@4245 1031 int orig_idx = 0;
kamg@4245 1032 int new_idx = 0;
kamg@4245 1033
kamg@4245 1034 for (int i = 0; i < new_size; ++i) {
kamg@4245 1035 Method* orig_method = NULL;
kamg@4245 1036 Method* new_method = NULL;
kamg@4245 1037 if (orig_idx < original_methods->length()) {
kamg@4245 1038 orig_method = original_methods->at(orig_idx);
kamg@4245 1039 }
kamg@4245 1040 if (new_idx < new_methods->length()) {
kamg@4245 1041 new_method = new_methods->at(new_idx);
kamg@4245 1042 }
kamg@4245 1043
kamg@4245 1044 if (orig_method != NULL &&
kamg@4245 1045 (new_method == NULL || orig_method->name() < new_method->name())) {
kamg@4245 1046 merged_methods->at_put(i, orig_method);
kamg@4245 1047 original_methods->at_put(orig_idx, NULL);
kamg@4245 1048 if (merged_ordering->length() > 0) {
kamg@4245 1049 merged_ordering->at_put(i, original_ordering->at(orig_idx));
kamg@4245 1050 }
kamg@4245 1051 ++orig_idx;
kamg@4245 1052 } else {
kamg@4245 1053 merged_methods->at_put(i, new_method);
kamg@4245 1054 if (merged_ordering->length() > 0) {
kamg@4245 1055 merged_ordering->at_put(i, method_order_index++);
kamg@4245 1056 }
kamg@4245 1057 ++new_idx;
kamg@4245 1058 }
kamg@4245 1059 // update idnum for new location
kamg@4245 1060 merged_methods->at(i)->set_method_idnum(i);
kamg@4245 1061 }
kamg@4245 1062
kamg@4245 1063 // Verify correct order
kamg@4245 1064 #ifdef ASSERT
kamg@4245 1065 uintptr_t prev = 0;
kamg@4245 1066 for (int i = 0; i < merged_methods->length(); ++i) {
kamg@4245 1067 Method* mo = merged_methods->at(i);
kamg@4245 1068 uintptr_t nv = (uintptr_t)mo->name();
kamg@4245 1069 assert(nv >= prev, "Incorrect method ordering");
kamg@4245 1070 prev = nv;
kamg@4245 1071 }
kamg@4245 1072 #endif
kamg@4245 1073
kamg@4245 1074 // Replace klass methods with new merged lists
kamg@4245 1075 klass->set_methods(merged_methods);
sspitsyn@5209 1076 klass->set_initial_method_idnum(new_size);
kamg@4245 1077
kamg@4245 1078 ClassLoaderData* cld = klass->class_loader_data();
kamg@4245 1079 MetadataFactory::free_array(cld, original_methods);
kamg@4245 1080 if (original_ordering->length() > 0) {
kamg@4245 1081 klass->set_method_ordering(merged_ordering);
kamg@4245 1082 MetadataFactory::free_array(cld, original_ordering);
kamg@4245 1083 }
kamg@4245 1084 }

mercurial