src/share/vm/interpreter/linkResolver.cpp

*** 377,387 ****
  
    // First check in default method array
    if (!resolved_method->is_abstract() &&
      (InstanceKlass::cast(klass())->default_methods() != NULL)) {
      int index = InstanceKlass::find_method_index(InstanceKlass::cast(klass())->default_methods(),
!                                                  name, signature, Klass::find_overpass, Klass::find_static);
      if (index >= 0 ) {
        vtable_index = InstanceKlass::cast(klass())->default_vtable_indices()->at(index);
      }
    }
    if (vtable_index == Method::invalid_vtable_index) {
--- 377,388 ----
  
    // First check in default method array
    if (!resolved_method->is_abstract() &&
      (InstanceKlass::cast(klass())->default_methods() != NULL)) {
      int index = InstanceKlass::find_method_index(InstanceKlass::cast(klass())->default_methods(),
!                                                  name, signature, Klass::find_overpass, 
!                                                  Klass::find_static, Klass::find_private);
      if (index >= 0 ) {
        vtable_index = InstanceKlass::cast(klass())->default_vtable_indices()->at(index);
      }
    }
    if (vtable_index == Method::invalid_vtable_index) {
*** 1187,1206 ****
    // has not been rewritten, and the vtable initialized. Make sure to do this after the nullcheck, since
    // a missing receiver might result in a bogus lookup.
    assert(resolved_method->method_holder()->is_linked(), "must be linked");
  
    // do lookup based on receiver klass using the vtable index
!   if (resolved_method->method_holder()->is_interface()) { // miranda method
      vtable_index = vtable_index_of_interface_method(resolved_klass,
                             resolved_method);
      assert(vtable_index >= 0 , "we should have valid vtable index at this point");
  
      InstanceKlass* inst = InstanceKlass::cast(recv_klass());
      selected_method = methodHandle(THREAD, inst->method_at_vtable(vtable_index));
    } else {
      // at this point we are sure that resolved_method is virtual and not
!     // a miranda method; therefore, it must have a valid vtable index.
      assert(!resolved_method->has_itable_index(), "");
      vtable_index = resolved_method->vtable_index();
      // We could get a negative vtable_index for final methods,
      // because as an optimization they are they are never put in the vtable,
      // unless they override an existing method.
--- 1188,1207 ----
    // has not been rewritten, and the vtable initialized. Make sure to do this after the nullcheck, since
    // a missing receiver might result in a bogus lookup.
    assert(resolved_method->method_holder()->is_linked(), "must be linked");
  
    // do lookup based on receiver klass using the vtable index
!   if (resolved_method->method_holder()->is_interface()) { // default or miranda method
      vtable_index = vtable_index_of_interface_method(resolved_klass,
                             resolved_method);
      assert(vtable_index >= 0 , "we should have valid vtable index at this point");
  
      InstanceKlass* inst = InstanceKlass::cast(recv_klass());
      selected_method = methodHandle(THREAD, inst->method_at_vtable(vtable_index));
    } else {
      // at this point we are sure that resolved_method is virtual and not
!     // a default or miranda method; therefore, it must have a valid vtable index.
      assert(!resolved_method->has_itable_index(), "");
      vtable_index = resolved_method->vtable_index();
      // We could get a negative vtable_index for final methods,
      // because as an optimization they are they are never put in the vtable,
      // unless they override an existing method.