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

8290451: Incorrect result when switching to C2 OSR compilation from C1

Browse Source 
Reviewed-by: thartmann, kvn
This commit is contained in:
Roland Westrelin 2022-08-30 07:27:51 +00:00
parent bc6ac6f7af
commit afa5d4ced3
3 changed files with 113 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/c1/c1_Canonicalizer.cpp
View File

@ -790,7 +790,7 @@ void Canonicalizer::do_If(If* x) {
else if (lss_sux == gtr_sux) { cond = If::neq; tsux = lss_sux; fsux = eql_sux; }
else if (eql_sux == gtr_sux) { cond = If::geq; tsux = eql_sux; fsux = lss_sux; }
else { ShouldNotReachHere(); }
If* canon = new If(cmp->x(), cond, nan_sux == tsux, cmp->y(), tsux, fsux, cmp->state_before(), x->is_safepoint());
If* canon = new If(cmp->x(), cond, nan_sux == tsux, cmp->y(), tsux, fsux, x->state_before(), x->is_safepoint());
if (cmp->x() == cmp->y()) {
do_If(canon);
} else {

69
test/hotspot/jtreg/compiler/c1/BadStateAtLongCmp.jasm Normal file
View File

@ -0,0 +1,69 @@
/*
* Copyright (c) 2022, 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.
*/
super public class BadStateAtLongCmp
version 52:0
{
public static Field field:I;
public Method "<init>":"()V"
stack 1 locals 1
{
aload_0;
invokespecial Method java/lang/Object."<init>":"()V";
return;
}
/* Same as:
public static void test() {
long l = 0;
do {
l++;
field++;
} while (l < 1000);
}
but with field++ between the lcmp and iflt bytecodes.
*/
public static Method test:"()V"
stack 4 locals 2
{
lconst_0;
lstore_0;
L2: stack_frame_type append;
locals_map long;
lload_0;
lconst_1;
ladd;
lstore_0;
lload_0;
ldc2_w long 1000l;
lcmp;
getstatic Field field:"I";
iconst_1;
iadd;
putstatic Field field:"I";
iflt L2;
return;
}
} // end Class BadStateAtLongCmp

43
test/hotspot/jtreg/compiler/c1/TestBadStateAtLongCmp.java Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright (c) 2022, 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 8290451
* @summary Incorrect result when switching to C2 OSR compilation from C1
* @compile BadStateAtLongCmp.jasm
* @run main/othervm -Xbatch TestBadStateAtLongCmp
*/
public class TestBadStateAtLongCmp {
public static void main(String[] args) {
for (int i = 0; i < 20_000; i++) {
BadStateAtLongCmp.test();
}
int expected = 20_000 * 1000;
if (BadStateAtLongCmp.field != expected) {
throw new RuntimeException("test failed: " + BadStateAtLongCmp.field + " != " + expected);
}
}
}