Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/connode.cpp	Mon Mar 11 11:42:57 2019 +0100
     1.2 +++ b/src/share/vm/opto/connode.cpp	Mon Jan 21 13:31:42 2019 +0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -1083,7 +1083,11 @@
    1.11      assert(rxlo == (int)rxlo && rxhi == (int)rxhi, "x should not overflow");
    1.12      assert(rylo == (int)rylo && ryhi == (int)ryhi, "y should not overflow");
    1.13      Node* cx = phase->C->constrained_convI2L(phase, x, TypeInt::make(rxlo, rxhi, widen), NULL);
    1.14 +    Node *hook = new (phase->C) Node(1);
    1.15 +    hook->init_req(0, cx);  // Add a use to cx to prevent him from dying
    1.16      Node* cy = phase->C->constrained_convI2L(phase, y, TypeInt::make(rylo, ryhi, widen), NULL);
    1.17 +    hook->del_req(0);  // Just yank bogus edge
    1.18 +    hook->destruct();
    1.19      switch (op) {
    1.20      case Op_AddI:  return new (phase->C) AddLNode(cx, cy);
    1.21      case Op_SubI:  return new (phase->C) SubLNode(cx, cy);

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/compiler/c2/Test8217359.java	Mon Jan 21 13:31:42 2019 +0800
     2.3 @@ -0,0 +1,74 @@
     2.4 +/*
     2.5 + * Copyright (c) 2019, Huawei Technologies Co. Ltd. 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 8217359
    2.30 + * @summary C2 compiler triggers SIGSEGV after transformation in ConvI2LNode::Ideal
    2.31 + *
    2.32 + * @run main/othervm -XX:-TieredCompilation
    2.33 + *      -XX:CompileCommand=compileonly,compiler.c2.Test8217359::test
    2.34 + *      compiler.c2.Test8217359
    2.35 + */
    2.36 +
    2.37 +package compiler.c2;
    2.38 +
    2.39 +public class Test8217359 {
    2.40 +
    2.41 +    public static int ival = 0;
    2.42 +    public static long lsum = 0;
    2.43 +    public static long lval = 0;
    2.44 +
    2.45 +    public static void test() {
    2.46 +        short s = -25632;
    2.47 +        float f = 0.512F, f1 = 2.556F;
    2.48 +        int i6 = 32547, i7 = 9, i8 = -9, i9 = 36, i10 = -223;
    2.49 +
    2.50 +        for (i6 = 4; i6 < 182; i6++) {
    2.51 +            i8 = 1;
    2.52 +            while (++i8 < 17) {
    2.53 +                f1 = 1;
    2.54 +                do {
    2.55 +                    i7 += (182 + (f1 * f1));
    2.56 +                } while (++f1 < 1);
    2.57 +
    2.58 +                Test8217359.ival += (i8 | Test8217359.ival);
    2.59 +            }
    2.60 +        }
    2.61 +
    2.62 +        for (i9 = 9; i9 < 100; ++i9) {
    2.63 +            i10 -= i6;
    2.64 +            i10 >>= s;
    2.65 +            i7 += (((i9 * i10) + i6) - Test8217359.lval);
    2.66 +        }
    2.67 +
    2.68 +        lsum += i6 + i7 + i8;
    2.69 +    }
    2.70 +
    2.71 +    public static void main(String[] args) {
    2.72 +        for (int i = 0; i < 16000; i++) {
    2.73 +            test();
    2.74 +        }
    2.75 +    }
    2.76 +
    2.77 +}