stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8335709: C2: assert(!loop->is_member(get_loop(useblock))) failed: must be outside loop

Browse Source 
Co-authored-by: Emanuel Peter <epeter@openjdk.org>
Reviewed-by: epeter, thartmann
This commit is contained in:
Roland Westrelin 2024-07-19 07:30:23 +00:00
parent 10982fe557
commit 0ddf54e222
2 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hotspot/share/opto/loopnode.cpp
View File

@ -5473,7 +5473,8 @@ int PhaseIdealLoop::build_loop_tree_impl( Node *n, int pre_order ) {
} else { // Else not a nested loop
if (!_loop_or_ctrl[m->_idx]) continue; // Dead code has no loop
l = get_loop(m); // Get previously determined loop
IdealLoopTree* m_loop = get_loop(m);
l = m_loop; // Get previously determined loop
// If successor is header of a loop (nest), move up-loop till it
// is a member of some outer enclosing loop. Since there are no
// shared headers (I've split them already) I only need to go up
@ -5499,10 +5500,10 @@ int PhaseIdealLoop::build_loop_tree_impl( Node *n, int pre_order ) {
// Insert the NeverBranch between 'm' and it's control user.
NeverBranchNode *iff = new NeverBranchNode( m );
_igvn.register_new_node_with_optimizer(iff);
set_loop(iff, l);
set_loop(iff, m_loop);
Node *if_t = new CProjNode( iff, 0 );
_igvn.register_new_node_with_optimizer(if_t);
set_loop(if_t, l);
set_loop(if_t, m_loop);
Node* cfg = nullptr; // Find the One True Control User of m
for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {

57
test/hotspot/jtreg/compiler/loopopts/InfiniteLoopBadControlNeverBranch.java Normal file
View File

@ -0,0 +1,57 @@
/*
* 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 8335709
* @summary C2: assert(!loop->is_member(get_loop(useblock))) failed: must be outside loop
* @library /test/lib
* @run main/othervm -Xcomp -XX:CompileCommand=compileonly,InfiniteLoopBadControlNeverBranch::* InfiniteLoopBadControlNeverBranch
*
*/
import jdk.test.lib.Utils;
public class InfiniteLoopBadControlNeverBranch {
static int b;
static short c;
public static void main(String[] args) throws InterruptedException {
Thread thread = new Thread(() -> test());
thread.setDaemon(true);
thread.start();
Thread.sleep(Utils.adjustTimeout(4000));
}
static void test() {
int i = 0;
while (true) {
if (i > 1) {
b = 0;
}
c = (short) (b * 7);
i++;
}
}
}