[GR-55694] Fix total frame size of JNI trampolines.

pejovica · lewurm · commit 691b20884c9e · 2024-07-21T17:09:10.000Z
PullRequest: graal/18367
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
@@ -1833,7 +1833,7 @@ public CompilationResult createJNITrampolineMethod(ResolvedJavaMethod method, Co
         result.recordMark(asm.position(), PROLOGUE_END);
         byte[] instructions = asm.close(true);
         result.setTargetCode(instructions, instructions.length);
-        result.setTotalFrameSize(getTarget().stackAlignment); // not really, but 0 not allowed
+        result.setTotalFrameSize(FrameAccess.returnAddressSize());
         return result;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1833,7 +1833,7 @@ public CompilationResult createJNITrampolineMethod(ResolvedJavaMethod method, Co`
`1833`	`1833`	`result.recordMark(asm.position(), PROLOGUE_END);`
`1834`	`1834`	`byte[] instructions = asm.close(true);`
`1835`	`1835`	`result.setTargetCode(instructions, instructions.length);`
`1836`		`- result.setTotalFrameSize(getTarget().stackAlignment); // not really, but 0 not allowed`
	`1836`	`+ result.setTotalFrameSize(FrameAccess.returnAddressSize());`
`1837`	`1837`	`return result;`
`1838`	`1838`	`}`
`1839`	`1839`