Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/macro.cpp	Thu Dec 29 11:37:50 2011 -0800
     1.2 +++ b/src/share/vm/opto/macro.cpp	Fri Dec 30 11:43:06 2011 -0800
     1.3 @@ -1503,9 +1503,16 @@
     1.4    // if we generated only a slow call, we are done
     1.5    if (always_slow) {
     1.6      // Now we can unhook i_o.
     1.7 -    call->set_req(TypeFunc::I_O, top());
     1.8 -    if (result_phi_i_o->outcnt() == 0)
     1.9 -      _igvn.remove_dead_node(result_phi_i_o);
    1.10 +    if (result_phi_i_o->outcnt() > 1) {
    1.11 +      call->set_req(TypeFunc::I_O, top());
    1.12 +    } else {
    1.13 +      assert(result_phi_i_o->unique_ctrl_out() == call, "");
    1.14 +      // Case of new array with negative size known during compilation.
    1.15 +      // AllocateArrayNode::Ideal() optimization disconnect unreachable
    1.16 +      // following code since call to runtime will throw exception.
    1.17 +      // As result there will be no users of i_o after the call.
    1.18 +      // Leave i_o attached to this call to avoid problems in preceding graph.
    1.19 +    }
    1.20      return;
    1.21    }
    1.22  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/compiler/7125879/Test7125879.java	Fri Dec 30 11:43:06 2011 -0800
     2.3 @@ -0,0 +1,51 @@
     2.4 +/*
     2.5 + * Copyright (c) 2011, 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 +/**
    2.29 + * @test
    2.30 + * @bug 7125879
    2.31 + * @summary assert(proj != NULL) failed: must be found
    2.32 + *
    2.33 + * @run main/othervm -Xcomp Test7125879
    2.34 + */
    2.35 +
    2.36 +public class Test7125879 {
    2.37 +    String var_1 = "abc";
    2.38 +
    2.39 +    public Test7125879() {
    2.40 +        var_1 = var_1.replaceAll("d", "e") + var_1;
    2.41 +    }
    2.42 +
    2.43 +    public static void main(String[] args) {
    2.44 +        Test7125879 t = new Test7125879();
    2.45 +        try {
    2.46 +            t.test();
    2.47 +        } catch(Throwable e) { }
    2.48 +    }
    2.49 +
    2.50 +    private void test() {
    2.51 +        new Test7125879().var_1 = ((Test7125879)(new Object[-1])[0]).var_1;
    2.52 +    }
    2.53 +}
    2.54 +