From da75de31841e4b50477774e9efc4f554e1f3e4c0 Mon Sep 17 00:00:00 2001
From: Xiaolin Zheng <xlinzheng@openjdk.org>
Date: Fri, 23 Dec 2022 11:54:00 +0000
Subject: [PATCH] 8299172: RISC-V: [TESTBUG] Fix stack alignment logic in jvmci
 RISCV64TestAssembler.java

Reviewed-by: fyang
---
 .../jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java
index 0d4046cd01c..b79fa093e9d 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java
@@ -226,8 +226,7 @@ public class RISCV64TestAssembler extends TestAssembler {
 
     @Override
     public void emitCallPrologue(CallingConvention cc, Object... prim) {
-        emitGrowStack(cc.getStackSize());
-        frameSize += cc.getStackSize();
+        growFrame(cc.getStackSize());
         AllocatableValue[] args = cc.getArguments();
         for (int i = 0; i < args.length; i++) {
             emitLoad(args[i], prim[i]);
@@ -236,8 +235,7 @@ public class RISCV64TestAssembler extends TestAssembler {
 
     @Override
     public void emitCallEpilogue(CallingConvention cc) {
-        emitGrowStack(-cc.getStackSize());
-        frameSize -= cc.getStackSize();
+        growFrame(-cc.getStackSize());
     }
 
     @Override