8036100: Default method returns true for a while, and then returns false
Reviewed-by: kvn, jrose
This commit is contained in:
parent
1dbe60a475
commit
fc6e8666a1
@ -724,6 +724,11 @@ ciMethod* ciMethod::find_monomorphic_target(ciInstanceKlass* caller,
|
||||
|
||||
VM_ENTRY_MARK;
|
||||
|
||||
// Disable CHA for default methods for now
|
||||
if (root_m->get_Method()->is_default_method()) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
methodHandle target;
|
||||
{
|
||||
MutexLocker locker(Compile_lock);
|
||||
|
58
hotspot/test/compiler/inlining/InlineDefaultMethod1.java
Normal file
58
hotspot/test/compiler/inlining/InlineDefaultMethod1.java
Normal file
@ -0,0 +1,58 @@
|
||||
/*
|
||||
* Copyright (c) 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.
|
||||
*
|
||||
* 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 8036100
|
||||
* @summary Default method returns true for a while, and then returns false
|
||||
* @run main/othervm -Xcomp -XX:CompileOnly=InlineDefaultMethod1::test
|
||||
* -XX:CompileOnly=I1::m -XX:CompileOnly=I2::m
|
||||
* InlineDefaultMethod1
|
||||
*/
|
||||
interface I1 {
|
||||
default public int m() { return 0; }
|
||||
}
|
||||
|
||||
interface I2 extends I1 {
|
||||
default public int m() { return 1; }
|
||||
}
|
||||
|
||||
abstract class A implements I1 {
|
||||
}
|
||||
|
||||
class B extends A implements I2 {
|
||||
}
|
||||
|
||||
public class InlineDefaultMethod1 {
|
||||
public static void test(A obj) {
|
||||
int id = obj.m();
|
||||
if (id != 1) {
|
||||
throw new AssertionError("Called wrong method: 1 != "+id);
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws InterruptedException {
|
||||
test(new B());
|
||||
System.out.println("TEST PASSED");
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user