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

I4629E: 8247691-Incorrect-handling-of-VM-exceptions-in-C1-deopt-stub.patch

Browse Source
This commit is contained in:
eapen 2021-08-17 20:58:57 +08:00
parent 6a4fd630fd
commit dcc70ebede
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
8247691-Incorrect-handling-of-VM-exceptions-in-C1-deopt-stub.patch Normal file
View File

@ -0,0 +1,27 @@
From 6b8c5be412b9ae27ef3ea85b3b5dc4e58c82c3cf Mon Sep 17 00:00:00 2001
From: miaozhuojun <mouzhuojun@huawei.com>
Date: Tue, 11 May 2021 11:03:26 +0800
Subject: [PATCH] Incorrect handling of VM exceptions in C1 deopt stub/traps
Bug url: https://bugs.openjdk.java.net/browse/JDK-8247691
---
src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
index adaa0f1..b1daeac 100644
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
@@ -577,7 +577,8 @@ OopMapSet* Runtime1::generate_patching(StubAssembler* sasm, address target) {
__ verify_not_null_oop(r0);
// load throwing pc: this is the return address of the stub
- __ mov(r3, lr);
+ // Note that lr register has been destroyed by the call.
+ __ ldr(r3, Address(rfp, wordSize));
#ifdef ASSERT
// check that fields in JavaThread for exception oop and issuing pc are empty
--
1.8.3.1

13
openjdk-11.spec
View File

@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
Release: 0
Release: 1
# 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
@ -838,7 +838,7 @@ Patch57: add-zgc-parameter-adaptation-feature.patch
Patch58: add-integerCache-feature.patch
Patch59: add-SVE-backend-feature.patch
#11.0.10
# 11.0.10
Patch61: downgrade-the-symver-of-log2f-posix-spawn.patch
Patch62: 8254078-DataOutputStream-is-very-slow-post-disabling.patch
Patch64: Fix-the-memcpy-symbol-issue-during-JDK11-x64-build.patch
@ -848,12 +848,15 @@ Patch67: 8214535-support-Jmap-parallel.patch
Patch68: src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
Patch69: G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
#11.0.11
# 11.0.11
Patch71: numa_mem_leak.patch
Patch72: select_nearest_numa_node.patch
Patch73: support_jmap_parallel_inspection_for_cms_gc.patch
Patch74: delete_expired_certificates.patch
# 11.0.12
Patch75: 8247691-Incorrect-handling-of-VM-exceptions-in-C1-deopt-stub.patch
BuildRequires: autoconf
BuildRequires: alsa-lib-devel
BuildRequires: binutils
@ -1127,6 +1130,7 @@ pushd %{top_level_dir_name}
%patch72 -p1
%patch73 -p1
%patch74 -p1
%patch75 -p1
popd # openjdk
# %patch1000
@ -1629,6 +1633,9 @@ require "copy_jdk_configs.lua"
%changelog
* Tue Aug 17 2021 eapen <zhangyipeng7@huawei.com> - 1:11.0.12.7-1
- add 8247691-Incorrect-handling-of-VM-exceptions-in-C1-deopt-stub.patch
* Tue Aug 3 2021 linhaibing21 <linhaibing@huawei.com> - 1:11.0.12.7-0
- Update to 11.0.12+7 (GA)
- delete 8207160-ClassReader-adjustMethodParams-can-potentially-return-null-if-the-args-list-is-empty.patch