Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/interpreter/linkResolver.cpp	Wed Oct 16 15:06:39 2013 +0200
     1.2 +++ b/src/share/vm/interpreter/linkResolver.cpp	Wed Oct 16 15:26:12 2013 -0400
     1.3 @@ -248,7 +248,7 @@
     1.4  void LinkResolver::lookup_instance_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
     1.5    Method* result_oop = klass->uncached_lookup_method(name, signature);
     1.6    result = methodHandle(THREAD, result_oop);
     1.7 -  while (!result.is_null() && result->is_static()) {
     1.8 +  while (!result.is_null() && result->is_static() && result->method_holder()->super() != NULL) {
     1.9      klass = KlassHandle(THREAD, result->method_holder()->super());
    1.10      result = methodHandle(THREAD, klass->uncached_lookup_method(name, signature));
    1.11    }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/runtime/8024804/RegisterNatives.java	Wed Oct 16 15:26:12 2013 -0400
     2.3 @@ -0,0 +1,46 @@
     2.4 +/*
     2.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test
    2.29 + * @bug 8024804
    2.30 + * @summary registerNatives() interface resolution should receive IAE
    2.31 + * @run main RegisterNatives
    2.32 + */
    2.33 +public class RegisterNatives {
    2.34 +  interface I { void registerNatives(); }
    2.35 +  interface J extends I {}
    2.36 +  static class B implements J { public void registerNatives() { System.out.println("B"); } }
    2.37 +  public static void main(String... args) {
    2.38 +    System.out.println("Regression test for JDK-8024804, crash when InterfaceMethodref resolves to Object.registerNatives\n");
    2.39 +    J val = new B();
    2.40 +    try {
    2.41 +      val.registerNatives();
    2.42 +    } catch (IllegalAccessError e) {
    2.43 +      System.out.println("TEST PASSES - according to current JVM spec, IAE expected\n");
    2.44 +      return;
    2.45 +    }
    2.46 +    System.out.println("TEST FAILS - no IAE resulted\n");
    2.47 +    System.exit(1);
    2.48 +  }
    2.49 +}