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

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2021-07-30 22:30:23 +00:00
commit 7cc1eb3e57
4 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2045,7 +2045,7 @@ Node* CountedLoopNode::match_incr_with_optional_truncation(Node* expr, Node** tr
}
LoopNode* CountedLoopNode::skip_strip_mined(int expect_skeleton) {
if (is_strip_mined() && is_valid_counted_loop(T_INT)) {
if (is_strip_mined() && in(EntryControl) != NULL && in(EntryControl)->is_OuterStripMinedLoop()) {
verify_strip_mined(expect_skeleton);
return in(EntryControl)->as_Loop();
}

4
test/hotspot/jtreg/ProblemList-zgc.txt
View File

@ -40,3 +40,7 @@ serviceability/sa/ClhsdbPmap.java#id1 8268722 macosx-x
serviceability/sa/ClhsdbPstack.java#id1 8268722 macosx-x64
serviceability/sa/TestJmapCore.java 8268722,8268283 macosx-x64,linux-aarch64
serviceability/sa/TestJmapCoreMetaspace.java 8268722,8268636 generic-all
serviceability/sa/TestJhsdbJstackMixed.java 8248912 generic-all
serviceability/sa/ClhsdbPstack.java#id0 8248912 generic-all
serviceability/sa/ClhsdbPstack.java#id1 8248912 generic-all

2
test/hotspot/jtreg/ProblemList.txt
View File

@ -106,7 +106,7 @@ applications/jcstress/copy.java 8229852 linux-x64
# :hotspot_serviceability
serviceability/sa/sadebugd/DebugdConnectTest.java 8239062 macosx-x64
serviceability/sa/sadebugd/DebugdConnectTest.java 8239062,8270326 macosx-x64,macosx-aarch64
serviceability/sa/TestRevPtrsForInvokeDynamic.java 8241235 generic-all
resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java 8262386 generic-all

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

@ -0,0 +1,57 @@
/*
* Copyright (c) 2021, 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 8271272
* @summary C2: assert(!had_error) failed: bad dominance
*
* @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=TestMainNeverExecuted TestMainNeverExecuted
*
*/
public class TestMainNeverExecuted {
public static long y;
static int iArrFld[] = new int[400];
static long x = 0;
public static void main(String[] strArr) {
for (int i1 = 0; i1 < 100; i1++)
vMeth(3, 5);
}
static void vMeth(int f, int g) {
int i3 = 23;
int i11 = 2, i12 = 12, i13 = 32901, i14 = 43741;
for (i11 = 7; i11 < 325; ++i11) {
i13 = 1;
while ((i13 += 3) < 5) {
iArrFld[i13 - 1] = 906;
for (i14 = i13; i14 < 5; i14 += 2) {
y += i14;
i3 += i14;
}
}
}
x += i11 + i12 + i13 + i14;
}
}