Skip to content

Commit 0941bf8

Browse files
committed
8230020: [BACKOUT] compiler/types/correctness/* tests fail with "assert(recv == __null || recv->is_klass()) failed: wrong type"
Back out JDK-8225670 due to performance regressions. Reviewed-by: roland
1 parent 8468648 commit 0941bf8

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/hotspot/share/ci/ciMethodData.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,14 @@ void ciMethodData::load_data() {
258258
void ciReceiverTypeData::translate_receiver_data_from(const ProfileData* data) {
259259
for (uint row = 0; row < row_limit(); row++) {
260260
Klass* k = data->as_ReceiverTypeData()->receiver(row);
261-
if (k != NULL && k->is_loader_alive()) {
262-
ciKlass* klass = CURRENT_ENV->get_klass(k);
263-
set_receiver(row, klass);
264-
} else {
265-
// With concurrent class unloading, the MDO could have stale metadata; override it
266-
clear_row(row);
261+
if (k != NULL) {
262+
if (k->is_loader_alive()) {
263+
ciKlass* klass = CURRENT_ENV->get_klass(k);
264+
set_receiver(row, klass);
265+
} else {
266+
// With concurrent class unloading, the MDO could have stale metadata; override it
267+
clear_row(row);
268+
}
267269
}
268270
}
269271
}

test/hotspot/jtreg/ProblemList.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 8158860 generic-all
4949
compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 8163894 generic-all
5050
compiler/tiered/LevelTransitionTest.java 8067651 generic-all
5151

52-
compiler/types/correctness/CorrectnessTest.java 8225620 solaris-sparcv9
53-
compiler/types/correctness/OffTest.java 8225620 solaris-sparcv9
54-
compiler/unsafe/UnsafeGetConstantField.java 8229446 solaris-sparcv9
52+
compiler/types/correctness/CorrectnessTest.java 8230019,8225620 generic-all,solaris-sparcv9
53+
compiler/types/correctness/OffTest.java 8230019,8225620 generic-all,solaris-sparcv9
5554

5655
compiler/c2/Test6852078.java 8194310 generic-all
5756
compiler/c2/Test8004741.java 8214904 generic-all

0 commit comments

Comments
 (0)