Merge pull request #42 from ChengJin01/jep424_fix_valist_struct_jtreg…

…_tests_jdk19

[Jtreg]Fix the issue with addVarg/nextVarg of VaList on Power

src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64VaList.java

@@ -123,8 +123,13 @@ private Object readArg(MemoryLayout argLayout, SegmentAllocator allocator) {
 				argument = argHandle.get(segment);
 			}
 			case STRUCT -> {
-				/* Copy the struct argument with the aligned size from the va_list buffer to allocated memory */
-				argument = allocator.allocate(argByteSize).copyFrom(segment.asSlice(0, argByteSize));
+				/* With the smaller size of the allocated struct segment and the corresponding layout,
+				 * it ensures the struct value is copied correctly from the va_list segment to the
+				 * returned struct argument.
+				 */
+				MemorySegment structSegment = allocator.allocate(argLayout);
+				long structByteSize = getSmallerStructArgSize(structSegment, argLayout);
+				argument = structSegment.copyFrom(segment.asSlice(0, structByteSize));
 			}
 			default -> throw new IllegalStateException("Unsupported TypeClass: " + typeClass);
 		}
@@ -155,6 +160,11 @@ private void checkNextArgument(MemoryLayout argLayout, long argByteSize) {
 		}
 	}
 
+	private static long getSmallerStructArgSize(MemorySegment structSegment, MemoryLayout structArgLayout) {
+		return (structSegment.byteSize() > structArgLayout.byteSize()) ?
+							structArgLayout.byteSize() : structSegment.byteSize();
+	}
+
 	@Override
 	public void skip(MemoryLayout... layouts) {
 		Objects.requireNonNull(layouts);
@@ -257,20 +267,29 @@ public VaList build() {
 			MemorySegment cursorSegment = segment;
 
 			for (SimpleVaArg arg : stackArgs) {
+				Object argValue = arg.value;
 				MemoryLayout argLayout = arg.layout;
+				long argByteSize = getAlignedArgSize(argLayout);
 				TypeClass typeClass = TypeClass.classifyLayout(argLayout);
+
 				switch (typeClass) {
 					case PRIMITIVE, POINTER -> {
 						VarHandle argHandle = TypeClass.classifyVarHandle((ValueLayout)argLayout);
-						argHandle.set(cursorSegment, arg.value);
+						argHandle.set(cursorSegment, argValue);
 					}
 					case STRUCT -> {
-						cursorSegment.copyFrom((MemorySegment)(arg.value));
+						/* With the smaller size of the struct argument and the corresponding layout,
+						 * it ensures the struct value is copied correctly from the struct argument
+						 * to the va_list.
+						 */
+						MemorySegment structSegment = (MemorySegment)argValue;
+						long structByteSize = getSmallerStructArgSize(structSegment, argLayout);
+						cursorSegment.copyFrom(structSegment.asSlice(0, structByteSize));
 					}
 					default -> throw new IllegalStateException("Unsupported TypeClass: " + typeClass);
 				}
 				/* Move to the next argument by the aligned size of the current argument */
-				cursorSegment = cursorSegment.asSlice(getAlignedArgSize(argLayout));
+				cursorSegment = cursorSegment.asSlice(argByteSize);
 			}
 			return new AixPPC64VaList(segment, session);
 		}

src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/sysv/SysVPPC64leVaList.java

@@ -123,8 +123,13 @@ private Object readArg(MemoryLayout argLayout, SegmentAllocator allocator) {
 				argument = argHandle.get(segment);
 			}
 			case STRUCT -> {
-				/* Copy the struct argument with the aligned size from the va_list buffer to allocated memory */
-				argument = allocator.allocate(argByteSize).copyFrom(segment.asSlice(0, argByteSize));
+				/* With the smaller size of the allocated struct segment and the corresponding layout,
+				 * it ensures the struct value is copied correctly from the va_list segment to the
+				 * returned struct argument.
+				 */
+				MemorySegment structSegment = allocator.allocate(argLayout);
+				long structByteSize = getSmallerStructArgSize(structSegment, argLayout);
+				argument = structSegment.copyFrom(segment.asSlice(0, structByteSize));
 			}
 			default -> throw new IllegalStateException("Unsupported TypeClass: " + typeClass);
 		}
@@ -155,6 +160,11 @@ private void checkNextArgument(MemoryLayout argLayout, long argByteSize) {
 		}
 	}
 
+	private static long getSmallerStructArgSize(MemorySegment structSegment, MemoryLayout structArgLayout) {
+		return (structSegment.byteSize() > structArgLayout.byteSize()) ?
+							structArgLayout.byteSize() : structSegment.byteSize();
+	}
+
 	@Override
 	public void skip(MemoryLayout... layouts) {
 		Objects.requireNonNull(layouts);
@@ -257,20 +267,29 @@ public VaList build() {
 			MemorySegment cursorSegment = segment;
 
 			for (SimpleVaArg arg : stackArgs) {
+				Object argValue = arg.value;
 				MemoryLayout argLayout = arg.layout;
+				long argByteSize = getAlignedArgSize(argLayout);
 				TypeClass typeClass = TypeClass.classifyLayout(argLayout);
+
 				switch (typeClass) {
 					case PRIMITIVE, POINTER -> {
 						VarHandle argHandle = TypeClass.classifyVarHandle((ValueLayout)argLayout);
-						argHandle.set(cursorSegment, arg.value);
+						argHandle.set(cursorSegment, argValue);
 					}
 					case STRUCT -> {
-						cursorSegment.copyFrom((MemorySegment)(arg.value));
+						/* With the smaller size of the struct argument and the corresponding layout,
+						 * it ensures the struct value is copied correctly from the struct argument
+						 * to the va_list.
+						 */
+						MemorySegment structSegment = (MemorySegment)argValue;
+						long structByteSize = getSmallerStructArgSize(structSegment, argLayout);
+						cursorSegment.copyFrom(structSegment.asSlice(0, structByteSize));
 					}
 					default -> throw new IllegalStateException("Unsupported TypeClass: " + typeClass);
 				}
 				/* Move to the next argument by the aligned size of the current argument */
-				cursorSegment = cursorSegment.asSlice(getAlignedArgSize(argLayout));
+				cursorSegment = cursorSegment.asSlice(argByteSize);
 			}
 			return new SysVPPC64leVaList(segment, session);
 		}