stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Bharadwaj Yadavalli 2013-05-01 09:00:39 -07:00
commit dc96841053
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hotspot/src/share/vm/oops/klassVtable.cpp
View File

@ -519,6 +519,9 @@ bool klassVtable::is_miranda_entry_at(int i) {
// check if a method is a miranda method, given a class's methods table and it's super // check if a method is a miranda method, given a class's methods table and it's super
// the caller must make sure that the method belongs to an interface implemented by the class // the caller must make sure that the method belongs to an interface implemented by the class
bool klassVtable::is_miranda(Method* m, Array<Method*>* class_methods, Klass* super) { bool klassVtable::is_miranda(Method* m, Array<Method*>* class_methods, Klass* super) {
if (m->is_static()) {
return false;
}
Symbol* name = m->name(); Symbol* name = m->name();
Symbol* signature = m->signature(); Symbol* signature = m->signature();
if (InstanceKlass::find_method(class_methods, name, signature) == NULL) { if (InstanceKlass::find_method(class_methods, name, signature) == NULL) {

49
hotspot/test/runtime/lambda-features/PublicStaticInterfaceMethodHandling.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (c) 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
/*
* @test
* @bug 8013418
* @summary [JDK 8] Test correct handling of static public interface methods
* @run main/othervm -Xverify:all PublicStaticInterfaceMethodHandling
*/
class TestClass implements InterfaceWithStaticAndDefaultMethods {
}
interface InterfaceWithStaticAndDefaultMethods {
public static String get() {
return "Hello from StaticMethodInInterface.get()";
}
default void default_method() {
System.out.println("Default method FunctionalInterface:default_method()");
}
}
public class PublicStaticInterfaceMethodHandling {
public static void main(String[] args) {
TestClass tc = new TestClass();
tc.default_method();
}
}