packages/openjdk-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!38 add 8248336-AArch64-C2-offset-overflow-in-BoxLockNode-em.patch

Browse Source 
From: @JoseArcadioBuendia
Reviewed-by: @jvmboy,@jdkboy
Signed-off-by: @jvmboy,@jdkboy
This commit is contained in:
openeuler-ci-bot 2020-11-06 15:05:58 +08:00 committed by Gitee
commit 737b598a87
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
8248336-AArch64-C2-offset-overflow-in-BoxLockNode-em.patch Executable file
View File

@ -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

7
java-11-openjdk.spec
View File

@ -735,7 +735,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
Release: 1 Release: 2
# 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
@ -831,6 +831,7 @@ Patch46: ZGC-correct-free-heap-size-excluding-waste-in-rule_allocation_rate.patc
Patch47: 8204947-Port-ShenandoahTaskTerminator-to-mainline-and-make-it-default.patch Patch47: 8204947-Port-ShenandoahTaskTerminator-to-mainline-and-make-it-default.patch
Patch48: 8205921-Optimizing-best_of_2-work-stealing-queue-selection.patch Patch48: 8205921-Optimizing-best_of_2-work-stealing-queue-selection.patch
Patch49: 8237483-AArch64-C1-OopMap-inserted-twice-fatal-error.patch Patch49: 8237483-AArch64-C1-OopMap-inserted-twice-fatal-error.patch
Patch50: 8248336-AArch64-C2-offset-overflow-in-BoxLockNode-em.patch
BuildRequires: autoconf BuildRequires: autoconf
@ -1094,6 +1095,7 @@ pushd %{top_level_dir_name}
%patch47 -p1 %patch47 -p1
%patch48 -p1 %patch48 -p1
%patch49 -p1 %patch49 -p1
%patch50 -p1
popd # openjdk popd # openjdk
%patch1000 %patch1000
@ -1596,6 +1598,9 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* 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 * Mon Oct 26 2020 noah <hedongbo@huawei.com> - 1:11.0.9.11-1
- add 8229495-SIGILL-in-C2-generated-OSR-compilation.patch - add 8229495-SIGILL-in-C2-generated-OSR-compilation.patch