Merge pull request #20082 from ChengJin01/ffi_test_correct_native_function_invocation_downcall_jdk17_22_v0.48.0

[FFI/0.48] Fix the wrong invocation on the native function in downcall

Author: pshipton

runtime/tests/clinkerffi/CMakeLists.txt

@@ -354,7 +354,7 @@ omr_add_exports(clinkerffitests
 	addBoolStruct1AndNestedBoolStruct2WithXor_returnStruct2_dupStruct
 	addNestedBoolArrayStructsWithXor_dupStruct
 	addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct1_dupStruct
-	addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct1_dupStruct
+	addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct2_dupStruct
 	addNestedBoolStructArrayStructsWithXor_dupStruct
 	addBoolStruct1AndNestedBoolStructArrayStruct2WithXor_returnStruct1_dupStruct
 	addBoolStruct1AndNestedBoolStructArrayStruct2WithXor_returnStruct2_dupStruct

runtime/tests/clinkerffi/module.xml

@@ -347,7 +347,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<export name="addBoolStruct1AndNestedBoolStruct2WithXor_returnStruct2_dupStruct"/>
 		<export name="addNestedBoolArrayStructsWithXor_dupStruct"/>
 		<export name="addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct1_dupStruct"/>
-		<export name="addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct1_dupStruct"/>
+		<export name="addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct2_dupStruct"/>
 		<export name="addNestedBoolStructArrayStructsWithXor_dupStruct"/>
 		<export name="addBoolStruct1AndNestedBoolStructArrayStruct2WithXor_returnStruct1_dupStruct"/>
 		<export name="addBoolStruct1AndNestedBoolStructArrayStruct2WithXor_returnStruct2_dupStruct"/>

test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/DuplicateStructTests.java

@@ -246,7 +246,7 @@ public void test_addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct2_du
 		SequenceLayout boolArray = MemoryLayout.sequenceLayout(2, C_CHAR);
 		GroupLayout structLayout2 = MemoryLayout.structLayout(boolArray.withName("array_elem1"), C_CHAR.withName("elem2"));
 		FunctionDescriptor fd = FunctionDescriptor.of(structLayout2, structLayout1, structLayout2);
-		Addressable functionSymbol = nativeLibLookup.lookup("addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct1_dupStruct").get();
+		Addressable functionSymbol = nativeLibLookup.lookup("addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct2_dupStruct").get();
 
 		try (ResourceScope scope = ResourceScope.newConfinedScope()) {
 			SegmentAllocator allocator = SegmentAllocator.ofScope(scope);

test/functional/Java21Only/src/org/openj9/test/jep442/downcall/DuplicateStructTests.java

@@ -224,7 +224,7 @@ public void test_addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct2_du
 		SequenceLayout boolArray = MemoryLayout.sequenceLayout(2, JAVA_BOOLEAN);
 		GroupLayout structLayout2 = MemoryLayout.structLayout(boolArray.withName("array_elem1"), JAVA_BOOLEAN.withName("elem2"));
 		FunctionDescriptor fd = FunctionDescriptor.of(structLayout2, structLayout1, structLayout2);
-		MemorySegment functionSymbol = nativeLibLookup.find("addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct1_dupStruct").get();
+		MemorySegment functionSymbol = nativeLibLookup.find("addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct2_dupStruct").get();
 		MethodHandle mh = linker.downcallHandle(functionSymbol, fd);
 
 		try (Arena arena = Arena.ofConfined()) {

test/functional/Java22andUp/src/org/openj9/test/jep454/downcall/DuplicateStructTests.java

@@ -224,7 +224,7 @@ public void test_addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct2_du
 		SequenceLayout boolArray = MemoryLayout.sequenceLayout(2, JAVA_BOOLEAN);
 		GroupLayout structLayout2 = MemoryLayout.structLayout(boolArray.withName("array_elem1"), JAVA_BOOLEAN.withName("elem2"));
 		FunctionDescriptor fd = FunctionDescriptor.of(structLayout2, structLayout1, structLayout2);
-		MemorySegment functionSymbol = nativeLibLookup.find("addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct1_dupStruct").get();
+		MemorySegment functionSymbol = nativeLibLookup.find("addBoolStruct1AndNestedBoolArrayStruct2WithXor_returnStruct2_dupStruct").get();
 		MethodHandle mh = linker.downcallHandle(functionSymbol, fd);
 
 		try (Arena arena = Arena.ofConfined()) {