diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp index 906af75091a..6c655e6f137 100644 --- a/src/hotspot/share/opto/loopPredicate.cpp +++ b/src/hotspot/share/opto/loopPredicate.cpp @@ -445,9 +445,8 @@ void PhaseIdealLoop::clone_loop_predication_predicates_to_unswitched_loop(IdealL Deoptimization::DeoptReason reason, IfProjNode*& iffast_pred, IfProjNode*& ifslow_pred) { - if (predicate_block->is_non_empty()) { + if (predicate_block->has_parse_predicate()) { clone_parse_predicate_to_unswitched_loops(predicate_block, reason, iffast_pred, ifslow_pred); - clone_assertion_predicates_to_unswitched_loop(loop, old_new, reason, predicate_block->parse_predicate_success_proj(), iffast_pred, ifslow_pred); } @@ -456,6 +455,7 @@ void PhaseIdealLoop::clone_loop_predication_predicates_to_unswitched_loop(IdealL void PhaseIdealLoop::clone_parse_predicate_to_unswitched_loops(const PredicateBlock* predicate_block, Deoptimization::DeoptReason reason, IfProjNode*& iffast_pred, IfProjNode*& ifslow_pred) { + assert(predicate_block->has_parse_predicate(), "must have parse predicate"); ParsePredicateSuccessProj* parse_predicate_proj = predicate_block->parse_predicate_success_proj(); iffast_pred = clone_parse_predicate_to_unswitched_loop(parse_predicate_proj, iffast_pred, reason, false); check_cloned_parse_predicate_for_unswitching(iffast_pred, true); diff --git a/test/hotspot/jtreg/compiler/predicates/TestLoopUnswitchingWithoutParsePredicates.java b/test/hotspot/jtreg/compiler/predicates/TestLoopUnswitchingWithoutParsePredicates.java new file mode 100644 index 00000000000..e84908fd429 --- /dev/null +++ b/test/hotspot/jtreg/compiler/predicates/TestLoopUnswitchingWithoutParsePredicates.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2023, 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 8314106 + * @summary Test that we do not try to copy a Parse Predicate to an unswitched loop if they do not exist anymore. + * @run main/othervm -Xbatch -XX:-TieredCompilation + * -XX:CompileCommand=compileonly,compiler.predicates.TestLoopUnswitchingWithoutParsePredicates::* + * compiler.predicates.TestLoopUnswitchingWithoutParsePredicates + */ + +package compiler.predicates; + +public class TestLoopUnswitchingWithoutParsePredicates { + static byte byFld; + static byte byArrFld[] = new byte[400]; + + public static void main(String[] strArr) { + for (int i = 0; i < 1000;i++) { + test(i); + } + } + + static void test(int i2) { + int i10, i11 = 0, i12, i13, i14; + double dArr[] = new double[400]; + for (i10 = 7; i10 < 307; i10++) { + byArrFld[i10] = 58; + for (i12 = 1; i12 < 3; i12++) { + for (i14 = 1; i14 < 2; i14++) { + byFld &= i14; + switch (i2) { + case 4: + dArr[1] = i14; + case 2: + i13 = i11; + } + } + } + } + } +} +