commit 2109c4c325764a1a973bfdecbf79a46e5ea494c2
Author: Richard Reingruber <richard.reingruber@sap.com>
Date:   Wed Aug 10 19:01:49 2022 +0200

    x86_64 is affected too w/o the redundant interp. frame padding

diff --git a/src/hotspot/share/oops/stackChunkOop.cpp b/src/hotspot/share/oops/stackChunkOop.cpp
index e18f3e832ad..dda1756300d 100644
--- a/src/hotspot/share/oops/stackChunkOop.cpp
+++ b/src/hotspot/share/oops/stackChunkOop.cpp
@@ -608,7 +608,7 @@ bool stackChunkOopDesc::verify(size_t* out_size, int* out_oops, int* out_frames,
 
     int calculated_max_size = closure._size
                               + closure._num_i2c * frame::align_wiggle
-                              + closure._num_interpreted_frames * frame::align_wiggle;
+                              AARCH64_ONLY(+ closure._num_interpreted_frames * frame::align_wiggle);
     assert(max_thawing_size() == calculated_max_size,
            "max_size(): %d calculated_max_size: %d argsize: %d num_i2c: %d",
            max_thawing_size(), calculated_max_size, closure._argsize, closure._num_i2c);
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index a48a104a858..9dd360db71d 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -1064,7 +1064,9 @@ NOINLINE freeze_result FreezeBase::recurse_freeze_interpreted_frame(frame& f, fr
   DEBUG_ONLY(before_freeze_java_frame(f, caller, fsize, 0, is_bottom_frame);)
 
   frame hf = new_heap_frame<ContinuationHelper::InterpretedFrame>(f, caller);
+#if defined(AARCH64)
   _total_align_size += frame::align_wiggle; // add alignment room for internal interpreted frame alignment om AArch64
+#endif
 
   intptr_t* heap_frame_top = ContinuationHelper::InterpretedFrame::frame_top(hf, callee_argsize, callee_interpreted);
   intptr_t* heap_frame_bottom = ContinuationHelper::InterpretedFrame::frame_bottom(hf);
@@ -2016,7 +2018,9 @@ NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& c
 
   DEBUG_ONLY(before_thaw_java_frame(hf, caller, is_bottom_frame, num_frames);)
 
+#if defined(AARCH64)
   _align_size += frame::align_wiggle; // possible added alignment for internal interpreted frame alignment om AArch64
+#endif
 
   frame f = new_stack_frame<ContinuationHelper::InterpretedFrame>(hf, caller, is_bottom_frame);