# HG changeset patch # User kvn # Date 1238790812 25200 # Node ID ad8c635e757eda757150e4bb923bdde3c5142efe # Parent 4e35bfab60a5eaeb9fd3698d9daa84d8cfab7225 6823453: DeoptimizeALot causes fastdebug server jvm to fail with assert(false,"unscheduable graph") Summary: Use a HaltNode on the fall through path of the AllocateArrayNode to indicate that it is unreachable if the array length is negative. Reviewed-by: never, jrose diff -r 4e35bfab60a5 -r ad8c635e757e src/share/vm/opto/callnode.cpp --- a/src/share/vm/opto/callnode.cpp Thu Apr 02 10:49:41 2009 -0700 +++ b/src/share/vm/opto/callnode.cpp Fri Apr 03 13:33:32 2009 -0700 @@ -1043,6 +1043,51 @@ //============================================================================= uint AllocateArrayNode::size_of() const { return sizeof(*this); } +Node* AllocateArrayNode::Ideal(PhaseGVN *phase, bool can_reshape) { + if (remove_dead_region(phase, can_reshape)) return this; + + const Type* type = phase->type(Ideal_length()); + if (type->isa_int() && type->is_int()->_hi < 0) { + if (can_reshape) { + PhaseIterGVN *igvn = phase->is_IterGVN(); + // Unreachable fall through path (negative array length), + // the allocation can only throw so disconnect it. + Node* proj = proj_out(TypeFunc::Control); + Node* catchproj = NULL; + if (proj != NULL) { + for (DUIterator_Fast imax, i = proj->fast_outs(imax); i < imax; i++) { + Node *cn = proj->fast_out(i); + if (cn->is_Catch()) { + catchproj = cn->as_Multi()->proj_out(CatchProjNode::fall_through_index); + break; + } + } + } + if (catchproj != NULL && catchproj->outcnt() > 0 && + (catchproj->outcnt() > 1 || + catchproj->unique_out()->Opcode() != Op_Halt)) { + assert(catchproj->is_CatchProj(), "must be a CatchProjNode"); + Node* nproj = catchproj->clone(); + igvn->register_new_node_with_optimizer(nproj); + + Node *frame = new (phase->C, 1) ParmNode( phase->C->start(), TypeFunc::FramePtr ); + frame = phase->transform(frame); + // Halt & Catch Fire + Node *halt = new (phase->C, TypeFunc::Parms) HaltNode( nproj, frame ); + phase->C->root()->add_req(halt); + phase->transform(halt); + + igvn->replace_node(catchproj, phase->C->top()); + return this; + } + } else { + // Can't correct it during regular GVN so register for IGVN + phase->C->record_for_igvn(this); + } + } + return NULL; +} + // Retrieve the length from the AllocateArrayNode. Narrow the type with a // CastII, if appropriate. If we are not allowed to create new nodes, and // a CastII is appropriate, return NULL. diff -r 4e35bfab60a5 -r ad8c635e757e src/share/vm/opto/callnode.hpp --- a/src/share/vm/opto/callnode.hpp Thu Apr 02 10:49:41 2009 -0700 +++ b/src/share/vm/opto/callnode.hpp Fri Apr 03 13:33:32 2009 -0700 @@ -762,6 +762,7 @@ } virtual int Opcode() const; virtual uint size_of() const; // Size is bigger + virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); // Dig the length operand out of a array allocation site. Node* Ideal_length() { diff -r 4e35bfab60a5 -r ad8c635e757e test/compiler/6823453/Test.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/compiler/6823453/Test.java Fri Apr 03 13:33:32 2009 -0700 @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + +/* + * @test + * @bug 6823453 + * @summary DeoptimizeALot causes fastdebug server jvm to fail with assert(false,"unscheduable graph") + * @run main/othervm -Xcomp -XX:CompileOnly=Test -XX:+DeoptimizeALot Test + */ + +public class Test { + + static long vara_1 = 1L; + + static void testa() { + short var_2 = (byte) 1.0E10; + + for ( Object temp = new byte[(byte)1.0E10]; true ; + var_2 = "1".equals("0") ? ((byte) vara_1) : 1 ) {} + } + + static void testb() { + long var_1 = -1L; + + short var_2 = (byte) 1.0E10; + + for ( Object temp = new byte[(byte)1.0E10]; true ; + var_2 = "1".equals("0") ? ((byte) var_1) : 1 ) {} + } + + static void testc() { + long var_1 = -1L; + if (vara_1 > 0) var_1 = 1L; + + int var_2 = (byte)var_1 - 128; + + for ( Object temp = new byte[var_2]; true ; + var_2 = "1".equals("0") ? 2 : 1 ) {} + } + + static void testd() { + long var_1 = 0L; + + int var_2 = (byte)var_1 + 1; + for (int i=0; i<2 ; i++) var_2 = var_2 - 1; + + for ( Object temp = new byte[var_2]; true ; + var_2 = "1".equals("0") ? 2 : 1 ) {} + } + + public static void main(String[] args) throws Exception { + int nex = 0; + + try { + testa(); + } + catch (java.lang.NegativeArraySizeException ex) { nex++; } + try { + testb(); + } + catch (java.lang.NegativeArraySizeException ex) { nex++; } + try { + testc(); + } + catch (java.lang.NegativeArraySizeException ex) { nex++; } + try { + testd(); + } + catch (java.lang.NegativeArraySizeException ex) { nex++; } + + if (nex != 4) + System.exit(97); + } +} +