From 80af9d73d340c510a35c772436ae29c6cf17c7b1 Mon Sep 17 00:00:00 2001
From: jdkboy <ge.guo@huawei.com>
Date: Thu, 4 Feb 2021 21:31:27 +0800
Subject: [PATCH] add 8240353.patch

---
 8240353.patch           | 49 +++++++++++++++++++++++++++++++++++++++++
 java-1.8.0-openjdk.spec |  7 +++++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 8240353.patch

diff --git a/8240353.patch b/8240353.patch
new file mode 100644
index 0000000..ddc27ca
--- /dev/null
+++ b/8240353.patch
@@ -0,0 +1,49 @@
+diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+index e25061f7d..2df587d96 100644
+--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
++++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+@@ -1,6 +1,6 @@
+ /*
+  * Copyright (c) 2013, Red Hat Inc.
+- * Copyright (c) 2000, 2019, Oracle and/or its affiliates.
++ * Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+  * All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+@@ -434,12 +434,9 @@ int LIR_Assembler::emit_unwind_handler() {
+   }
+ 
+   if (compilation()->env()->dtrace_method_probes()) {
+-    __ call_Unimplemented();
+-#if 0
+-    __ movptr(Address(rsp, 0), rax);
+-    __ mov_metadata(Address(rsp, sizeof(void*)), method()->constant_encoding());
+-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit)));
+-#endif
++    __ mov(c_rarg0, rthread);
++    __ mov_metadata(c_rarg1, method()->constant_encoding());
++    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), c_rarg0, c_rarg1);
+   }
+ 
+   if (method()->is_synchronized() || compilation()->env()->dtrace_method_probes()) {
+diff --git a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
+index c1e48ac97..e774f2140 100644
+--- a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
++++ b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
+@@ -1319,6 +1319,16 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
+       }
+       break;
+ 
++    case dtrace_object_alloc_id:
++      { // c_rarg0: object
++        StubFrame f(sasm, "dtrace_object_alloc", dont_gc_arguments);
++        save_live_registers(sasm);
++
++        __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), c_rarg0);
++
++        restore_live_registers(sasm);
++      }
++      break;
+ 
+     default:
+       { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments);
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 13867bd..c14ff79 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -915,7 +915,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 3
+Release: 4
 # 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
@@ -1070,6 +1070,7 @@ Patch146: 8168926.patch
 Patch147: 8215047.patch
 Patch148: 8237894.patch
 Patch149: Remove-the-parentheses-around-company-name.patch
+Patch150: 8240353.patch
 
 #############################################
 #
@@ -1493,6 +1494,7 @@ pushd %{top_level_dir_name}
 %patch147 -p1
 %patch148 -p1
 %patch149 -p1
+%patch150 -p1
 
 popd
 
@@ -2109,6 +2111,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Thu Feb 4 2021 jdkboy <ge.guo@huawei.com> - 1:1.8.0.282-b08.4
+- add 8240353.patch
+
 * Thu Feb 4 2021 jdkboy <ge.guo@huawei.com> - 1:1.8.0.282-b08.3
 - fix wrong patch G1-memory-uncommit.patch
 
-- 
Gitee