From 0941bf8b5e385bb5e107a0a74df5035df75b3b1a Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Thu, 22 Aug 2019 12:22:02 +0200 Subject: [PATCH] 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 --- src/hotspot/share/ci/ciMethodData.cpp | 14 ++++++++------ test/hotspot/jtreg/ProblemList.txt | 5 ++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/hotspot/share/ci/ciMethodData.cpp b/src/hotspot/share/ci/ciMethodData.cpp index 2b6ec15db9..3caf34f9c6 100644 --- a/src/hotspot/share/ci/ciMethodData.cpp +++ b/src/hotspot/share/ci/ciMethodData.cpp @@ -258,12 +258,14 @@ void ciMethodData::load_data() { void ciReceiverTypeData::translate_receiver_data_from(const ProfileData* data) { for (uint row = 0; row < row_limit(); row++) { Klass* k = data->as_ReceiverTypeData()->receiver(row); - if (k != NULL && k->is_loader_alive()) { - ciKlass* klass = CURRENT_ENV->get_klass(k); - set_receiver(row, klass); - } else { - // With concurrent class unloading, the MDO could have stale metadata; override it - clear_row(row); + if (k != NULL) { + if (k->is_loader_alive()) { + ciKlass* klass = CURRENT_ENV->get_klass(k); + set_receiver(row, klass); + } else { + // With concurrent class unloading, the MDO could have stale metadata; override it + clear_row(row); + } } } } diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 724feb53f2..af1ef724f3 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -49,9 +49,8 @@ compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 8158860 generic-all compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 8163894 generic-all compiler/tiered/LevelTransitionTest.java 8067651 generic-all -compiler/types/correctness/CorrectnessTest.java 8225620 solaris-sparcv9 -compiler/types/correctness/OffTest.java 8225620 solaris-sparcv9 -compiler/unsafe/UnsafeGetConstantField.java 8229446 solaris-sparcv9 +compiler/types/correctness/CorrectnessTest.java 8230019,8225620 generic-all,solaris-sparcv9 +compiler/types/correctness/OffTest.java 8230019,8225620 generic-all,solaris-sparcv9 compiler/c2/Test6852078.java 8194310 generic-all compiler/c2/Test8004741.java 8214904 generic-all