From 0af96a899391b586fd990cdf8ef61575e58bd9bd Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Fri, 20 Oct 2023 05:38:20 +0000
Subject: [PATCH 1/2] 8317987: C2 recompilations cause high memory footprint

Backport-of: c88b387881a6e9206f9804b4ca966334c65c008a
---
 src/hotspot/share/opto/c2compiler.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index 4b911620cf9..9e27ff17d9e 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -113,6 +113,7 @@ void C2Compiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci, boo
   bool do_locks_coarsening = EliminateLocks;
 
   while (!env->failing()) {
+    ResourceMark rm;
     // Attempt to compile while subsuming loads into machine instructions.
     Options options(subsume_loads, do_escape_analysis, do_iterative_escape_analysis, eliminate_boxing, do_locks_coarsening, install_code);
     Compile C(env, target, entry_bci, options, directive);

From 5121ee686b463291c415e90c96950b4c49183485 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 20 Oct 2023 06:46:09 +0000
Subject: [PATCH 2/2] 8316894: make test  TEST="jtreg:test/jdk/..."  fails on
 AIX

Backport-of: 29348b3cf65951e1aacd52c517b6b0d29449a78e
---
 make/RunTests.gmk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 770b81af8ac..08f3f06cabf 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -178,7 +178,8 @@ ifeq ($(TEST_JOBS), 0)
       c = c * $(TEST_JOBS_FACTOR_JDL); \
       c = c * $(TEST_JOBS_FACTOR_MACHINE); \
       if (c < 1) c = 1; \
-      printf "%.0f", c; \
+      c = c + 0.5; \
+      printf "%d", c; \
     }')
 endif