Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/loopnode.cpp	Mon Feb 06 12:16:31 2017 -0800
     1.2 +++ b/src/share/vm/opto/loopnode.cpp	Mon Jul 25 14:31:42 2016 -0700
     1.3 @@ -278,8 +278,16 @@
     1.4      return false;
     1.5  
     1.6    // Allow funny placement of Safepoint
     1.7 -  if (back_control->Opcode() == Op_SafePoint)
     1.8 +  if (back_control->Opcode() == Op_SafePoint) {
     1.9 +    if (UseCountedLoopSafepoints) {
    1.10 +      // Leaving the safepoint on the backedge and creating a
    1.11 +      // CountedLoop will confuse optimizations. We can't move the
    1.12 +      // safepoint around because its jvm state wouldn't match a new
    1.13 +      // location. Give up on that loop.
    1.14 +      return false;
    1.15 +    }
    1.16      back_control = back_control->in(TypeFunc::Control);
    1.17 +  }
    1.18  
    1.19    // Controlling test for loop
    1.20    Node *iftrue = back_control;

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/compiler/loopopts/TestCountedLoopSafepointBackedge.java	Mon Jul 25 14:31:42 2016 -0700
     2.3 @@ -0,0 +1,52 @@
     2.4 +/*
     2.5 + * Copyright (c) 2016, Red Hat, Inc. 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 8161147
    2.30 + * @summary Safepoint on backedge breaks UseCountedLoopSafepoints
    2.31 + * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:+UseCountedLoopSafepoints TestCountedLoopSafepointBackedge
    2.32 + *
    2.33 + */
    2.34 +
    2.35 +public class TestCountedLoopSafepointBackedge {
    2.36 +    static void test(int[] arr, int inc) {
    2.37 +        int i = 0;
    2.38 +        for (;;) {
    2.39 +            for (int j = 0; j < 10; j++);
    2.40 +            arr[i] = i;
    2.41 +            i++;
    2.42 +            if (i >= 100) {
    2.43 +                break;
    2.44 +            }
    2.45 +            for (int j = 0; j < 10; j++);
    2.46 +        }
    2.47 +    }
    2.48 +
    2.49 +    static public void main(String[] args) {
    2.50 +        int[] arr = new int[100];
    2.51 +        for (int i = 0; i < 20000; i++) {
    2.52 +             test(arr, 1);
    2.53 +        }
    2.54 +    }
    2.55 +}