diff --git a/8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch b/8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch new file mode 100755 index 0000000000000000000000000000000000000000..e66ffad04fe187dc7f35dc9aed6835a48f5e5ebf --- /dev/null +++ b/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 diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 6d2ce7e2d6d5cf4d5939fe8478e1af94cfb2653f..2a39edf7963072cf05f03e9b484647ea81feff07 100644 --- a/java-1.8.0-openjdk.spec +++ b/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 - 1:1.8.0.292-b10.1 +- add 8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch + * Tue May 18 2021 eapen - 1:1.8.0.292-b10.0 - update to jdk8u292-b10 - split sync-patch to multi patches