archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 16:44:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8240576: JVM crashes after transformation in C2 IdealLoopTree::merge_many_backedges

Browse source 
Reviewed-by: kvn
This commit is contained in:
Dongbo He 2020-03-09 22:31:12 +08:00 • committed by Fei Yang
parent e0fec43a9b
commit aa2be1141d
2 changed files with 62 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/share/opto/loopnode.cpp
View file

@ -2091,7 +2091,7 @@ bool IdealLoopTree::beautify_loops( PhaseIdealLoop *phase ) {
// If I am a shared header (multiple backedges), peel off the many // If I am a shared header (multiple backedges), peel off the many
// backedges into a private merge point and use the merge point as // backedges into a private merge point and use the merge point as
// the one true backedge. // the one true backedge.
if( _head->req() > 3 ) { if (_head->req() > 3 && !_irreducible) {
// Merge the many backedges into a single backedge but leave // Merge the many backedges into a single backedge but leave
// the hottest backedge as separate edge for the following peel. // the hottest backedge as separate edge for the following peel.
merge_many_backedges( phase ); merge_many_backedges( phase );

61
test/hotspot/jtreg/compiler/loopopts/TestBeautifyLoops.java Normal file
View file

@ -0,0 +1,61 @@
/*
* Copyright (c) 2020, Huawei Technologies Co. Ltd. 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 8240576
* @summary JVM crashes after transformation in C2 IdealLoopTree::merge_many_backedges
*
* @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation
* compiler.loopopts.TestBeautifyLoops
*/
package compiler.loopopts;
public class TestBeautifyLoops {
private int mI = 0;
private long mJ = 0;
private float mF = 0f;
public void testMethod() {
for (int i0 = 0; i0 < 100; i0++) {
if (mF != 0) {
// do nothing
} else {
try {
mJ = Long.MAX_VALUE;
for (int i1 = 0; i1 < 101; i1++) {
for (int i2 = 0; i2 < 102; i2++) {
mI = new Integer(0x1234);
}
}
} catch (Exception ignored) {}
}
}
}
public static void main(String[] args) {
TestBeautifyLoops obj = new TestBeautifyLoops();
obj.testMethod();
}
}