src/share/vm/oops/klassVtable.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 620,630 ****
    // miranda method in the super, whose entry it should re-use.
    // Actually, to handle cases that javac would not generate, we need
    // this check for all access permissions.
    InstanceKlass *sk = InstanceKlass::cast(super);
    if (sk->has_miranda_methods()) {
!     if (sk->lookup_method_in_all_interfaces(name, signature, false) != NULL) {
        return false;  // found a matching miranda; we do not need a new entry
      }
    }
    return true; // found no match; we need a new entry
  }
--- 620,630 ----
    // miranda method in the super, whose entry it should re-use.
    // Actually, to handle cases that javac would not generate, we need
    // this check for all access permissions.
    InstanceKlass *sk = InstanceKlass::cast(super);
    if (sk->has_miranda_methods()) {
!     if (sk->lookup_method_in_all_interfaces(name, signature, Klass::normal) != NULL) {
        return false;  // found a matching miranda; we do not need a new entry
      }
    }
    return true; // found no match; we need a new entry
  }
*** 696,706 ****
        Method* mo = InstanceKlass::cast(super)->lookup_method(name, signature);
        while (mo != NULL && mo->access_flags().is_static()
               && mo->method_holder() != NULL
               && mo->method_holder()->super() != NULL)
        {
!          mo = mo->method_holder()->super()->uncached_lookup_method(name, signature);
        }
        if (mo == NULL || mo->access_flags().is_private() ) {
          // super class hierarchy does not implement it or protection is different
          return true;
        }
--- 696,706 ----
        Method* mo = InstanceKlass::cast(super)->lookup_method(name, signature);
        while (mo != NULL && mo->access_flags().is_static()
               && mo->method_holder() != NULL
               && mo->method_holder()->super() != NULL)
        {
!          mo = mo->method_holder()->super()->uncached_lookup_method(name, signature, Klass::normal);
        }
        if (mo == NULL || mo->access_flags().is_private() ) {
          // super class hierarchy does not implement it or protection is different
          return true;
        }
*** 741,751 ****
  
      if (!is_duplicate) { // we don't want duplicate miranda entries in the vtable
        if (is_miranda(im, class_methods, default_methods, super)) { // is it a miranda at all?
          InstanceKlass *sk = InstanceKlass::cast(super);
          // check if it is a duplicate of a super's miranda
!         if (sk->lookup_method_in_all_interfaces(im->name(), im->signature(), false) == NULL) {
            new_mirandas->append(im);
          }
          if (all_mirandas != NULL) {
            all_mirandas->append(im);
          }
--- 741,751 ----
  
      if (!is_duplicate) { // we don't want duplicate miranda entries in the vtable
        if (is_miranda(im, class_methods, default_methods, super)) { // is it a miranda at all?
          InstanceKlass *sk = InstanceKlass::cast(super);
          // check if it is a duplicate of a super's miranda
!         if (sk->lookup_method_in_all_interfaces(im->name(), im->signature(), Klass::normal) == NULL) {
            new_mirandas->append(im);
          }
          if (all_mirandas != NULL) {
            all_mirandas->append(im);
          }