!40 add 8250861-Crash-in-MinINode-Ideal.patch && 8255781-Bump-patch-update-version-for-OpenJDK-jdk-11.0.9.1.patch

From: @jvmboy
Reviewed-by: @jdkboy
Signed-off-by: @jdkboy,@jdkboy

8248336-AArch64-C2-offset-overflow-in-BoxLockNode-em.patch

@@ -0,0 +1,45 @@
+From 3070d796490221304ef226560ad2a837c3de4401 Mon Sep 17 00:00:00 2001
+Date: Sat, 31 Oct 2020 14:17:53 +0800
+Subject: [PATCH] 8248336: AArch64: C2: offset overflow in BoxLockNode::emit
+
+Summary: <C2>: offset overflow in BoxLockNode::emit
+LLT: jtreg
+Bug url: https://bugs.openjdk.java.net/browse/JDK-8248336
+---
+ src/hotspot/cpu/aarch64/aarch64.ad | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
+index 827ec9e..617b2b8 100644
+--- a/src/hotspot/cpu/aarch64/aarch64.ad
++++ b/src/hotspot/cpu/aarch64/aarch64.ad
+@@ -2071,16 +2071,20 @@ void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
+   int reg    = ra_->get_encode(this);
+ 
+-  if (Assembler::operand_valid_for_add_sub_immediate(offset)) {
+-    __ add(as_Register(reg), sp, offset);
+-  } else {
+-    ShouldNotReachHere();
+-  }
++  // This add will handle any 24-bit signed offset. 24 bits allows an
++  // 8 megabyte stack frame.
++  __ add(as_Register(reg), sp, offset);
+ }
+ 
+ uint BoxLockNode::size(PhaseRegAlloc *ra_) const {
+   // BoxLockNode is not a MachNode, so we can't just call MachNode::size(ra_).
+-  return 4;
++  int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
++
++  if (Assembler::operand_valid_for_add_sub_immediate(offset)) {
++    return NativeInstruction::instruction_size;
++  } else {
++    return 2 * NativeInstruction::instruction_size;
++  }
+ }
+ 
+ //=============================================================================
+-- 
+1.8.3.1
+

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)));

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"

java-11-openjdk.spec

@@ -735,7 +735,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 1
+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
@@ -831,6 +831,11 @@ Patch46: ZGC-correct-free-heap-size-excluding-waste-in-rule_allocation_rate.patc
 Patch47: 8204947-Port-ShenandoahTaskTerminator-to-mainline-and-make-it-default.patch
 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
@@ -1094,6 +1099,9 @@ pushd %{top_level_dir_name}
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
 popd # openjdk
 
 %patch1000
@@ -1387,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
@@ -1596,6 +1604,13 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Fri Nov 6 2020 noah <hedongbo@huawei.com> - 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 <wuyan34@huawei.com> - 1:11.0.9.11-2
+- add 8248336-AArch64-C2-offset-overflow-in-BoxLockNode-em.patch
+
 * Mon Oct 26 2020 noah <hedongbo@huawei.com> - 1:11.0.9.11-1
 - add 8229495-SIGILL-in-C2-generated-OSR-compilation.patch