mirror of
https://github.com/JetBrains/JetBrainsRuntime.git
synced 2025-12-06 09:29:38 +01:00
8314024: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work due to bad immediate dominator info
Reviewed-by: kvn, chagedorn
This commit is contained in:
@@ -2962,6 +2962,8 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
|
||||
continue; // Don't rce this check but continue looking for other candidates.
|
||||
}
|
||||
|
||||
assert(is_dominator(compute_early_ctrl(limit, limit_c), pre_end), "node pinned on loop exit test?");
|
||||
|
||||
// Check for scaled induction variable plus an offset
|
||||
Node *offset = nullptr;
|
||||
|
||||
@@ -2980,6 +2982,8 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
|
||||
if (is_dominator(ctrl, offset_c)) {
|
||||
continue; // Don't rce this check but continue looking for other candidates.
|
||||
}
|
||||
|
||||
assert(is_dominator(compute_early_ctrl(offset, offset_c), pre_end), "node pinned on loop exit test?");
|
||||
#ifdef ASSERT
|
||||
if (TraceRangeLimitCheck) {
|
||||
tty->print_cr("RC bool node%s", flip ? " flipped:" : ":");
|
||||
|
||||
@@ -1799,6 +1799,14 @@ bool PhaseIdealLoop::ctrl_of_use_out_of_loop(const Node* n, Node* n_ctrl, IdealL
|
||||
if (n_loop->is_member(u_loop)) {
|
||||
return false; // Found use in inner loop
|
||||
}
|
||||
// Sinking a node from a pre loop to its main loop pins the node between the pre and main loops. If that node is input
|
||||
// to a check that's eliminated by range check elimination, it becomes input to an expression that feeds into the exit
|
||||
// test of the pre loop above the point in the graph where it's pinned.
|
||||
if (n_loop->_head->is_CountedLoop() && n_loop->_head->as_CountedLoop()->is_pre_loop() &&
|
||||
u_loop->_head->is_CountedLoop() && u_loop->_head->as_CountedLoop()->is_main_loop() &&
|
||||
n_loop->_next == get_loop(u_loop->_head->as_CountedLoop()->skip_strip_mined())) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
/*
|
||||
* Copyright (c) 2023, Red Hat, 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 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 8314024
|
||||
* @requires vm.compiler2.enabled
|
||||
* @summary Node used in check in main loop sunk from pre loop before RC elimination
|
||||
* @run main/othervm -XX:-BackgroundCompilation -XX:-UseLoopPredicate TestNodeSunkFromPreLoop
|
||||
*
|
||||
*/
|
||||
|
||||
public class TestNodeSunkFromPreLoop {
|
||||
private static int unusedField;
|
||||
|
||||
public static void main(String[] args) {
|
||||
A object = new A();
|
||||
for (int i = 0; i < 20_000; i++) {
|
||||
test(object, 1000, 0);
|
||||
}
|
||||
}
|
||||
|
||||
private static int test(A object, int stop, int inv) {
|
||||
int res = 0;
|
||||
// pre/main/post loops created for this loop
|
||||
for (int i = 0; i < stop; i++) {
|
||||
// Optimized out. Delay transformation of loop above.
|
||||
for (int j = 0; j < 10; j++) {
|
||||
for (int k = 0; k < 10; k++) {
|
||||
}
|
||||
}
|
||||
// null check in pre loop so field load also in pre loop
|
||||
int v = object.field;
|
||||
int v2 = (v + inv);
|
||||
if (i > 1000) {
|
||||
// never taken. v + inv has a use out of loop at an unc.
|
||||
unusedField = v2;
|
||||
}
|
||||
// transformed in the main loop to i + (v + inv)
|
||||
int v3 = (v + (i + inv));
|
||||
if (v3 > 1000) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
private static class A {
|
||||
public int field;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user