Update to shenandoah-jdk-11.0.7+9 (EA)

Remove JDK-8241296 backport as this was integrated upstream in jdk-11.0.7+9.
This commit is contained in:
Andrew John Hughes 2020-04-21 16:30:40 +01:00
parent 0355329371
commit 7752b4b9cf
4 changed files with 8 additions and 28 deletions

2
.gitignore vendored
View File

@ -45,3 +45,5 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.7+7.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.7+7.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+8-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.7+8-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+8.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.7+8.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+9.tar.xz

View File

@ -225,7 +225,7 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 8 %global buildver 9
%global rpmrelease 0 %global rpmrelease 0
#%%global tagsuffix "" #%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit
@ -1075,8 +1075,6 @@ Patch8: s390-8214206_fix.patch
############################################# #############################################
# JDK-8237879: make 4.3 breaks build # JDK-8237879: make 4.3 breaks build
Patch9: jdk8237879-make_4_3_build_fixes.patch Patch9: jdk8237879-make_4_3_build_fixes.patch
# JDK-8241296: Segfault in JNIHandleBlock::oops_do()
Patch10: jdk8241296-jnihandleblock_segfault.patch
############################################# #############################################
# #
@ -1327,7 +1325,6 @@ pushd %{top_level_dir_name}
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
popd # openjdk popd # openjdk
@ -1875,6 +1872,10 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Tue Apr 21 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:11.0.7.9-0.0.ea
- Update to shenandoah-jdk-11.0.7+9 (EA)
- Remove JDK-8241296 backport as this was integrated upstream in jdk-11.0.7+9.
* Tue Apr 21 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:11.0.7.8-0.0.ea * Tue Apr 21 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:11.0.7.8-0.0.ea
- Update to shenandoah-jdk-11.0.7+8 (EA) - Update to shenandoah-jdk-11.0.7+8 (EA)

View File

@ -1,23 +0,0 @@
# HG changeset patch
# User aph
# Date 1584629637 0
# Thu Mar 19 14:53:57 2020 +0000
# Node ID e96597ea4d672793ab205fd67009efed809fae11
# Parent 0daa6b52ba568246e8f930138fb36f8f04d9fadd
8241296: Segfault in JNIHandleBlock::oops_do()
Reviewed-by: duke
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -867,7 +867,9 @@
}
void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
- active_handles()->oops_do(f);
+ if (active_handles() != NULL) {
+ active_handles()->oops_do(f);
+ }
// Do oop for ThreadShadow
f->do_oop((oop*)&_pending_exception);
handle_area()->oops_do(f);

View File

@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+8-4curve.tar.xz) = a613befe275dc21d3feec469ecebb06144e3565b3ab060cd53a82da0f4d5356ad005bb3d10c45c44f67bda3db0f694333a5595b5f990c65602764949471e8c2f SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz) = 7da1a4d8d906b7c1bfaf133d430cedde9670838d4d24606cedff6d8ab8f430cef9f83bb5ef438a38fc9ed294c1b4d724f6bd9a704a4f178340d92401db2450d1