Skip to content
This repository was archived by the owner on Sep 2, 2022. It is now read-only.
/ jdk16 Public archive

Commit 4de3a6b

Browse files
committed
8260709: C2: assert(false) failed: unscheduable graph
Reviewed-by: thartmann, chagedorn
1 parent 5307afa commit 4de3a6b

File tree

3 files changed

+70
-1
lines changed

3 files changed

+70
-1
lines changed

src/hotspot/share/opto/loopnode.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -1607,6 +1607,8 @@ class PhaseIdealLoop : public PhaseTransform {
16071607
void check_long_counted_loop(IdealLoopTree* loop, Node* x) NOT_DEBUG_RETURN;
16081608

16091609
LoopNode* create_inner_head(IdealLoopTree* loop, LongCountedLoopNode* head, LongCountedLoopEndNode* exit_test);
1610+
1611+
bool is_safe_load_ctrl(Node* ctrl);
16101612
};
16111613

16121614

src/hotspot/share/opto/loopopts.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -1429,7 +1429,7 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
14291429
// If n is a load, and the late control is the same as the current
14301430
// control, then the cloning of n is a pointless exercise, because
14311431
// GVN will ensure that we end up where we started.
1432-
if (!n->is_Load() || late_load_ctrl != n_ctrl) {
1432+
if (!n->is_Load() || (late_load_ctrl != n_ctrl && is_safe_load_ctrl(late_load_ctrl))) {
14331433
for (DUIterator_Last jmin, j = n->last_outs(jmin); j >= jmin; ) {
14341434
Node *u = n->last_out(j); // Clone private computation per use
14351435
_igvn.rehash_node_delayed(u);
@@ -1525,6 +1525,13 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
15251525
}
15261526
}
15271527

1528+
bool PhaseIdealLoop::is_safe_load_ctrl(Node* ctrl) {
1529+
if (ctrl->is_Proj() && ctrl->in(0)->is_Call() && ctrl->has_out_with(Op_Catch)) {
1530+
return false;
1531+
}
1532+
return true;
1533+
}
1534+
15281535
//------------------------------split_if_with_blocks---------------------------
15291536
// Check for aggressive application of 'split-if' optimization,
15301537
// using basic block level info.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright (c) 2021, Red Hat, Inc. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/**
25+
* @test
26+
* @bug 8260709
27+
* @summary C2: assert(false) failed: unscheduable graph
28+
*
29+
* @run main/othervm -XX:-BackgroundCompilation TestLoadPinnedAfterAllocate
30+
*
31+
*/
32+
33+
public class TestLoadPinnedAfterAllocate {
34+
private int field;
35+
private static volatile int barrier;
36+
private static Object field2;
37+
38+
public static void main(String[] args) {
39+
final TestLoadPinnedAfterAllocate test = new TestLoadPinnedAfterAllocate();
40+
for (int i = 0; i < 20_000; i++) {
41+
test.test(1, 10);
42+
}
43+
}
44+
45+
private int test(int start, int stop) {
46+
int[] array = new int[10];
47+
for (int j = 0; j < 10; j++) {
48+
barrier = 1;
49+
// early control for field load below
50+
for (int i = 1; i < 10; i *= 2) {
51+
field2 = array;
52+
array = new int[10];
53+
// late control for field load below
54+
}
55+
}
56+
int v = field;
57+
array[0] = v;
58+
return v+v;
59+
}
60+
}

0 commit comments

Comments
 (0)