Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/code/dependencies.cpp	Tue Jun 03 09:44:54 2014 +0200
     1.2 +++ b/src/share/vm/code/dependencies.cpp	Thu Apr 09 16:41:40 2015 +0000
     1.3 @@ -811,7 +811,13 @@
     1.4      assert((uint)n <= (uint)_num_participants, "oob");
     1.5      Method* fm = _found_methods[n];
     1.6      assert(n == _num_participants || fm != NULL, "proper usage");
     1.7 -    assert(fm == NULL || fm->method_holder() == _participants[n], "sanity");
     1.8 +    if (fm != NULL && fm->method_holder() != _participants[n]) {
     1.9 +      // Default methods from interfaces can be added to classes. In
    1.10 +      // that case the holder of the method is not the class but the
    1.11 +      // interface where it's defined.
    1.12 +      assert(fm->is_default_method(), "sanity");
    1.13 +      return NULL;
    1.14 +    }
    1.15      return fm;
    1.16    }
    1.17  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/compiler/inlining/DefaultMethodsDependencies.java	Thu Apr 09 16:41:40 2015 +0000
     2.3 @@ -0,0 +1,63 @@
     2.4 +/*
     2.5 + * Copyright (c) 2015, 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 8069263
    2.30 + * @summary Deoptimization between array allocation and arraycopy may result in non initialized array
    2.31 + * @run main/othervm -XX:-BackgroundCompilation -XX:CompileOnly=DefaultMethodsDependencies::test -XX:CompileOnly=DefaultMethodsDependencies$I2::m1 DefaultMethodsDependencies
    2.32 + *
    2.33 + */
    2.34 +
    2.35 +public class DefaultMethodsDependencies {
    2.36 +
    2.37 +    interface I1 {
    2.38 +        void m1();
    2.39 +        // triggers processing of default methods in C1
    2.40 +        default void m2() {
    2.41 +        }
    2.42 +    }
    2.43 +
    2.44 +    interface I2 extends I1 {
    2.45 +        // added to C2 as default method
    2.46 +        default void m1() {
    2.47 +        }
    2.48 +    }
    2.49 +
    2.50 +    static abstract class C1 implements I1 {
    2.51 +    }
    2.52 +
    2.53 +    static class C2 extends C1 implements I2 {
    2.54 +    }
    2.55 +
    2.56 +    static void test(C1 obj) {
    2.57 +        obj.m1();
    2.58 +    }
    2.59 +
    2.60 +    static public void main(String[] args) {
    2.61 +        C2 obj = new C2();
    2.62 +        for (int i = 0; i < 20000; i++) {
    2.63 +            test(obj);
    2.64 +        }
    2.65 +    }
    2.66 +}