From cd7f765f7de94fa6337f3f0224b9868c1dfe54a5 Mon Sep 17 00:00:00 2001 From: kuenking111 Date: Thu, 27 May 2021 21:41:43 +0800 Subject: [PATCH] I3T9AX: 8264640 CMS ParScanClosure misses a barrier --- 8264640.patch | 20 ++++++++++++++++++++ openjdk-1.8.0.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 8264640.patch diff --git a/8264640.patch b/8264640.patch new file mode 100755 index 0000000..4aefd2e --- /dev/null +++ b/8264640.patch @@ -0,0 +1,20 @@ +diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp b/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp +index 2a3e32071..887e47216 100644 +--- a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp ++++ b/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp +@@ -38,6 +38,7 @@ template inline void ParScanWeakRefClosure::do_oop_work(T* p) { + // we need to ensure that it is copied (see comment in + // ParScanClosure::do_oop_work). + Klass* objK = obj->klass(); ++ OrderAccess::loadload(); + markOop m = obj->mark(); + oop new_obj; + if (m->is_marked()) { // Contains forwarding pointer. +@@ -101,6 +102,7 @@ inline void ParScanClosure::do_oop_work(T* p, + // overwritten with an overflow next pointer after the object is + // forwarded. + Klass* objK = obj->klass(); ++ OrderAccess::loadload(); + markOop m = obj->mark(); + oop new_obj; + if (m->is_marked()) { // Contains forwarding pointer. diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 6800c7f..e614fa0 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -921,7 +921,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 4 +Release: 5 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1104,6 +1104,7 @@ Patch187: 8182036.patch Patch188: 8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch Patch189: 8266187_Memory_leak_in_appendBootClassPath.patch Patch190: 8266929_huawei_add_oid_mapping_common_sig_types.patch +Patch191: 8264640.patch ############################################# # @@ -1554,6 +1555,7 @@ pushd %{top_level_dir_name} %patch188 -p1 %patch189 -p1 %patch190 -p1 +%patch191 -p1 popd @@ -2171,6 +2173,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu May 27 2021 kuenking111 - 1:1.8.0.292-b10.4 +- add 8264640.patch + * Fri May 20 2021 kuenking111 - 1:1.8.0.292-b10.3 - add 8266929_huawei_add_oid_mapping_common_sig_types.patch -- Gitee