!86 I3TB3D: 8264640 CMS ParScanClosure misses a barrier
From: @kuenking111 Reviewed-by: @jvmboy Signed-off-by: @jvmboy
This commit is contained in:
commit
b69a80fa8c
20
8264640.patch
Executable file
20
8264640.patch
Executable file
@ -0,0 +1,20 @@
|
|||||||
|
diff --git a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp
|
||||||
|
index 1e206292d..609a14868 100644
|
||||||
|
--- a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp
|
||||||
|
+++ b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp
|
||||||
|
@@ -44,6 +44,7 @@ template <class T> 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_raw();
|
||||||
|
oop new_obj;
|
||||||
|
if (m->is_marked()) { // Contains forwarding pointer.
|
||||||
|
@@ -108,6 +109,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_raw();
|
||||||
|
oop new_obj;
|
||||||
|
if (m->is_marked()) { // Contains forwarding pointer.
|
||||||
@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
|||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
Release: 0
|
Release: 1
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
# 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
|
# 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
|
# also included the epoch in their virtual provides. This created a
|
||||||
@ -851,6 +851,9 @@ Patch67: 8214535-support-Jmap-parallel.patch
|
|||||||
Patch68: src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
|
Patch68: src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
|
||||||
Patch69: G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
|
Patch69: G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
|
||||||
|
|
||||||
|
#11.0.11
|
||||||
|
Patch70: 8264640.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
BuildRequires: binutils
|
BuildRequires: binutils
|
||||||
@ -1123,6 +1126,7 @@ pushd %{top_level_dir_name}
|
|||||||
%patch67 -p1
|
%patch67 -p1
|
||||||
%patch68 -p1
|
%patch68 -p1
|
||||||
%patch69 -p1
|
%patch69 -p1
|
||||||
|
%patch70 -p1
|
||||||
popd # openjdk
|
popd # openjdk
|
||||||
|
|
||||||
# %patch1000
|
# %patch1000
|
||||||
@ -1626,6 +1630,9 @@ require "copy_jdk_configs.lua"
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 28 2021 kuenking111 <wangkun49@huawei.com> - 1:11.0.11.9-1
|
||||||
|
- add 8264640.patch
|
||||||
|
|
||||||
* Fri May 14 2021 hu_bo_dao <hubodao@huawei.com> - 1:11.0.11.9-0
|
* Fri May 14 2021 hu_bo_dao <hubodao@huawei.com> - 1:11.0.11.9-0
|
||||||
- Update to 11.0.11+9 (GA)
|
- Update to 11.0.11+9 (GA)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user