From 3e178c3459a4c4c4cbf764820a33883bac188ac4 Mon Sep 17 00:00:00 2001 From: kuenking111 Date: Mon, 30 Jan 2023 14:21:56 +0800 Subject: [PATCH] I6BP9S: add 8178968-AArch64-Remove-non-standard-code-cache-size and 8185736-missing-default-exception-handler-in-calls --- ...-Remove-non-standard-code-cache-size.patch | 25 +++++++++ ...default-exception-handler-in-calls-t.patch | 53 +++++++++++++++++++ openjdk-1.8.0.spec | 12 ++++- 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 8178968-AArch64-Remove-non-standard-code-cache-size.patch create mode 100644 8185736-missing-default-exception-handler-in-calls-t.patch diff --git a/8178968-AArch64-Remove-non-standard-code-cache-size.patch b/8178968-AArch64-Remove-non-standard-code-cache-size.patch new file mode 100644 index 0000000..82295a8 --- /dev/null +++ b/8178968-AArch64-Remove-non-standard-code-cache-size.patch @@ -0,0 +1,25 @@ +From bf0ddc70f543a1847d8822bc01537322aa5bbe6d Mon Sep 17 00:00:00 2001 +From: hedongbo +Date: Thu, 5 Jan 2023 19:40:11 +0000 +Subject: 8178968: AArch64: Remove non-standard code cache size + +--- + hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp +index f15ed99fb..ed623c435 100644 +--- a/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp ++++ b/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp +@@ -37,8 +37,4 @@ const bool CCallingConventionRequiresIntsAsLongs = false; + + #define SUPPORTS_NATIVE_CX8 + +-// The maximum B/BL offset range on AArch64 is 128MB. +-#undef CODE_CACHE_DEFAULT_LIMIT +-#define CODE_CACHE_DEFAULT_LIMIT (128*M) +- + #endif // CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP +-- +2.12.3 + diff --git a/8185736-missing-default-exception-handler-in-calls-t.patch b/8185736-missing-default-exception-handler-in-calls-t.patch new file mode 100644 index 0000000..2984d72 --- /dev/null +++ b/8185736-missing-default-exception-handler-in-calls-t.patch @@ -0,0 +1,53 @@ +From da7a2005a2c181737b163f60dd705acc00002463 Mon Sep 17 00:00:00 2001 +From: hedongbo +Date: Thu, 5 Jan 2023 10:22:15 +0000 +Subject: 8185736: missing default exception handler in calls to + rethrow_Stub + +--- + hotspot/src/share/vm/opto/doCall.cpp | 9 +++++++++ + hotspot/src/share/vm/opto/output.cpp | 1 + + 2 files changed, 10 insertions(+) + +diff --git a/hotspot/src/share/vm/opto/doCall.cpp b/hotspot/src/share/vm/opto/doCall.cpp +index 366769356..1b2b77c71 100644 +--- a/hotspot/src/share/vm/opto/doCall.cpp ++++ b/hotspot/src/share/vm/opto/doCall.cpp +@@ -702,6 +702,7 @@ void Parse::catch_call_exceptions(ciExceptionHandlerStream& handlers) { + GrowableArray* extypes = new (C->node_arena()) GrowableArray(C->node_arena(), 8, 0, NULL); + GrowableArray* saw_unloaded = new (C->node_arena()) GrowableArray(C->node_arena(), 8, 0, 0); + ++ bool default_handler = false; + for (; !handlers.is_done(); handlers.next()) { + ciExceptionHandler* h = handlers.handler(); + int h_bci = h->handler_bci(); +@@ -724,6 +725,14 @@ void Parse::catch_call_exceptions(ciExceptionHandlerStream& handlers) { + // Note: It's OK if the BCIs repeat themselves. + bcis->append(h_bci); + extypes->append(h_extype); ++ if (h_bci == -1) { ++ default_handler = true; ++ } ++ } ++ ++ if (!default_handler) { ++ bcis->append(-1); ++ extypes->append(TypeOopPtr::make_from_klass(env()->Throwable_klass())->is_instptr()); + } + + int len = bcis->length(); +diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp +index 5c9566e1e..6032b72a9 100644 +--- a/hotspot/src/share/vm/opto/output.cpp ++++ b/hotspot/src/share/vm/opto/output.cpp +@@ -1761,6 +1761,7 @@ void Compile::FillExceptionTables(uint cnt, uint *call_returns, uint *inct_start + } + + // Set the offset of the return from the call ++ assert(handler_bcis.find(-1) != -1, "must have default handler"); + _handler_table.add_subtable(call_return, &handler_bcis, NULL, &handler_pcos); + continue; + } +-- +2.12.3 + diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 141db7e..3dc81d5 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{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 @@ -1177,6 +1177,10 @@ Patch293: 8140594-Various-minor-code-improvements-compiler.patch Patch294: Fix-the-crash-that-occurs-when-the-process-exits-due.patch Patch295: Fix-AsyncGCLog-s-content-consistent-bug.patch +# 8u362 +Patch296: 8178968-AArch64-Remove-non-standard-code-cache-size.patch +Patch297: 8185736-missing-default-exception-handler-in-calls-t.patch + ############################################# # @@ -1693,6 +1697,8 @@ pushd %{top_level_dir_name} %patch293 -p1 %patch294 -p1 %patch295 -p1 +%patch296 -p1 +%patch297 -p1 popd # System library fixes @@ -2317,6 +2323,10 @@ cjc.mainProgram(arg) %endif %changelog +* Mon Jan 30 2023 kuenking111 - 1:1.8.0.362-b09.1 +- add 8178968-AArch64-Remove-non-standard-code-cache-size.patch +- add 8185736-missing-default-exception-handler-in-calls-t.patch + * Sat Jan 28 2023 kuenking111 - 1:1.8.0.362-b09.0 - modified 6858051-Create-GC-worker-threads-dynamically.patch - modified 7092821-java.security.Provider.getService-is-synchro.patch