I3SAQR: incorrect handling of VM exceptions in C1 deopt stub

8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch

@@ -0,0 +1,14 @@
+diff --git a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
+index d16cfda1..5e457dd1 100644
+--- a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
++++ b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
+@@ -597,7 +597,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

java-1.8.0-openjdk.spec

@@ -921,7 +921,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 19
+Release: 20
 # 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
@@ -1101,7 +1101,7 @@ Patch184: set-vm.vendor-by-configure.patch
 Patch185: update-cacerts-and-VerifyCACerts.java-test.patch
 Patch186: update-to-keep-same-with-master.patch
 Patch187: 8182036.patch
- 
+Patch188: 8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch
 
 #############################################
 #
@@ -1549,6 +1549,7 @@ pushd %{top_level_dir_name}
 %patch185 -p1
 %patch186 -p1
 %patch187 -p1
+%patch188 -p1
 
 popd
 
@@ -2166,6 +2167,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Fri May 20 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.292-b10.1
+- add 8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch
+
 * Tue May 18 2021 eapen <zhangyipeng7@huawei.com> - 1:1.8.0.292-b10.0
 - update to jdk8u292-b10
 - split sync-patch to multi patches