From 334684f5a93d53bb024eff934cea4d8a4bd9a5db Mon Sep 17 00:00:00 2001 From: noah Date: Fri, 6 Nov 2020 19:11:40 +0800 Subject: [PATCH] add 8250861-Crash-in-MinINode-Ideal.patch && 8255781-Bump-patch-update-version-for-OpenJDK-jdk-11.0.9.1.patch --- 8250861-Crash-in-MinINode-Ideal.patch | 20 +++++++++++++++++++ ...ate-version-for-OpenJDK-jdk-11.0.9.1.patch | 16 +++++++++++++++ java-11-openjdk.spec | 14 +++++++++++-- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 8250861-Crash-in-MinINode-Ideal.patch create mode 100644 8255781-Bump-patch-update-version-for-OpenJDK-jdk-11.0.9.1.patch diff --git a/8250861-Crash-in-MinINode-Ideal.patch b/8250861-Crash-in-MinINode-Ideal.patch new file mode 100644 index 0000000..0c0651f --- /dev/null +++ b/8250861-Crash-in-MinINode-Ideal.patch @@ -0,0 +1,20 @@ +--- a/src/hotspot/share/opto/addnode.cpp Mon Nov 02 20:20:05 2020 +0100 ++++ b/src/hotspot/share/opto/addnode.cpp Wed Nov 04 10:42:35 2020 +0100 +@@ -917,7 +917,7 @@ + + // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z) + // if x == y and the additions can't overflow. +- if (phase->eqv(x,y) && ++ if (phase->eqv(x,y) && tx != NULL && + !can_overflow(tx, x_off) && + !can_overflow(tx, y_off)) { + return new MinINode(phase->transform(new AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2)); +@@ -925,7 +925,7 @@ + } else { + // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1) + // if x == y and the additions can't overflow. +- if (phase->eqv(x,y) && ++ if (phase->eqv(x,y) && tx != NULL && + !can_overflow(tx, x_off) && + !can_overflow(tx, y_off)) { + return new AddINode(x,phase->intcon(MIN2(x_off,y_off))); diff --git a/8255781-Bump-patch-update-version-for-OpenJDK-jdk-11.0.9.1.patch b/8255781-Bump-patch-update-version-for-OpenJDK-jdk-11.0.9.1.patch new file mode 100644 index 0000000..bab887d --- /dev/null +++ b/8255781-Bump-patch-update-version-for-OpenJDK-jdk-11.0.9.1.patch @@ -0,0 +1,16 @@ +--- a/make/autoconf/version-numbers Mon Nov 02 20:12:55 2020 +0100 ++++ b/make/autoconf/version-numbers Mon Nov 02 20:20:05 2020 +0100 +@@ -29,11 +29,11 @@ + DEFAULT_VERSION_FEATURE=11 + DEFAULT_VERSION_INTERIM=0 + DEFAULT_VERSION_UPDATE=9 +-DEFAULT_VERSION_PATCH=0 ++DEFAULT_VERSION_PATCH=1 + DEFAULT_VERSION_EXTRA1=0 + DEFAULT_VERSION_EXTRA2=0 + DEFAULT_VERSION_EXTRA3=0 +-DEFAULT_VERSION_DATE=2020-10-20 ++DEFAULT_VERSION_DATE=2020-11-04 + DEFAULT_VERSION_CLASSFILE_MAJOR=55 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`" + DEFAULT_VERSION_CLASSFILE_MINOR=0 + DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11" diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 869659b..2e482f7 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -735,7 +735,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 2 +Release: 3 # 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 @@ -833,6 +833,10 @@ Patch48: 8205921-Optimizing-best_of_2-work-stealing-queue-selection.patch Patch49: 8237483-AArch64-C1-OopMap-inserted-twice-fatal-error.patch Patch50: 8248336-AArch64-C2-offset-overflow-in-BoxLockNode-em.patch +# 11.0.9 +Patch51: 8255781-Bump-patch-update-version-for-OpenJDK-jdk-11.0.9.1.patch +Patch52: 8250861-Crash-in-MinINode-Ideal.patch + BuildRequires: autoconf BuildRequires: alsa-lib-devel @@ -1096,6 +1100,8 @@ pushd %{top_level_dir_name} %patch48 -p1 %patch49 -p1 %patch50 -p1 +%patch51 -p1 +%patch52 -p1 popd # openjdk %patch1000 @@ -1389,7 +1395,7 @@ if ! echo $suffix | grep -q "debug" ; then # Install Javadoc documentation install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} - cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip + cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}.1+%{buildver}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip fi # Install icons and menu entries @@ -1598,6 +1604,10 @@ require "copy_jdk_configs.lua" %changelog +* Fri Nov 6 2020 noah - 1:11.0.9.11-3 +- add 8255781-Bump-patch-update-version-for-OpenJDK-jdk-11.0.9.1.patch +- add 8250861-Crash-in-MinINode-Ideal.patch + * Fri Nov 6 2020 wuyan - 1:11.0.9.11-2 - add 8248336-AArch64-C2-offset-overflow-in-BoxLockNode-em.patch -- Gitee