Mercurial > hg > truffle
changeset 1199:0e14bd797dad
6792161: assert("No dead instructions after post-alloc")
Reviewed-by: kvn
author | never |
---|---|
date | Thu, 28 Jan 2010 20:41:37 -0800 |
parents | 8d9bfe6a446b |
children | ba263cfb7611 |
files | src/share/vm/opto/ifg.cpp test/compiler/6792161/Test6792161.java |
diffstat | 2 files changed, 72 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/ifg.cpp Thu Jan 28 16:28:28 2010 -0800 +++ b/src/share/vm/opto/ifg.cpp Thu Jan 28 20:41:37 2010 -0800 @@ -1,5 +1,5 @@ /* - * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1998-2010 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 @@ -736,7 +736,28 @@ // the flags and assumes it's dead. This keeps the (useless) // flag-setting behavior alive while also keeping the (useful) // memory update effect. - for( uint k = ((n->Opcode() == Op_SCMemProj) ? 0:1); k < n->req(); k++ ) { + uint begin = 1; + uint end = n->req(); + if (n->Opcode() == Op_SCMemProj) { + begin = 0; + } else if (n->is_Mach()) { + switch (n->as_Mach()->ideal_Opcode()) { + case Op_MemBarAcquire: + case Op_MemBarVolatile: + if (n->len() >= MemBarNode::Precedent + 1 && + n->in(MemBarNode::Precedent) != NULL && + n->in(MemBarNode::Precedent)->outcnt() == 1) { + // This membar node is the single user of it's input + // so the input won't be considered live and this node + // would get deleted during copy elimination so force + // it to be live. + end = MemBarNode::Precedent + 1; + } + break; + } + } + + for( uint k = begin; k < end; k++ ) { Node *def = n->in(k); uint x = n2lidx(def); if( !x ) continue;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/compiler/6792161/Test6792161.java Thu Jan 28 20:41:37 2010 -0800 @@ -0,0 +1,49 @@ +/* + * Copyright 2010 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 6792161 + * @summary assert("No dead instructions after post-alloc") + * + * @run main/othervm -Xcomp -XX:MaxInlineSize=120 Test6792161 + */ + +import java.lang.reflect.Constructor; +public class Test6792161 { + static Constructor test(Class cls) throws Exception { + Class[] args= { String.class }; + try { + return cls.getConstructor(args); + } catch (NoSuchMethodException e) {} + return cls.getConstructor(new Class[0]); + } + public static void main(final String[] args) throws Exception { + try { + for (int i = 0; i < 100000; i++) { + Constructor ctor = test(Class.forName("Test6792161")); + } + } catch (NoSuchMethodException e) {} + } +}