# HG changeset patch # User kvn # Date 1349214561 25200 # Node ID f13867c41f735367cca1d136e9337c84e86e9ad9 # Parent 859c45fb8cea19844e64ed442cbbd2d1fbff15d6 7199742: A lot of C2 OSR compilations of the same method's bci Summary: Don't clone head of OSR loop. Reviewed-by: jrose, twisti diff -r 859c45fb8cea -r f13867c41f73 src/share/vm/ci/ciTypeFlow.cpp --- a/src/share/vm/ci/ciTypeFlow.cpp Tue Oct 02 12:25:13 2012 -0700 +++ b/src/share/vm/ci/ciTypeFlow.cpp Tue Oct 02 14:49:21 2012 -0700 @@ -2194,6 +2194,10 @@ if (head->backedge_copy_count() != 0) continue; + // Don't clone head of OSR loop to get correct types in start block. + if (is_osr_flow() && head->start() == start_bci()) + continue; + // check _no_ shared head below us Loop* ch; for (ch = lp->child(); ch != NULL && ch->head() != head; ch = ch->sibling()); diff -r 859c45fb8cea -r f13867c41f73 src/share/vm/opto/parse1.cpp --- a/src/share/vm/opto/parse1.cpp Tue Oct 02 12:25:13 2012 -0700 +++ b/src/share/vm/opto/parse1.cpp Tue Oct 02 14:49:21 2012 -0700 @@ -372,7 +372,8 @@ // in the CFG, which typeflow had previously ignored. // E.g., Object x = coldAtFirst() && notReached()? "str": new Integer(123). // This x will be typed as Integer if notReached is not yet linked. - uncommon_trap(Deoptimization::Reason_unreached, + // It could also happen due to a problem in ciTypeFlow analysis. + uncommon_trap(Deoptimization::Reason_constraint, Deoptimization::Action_reinterpret); set_map(types_are_good); } diff -r 859c45fb8cea -r f13867c41f73 test/compiler/7199742/Test7199742.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/compiler/7199742/Test7199742.java Tue Oct 02 14:49:21 2012 -0700 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/** + * @test + * @bug 7199742 + * @summary A lot of C2 OSR compilations of the same method's bci + * + * @run main/othervm -Xmx32m -Xbatch Test7199742 + */ + +public class Test7199742 { + private static final int ITERS = 10000000; + public static void main(String args[]) { + Test7199742 t = new Test7199742(); + for (int i=0; i<10; i++) { + test(t, 7); + } + } + static Test7199742 test(Test7199742 t, int m) { + int i = -(ITERS/2); + if (i == 0) return null; + Test7199742 v = null; + while(i < ITERS) { + if ((i&m) == 0) { + v = t; + } + i++; + } + return v; + } +} +