8342287: C2 fails with "assert(is_IfTrue()) failed: invalid node class: IfFalse" due to Template Assertion Predicate with two UCTs
Reviewed-by: kvn, thartmann
This commit is contained in:
parent
76ae072a1f
commit
d61f56a300
src/hotspot
share/opto
test/hotspot/jtreg/compiler/predicates
@ -2826,6 +2826,10 @@ SafePointNode* CountedLoopNode::outer_safepoint() const {
|
||||
|
||||
Node* CountedLoopNode::skip_assertion_predicates_with_halt() {
|
||||
Node* ctrl = in(LoopNode::EntryControl);
|
||||
if (ctrl == nullptr) {
|
||||
// Dying loop.
|
||||
return nullptr;
|
||||
}
|
||||
if (is_main_loop()) {
|
||||
ctrl = skip_strip_mined()->in(LoopNode::EntryControl);
|
||||
}
|
||||
|
@ -34,6 +34,7 @@
|
||||
// Walk over all Initialized Assertion Predicates and return the entry into the first Initialized Assertion Predicate
|
||||
// (i.e. not belonging to an Initialized Assertion Predicate anymore)
|
||||
Node* AssertionPredicatesWithHalt::find_entry(Node* start_proj) {
|
||||
assert(start_proj != nullptr, "should not be null");
|
||||
Node* entry = start_proj;
|
||||
while (AssertionPredicateWithHalt::is_predicate(entry)) {
|
||||
entry = entry->in(0)->in(0);
|
||||
@ -41,8 +42,14 @@ Node* AssertionPredicatesWithHalt::find_entry(Node* start_proj) {
|
||||
return entry;
|
||||
}
|
||||
|
||||
// An Assertion Predicate has always a true projection on the success path.
|
||||
bool may_be_assertion_predicate_if(const Node* node) {
|
||||
assert(node != nullptr, "should not be null");
|
||||
return node->is_IfTrue() && RegularPredicate::may_be_predicate_if(node->as_IfProj());
|
||||
}
|
||||
|
||||
bool AssertionPredicateWithHalt::is_predicate(const Node* maybe_success_proj) {
|
||||
if (maybe_success_proj == nullptr || !maybe_success_proj->is_IfProj() || !maybe_success_proj->in(0)->is_If()) {
|
||||
if (!may_be_assertion_predicate_if(maybe_success_proj)) {
|
||||
return false;
|
||||
}
|
||||
return has_assertion_predicate_opaque(maybe_success_proj) && has_halt(maybe_success_proj);
|
||||
@ -133,7 +140,7 @@ bool RuntimePredicate::is_predicate(Node* node, Deoptimization::DeoptReason deop
|
||||
// A Template Assertion Predicate has an If/RangeCheckNode and either an UCT or a halt node depending on where it
|
||||
// was created.
|
||||
bool TemplateAssertionPredicate::is_predicate(Node* node) {
|
||||
if (!RegularPredicate::may_be_predicate_if(node)) {
|
||||
if (!may_be_assertion_predicate_if(node)) {
|
||||
return false;
|
||||
}
|
||||
IfNode* if_node = node->in(0)->as_If();
|
||||
|
@ -687,10 +687,15 @@ class PredicateIterator : public StackObj {
|
||||
Node* current = _start_node;
|
||||
PredicateBlockIterator loop_limit_check_predicate_iterator(current, Deoptimization::Reason_loop_limit_check);
|
||||
current = loop_limit_check_predicate_iterator.for_each(predicate_visitor);
|
||||
PredicateBlockIterator profiled_loop_predicate_iterator(current, Deoptimization::Reason_profile_predicate);
|
||||
current = profiled_loop_predicate_iterator.for_each(predicate_visitor);
|
||||
PredicateBlockIterator loop_predicate_iterator(current, Deoptimization::Reason_predicate);
|
||||
return loop_predicate_iterator.for_each(predicate_visitor);
|
||||
if (UseLoopPredicate) {
|
||||
if (UseProfiledLoopPredicate) {
|
||||
PredicateBlockIterator profiled_loop_predicate_iterator(current, Deoptimization::Reason_profile_predicate);
|
||||
current = profiled_loop_predicate_iterator.for_each(predicate_visitor);
|
||||
}
|
||||
PredicateBlockIterator loop_predicate_iterator(current, Deoptimization::Reason_predicate);
|
||||
current = loop_predicate_iterator.for_each(predicate_visitor);
|
||||
}
|
||||
return current;
|
||||
}
|
||||
};
|
||||
|
||||
|
61
src/hotspot/test/hotspot/jtreg/compiler/predicates/TestTemplateAssertionPredicateWithTwoUCTs.java
Normal file
61
src/hotspot/test/hotspot/jtreg/compiler/predicates/TestTemplateAssertionPredicateWithTwoUCTs.java
Normal file
@ -0,0 +1,61 @@
|
||||
/*
|
||||
* Copyright (c) 2024, 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 8342287
|
||||
* @summary Test that a fail path projection of a Template Assertion Predicate is not treated as success path projection
|
||||
* @run main/othervm -XX:-TieredCompilation -Xbatch
|
||||
* -XX:CompileCommand=compileonly,compiler.predicates.TestTemplateAssertionPredicateWithTwoUCTs::test
|
||||
* compiler.predicates.TestTemplateAssertionPredicateWithTwoUCTs
|
||||
*/
|
||||
|
||||
package compiler.predicates;
|
||||
|
||||
public class TestTemplateAssertionPredicateWithTwoUCTs {
|
||||
static int iFld;
|
||||
|
||||
public static void main(String[] strArr) {
|
||||
for (int i = 0; i < 1000; i++) {
|
||||
test();
|
||||
}
|
||||
}
|
||||
|
||||
static void test() {
|
||||
int lArr[][] = new int[100][1];
|
||||
for (int i14 = 5; i14 < 273; ++i14) {
|
||||
int i16 = 1;
|
||||
while (++i16 < 94) {
|
||||
lArr[i16][0] += 1;
|
||||
switch (i14) {
|
||||
case 11:
|
||||
case 2:
|
||||
case 13:
|
||||
iFld = 34;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user