Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/ifnode.cpp	Wed Jun 05 04:48:05 2019 +0100
     1.2 +++ b/src/share/vm/opto/ifnode.cpp	Tue Apr 30 14:49:19 2019 +0200
     1.3 @@ -601,7 +601,7 @@
     1.4      if( din4->is_Call() &&      // Handle a slow-path call on either arm
     1.5          (din4 = din4->in(0)) )
     1.6        din4 = din4->in(0);
     1.7 -    if( din3 == din4 && din3->is_If() )
     1.8 +    if (din3 != NULL && din3 == din4 && din3->is_If()) // Regions not degraded to a copy
     1.9        return din3;              // Skip around diamonds
    1.10    }
    1.11  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/compiler/c2/TestIfWithDeadRegion.java	Tue Apr 30 14:49:19 2019 +0200
     2.3 @@ -0,0 +1,57 @@
     2.4 +/*
     2.5 + * Copyright (c) 2019, 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 8219807
    2.30 + * @summary Test IfNode::up_one_dom() with dead regions.
    2.31 + * @compile -XDstringConcat=inline TestIfWithDeadRegion.java
    2.32 + * @run main/othervm -XX:CompileCommand=compileonly,compiler.c2.TestIfWithDeadRegion::test
    2.33 + *                   compiler.c2.TestIfWithDeadRegion
    2.34 + */
    2.35 +
    2.36 +package compiler.c2;
    2.37 +
    2.38 +import java.util.function.Supplier;
    2.39 +
    2.40 +public class TestIfWithDeadRegion {
    2.41 +
    2.42 +    static String msg;
    2.43 +
    2.44 +    static String getString(String s, int i) {
    2.45 +        String current = s + String.valueOf(i);
    2.46 +        System.nanoTime();
    2.47 +        return current;
    2.48 +    }
    2.49 +
    2.50 +    static void test(Supplier<String> supplier) {
    2.51 +        msg = supplier.get();
    2.52 +    }
    2.53 +
    2.54 +    public static void main(String[] args) {
    2.55 +        for (int i = 0; i < 20_000; ++i) {
    2.56 +            test(() -> getString("Test1", 42));
    2.57 +            test(() -> getString("Test2", 42));
    2.58 +        }
    2.59 +    }
    2.60 +}