8287700: C2 Crash running eclipse benchmark from Dacapo

Reviewed-by: chagedorn, kvn, xliu, thartmann
This commit is contained in:
Roland Westrelin 2022-06-08 06:36:52 +00:00
parent 590337e2f2
commit 0960ecc407
2 changed files with 76 additions and 3 deletions
src/hotspot/share/opto
test/hotspot/jtreg/compiler/types

@ -2641,7 +2641,7 @@ bool ConnectionGraph::split_AddP(Node *addp, Node *base) {
// this code branch will go away.
//
if (!t->is_known_instance() &&
!t->maybe_java_subtype_of(base_t)) {
!base_t->maybe_java_subtype_of(t)) {
return false; // bail out
}
const TypeOopPtr *tinst = base_t->add_offset(t->offset())->is_oopptr();
@ -3325,7 +3325,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist,
} else {
tn_t = tn_type->isa_oopptr();
}
if (tn_t != NULL && tn_t->maybe_java_subtype_of(tinst)) {
if (tn_t != NULL && tinst->maybe_java_subtype_of(tn_t)) {
if (tn_type->isa_narrowoop()) {
tn_type = tinst->make_narrowoop();
} else {
@ -3338,7 +3338,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist,
record_for_optimizer(n);
} else {
assert(tn_type == TypePtr::NULL_PTR ||
tn_t != NULL && !tinst->is_java_subtype_of(tn_t),
tn_t != NULL && !tinst->maybe_java_subtype_of(tn_t),
"unexpected type");
continue; // Skip dead path with different type
}

@ -0,0 +1,73 @@
/*
* 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 8287700
* @summary C2 Crash running eclipse benchmark from Dacapo
*
* @run main/othervm -XX:-BackgroundCompilation TestEACheckCastPP
*
*/
public class TestEACheckCastPP {
public static void main(String[] args) {
for (int i = 0; i < 20_000; i++) {
test(false);
test_helper2(new A(), true);
}
}
private static void test(boolean flag) {
I i = test_helper();
test_helper2(i, flag);
}
private static void test_helper2(I i, boolean flag) {
if (flag) {
// branch never taken when called from test()
A a = (A)i;
C c = new C();
c.a = a;
}
}
private static I test_helper() {
B b = new B();
return b;
}
interface I {
}
private static class A implements I {
}
private static class B extends A {
}
private static class C {
public A a;
}
}