Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mono][swift-interop] Support for Swift struct lowering in direct P/Invoke returns #104389

Merged
merged 16 commits into from
Jul 15, 2024
Merged

[mono][swift-interop] Support for Swift struct lowering in direct P/Invoke returns #104389

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
503c88c
refactor struct lowering in method-to-ir.c
matouskozak Jun 1, 2024
873699c
[miniJIT][ARM64] Swift struct lowering in returns
matouskozak Jun 20, 2024
ca6b22a
[interp][ARM64] Swift struct lowering in returns
matouskozak Jun 20, 2024
5c62098
enable SwiftRetAbiStress tests on Mono
matouskozak Jun 20, 2024
5890869
[miniJIT][x64] Swift struct lowering in returns
matouskozak Jun 28, 2024
49fa2ed
[interp][x64] Swift struct lowering in returns
matouskozak Jun 29, 2024
c3b6cce
refactoring arm64/x64
matouskozak Jul 1, 2024
4b239a3
more refactoring x64
matouskozak Jul 1, 2024
e6226db
swift ret buffer: r10 to rax move for VCALL
matouskozak Jul 2, 2024
a710be9
Merge branch 'main' into swift-interop/pinvoke-struct-returns
matouskozak Jul 2, 2024
16f9715
Merge branch 'main' into swift-interop/pinvoke-struct-returns
matouskozak Jul 3, 2024
b9f3212
refactoring of swift ret. buffer handlig and more
matouskozak Jul 3, 2024
983d661
change byref of typedref to byref of klass
matouskozak Jul 9, 2024
8e662a4
replace spaces with tabs + formatting
matouskozak Jul 9, 2024
45498f9
[arm64] move add_return_valuetype_swiftcall
matouskozak Jul 9, 2024
a8d58bd
[x64] refactor add_return_valuetype_swiftcall
matouskozak Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions src/mono/mono/mini/method-to-ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7547,34 +7547,27 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
// SwiftSelf, SwiftError, and SwiftIndirectResult are special cases where we need to preserve the class information for the codegen to handle them correctly.
if (mono_type_is_struct (ptype) && !(klass == swift_self || klass == swift_error || klass == swift_indirect_result)) {
SwiftPhysicalLowering lowered_swift_struct = mono_marshal_get_swift_physical_lowering (ptype, FALSE);
// Create a new local variable to store the base address of the struct
MonoInst *struct_base_address = mono_compile_create_var (cfg, mono_get_int_type (), OP_LOCAL);
CHECK_ARG (idx_param);
NEW_ARGLOADA (cfg, struct_base_address, idx_param);
MONO_ADD_INS (cfg->cbb, struct_base_address);
if (!lowered_swift_struct.by_reference) {
// Create a new local variable to store the base address of the struct
MonoInst *struct_base_address = mono_compile_create_var (cfg, mono_get_int_type (), OP_LOCAL);
CHECK_ARG (idx_param);
NEW_ARGLOADA (cfg, struct_base_address, idx_param);
MONO_ADD_INS (cfg->cbb, struct_base_address);

// Load the lowered elements of the struct
for (uint32_t idx_lowered = 0; idx_lowered < lowered_swift_struct.num_lowered_elements; ++idx_lowered) {
MonoInst *lowered_arg = NULL;
// Load the lowered elements of the struct
lowered_arg = mini_emit_memory_load (cfg, lowered_swift_struct.lowered_elements [idx_lowered], struct_base_address, lowered_swift_struct.offsets [idx_lowered], 0);
MonoInst *lowered_arg = mini_emit_memory_load (cfg, lowered_swift_struct.lowered_elements [idx_lowered], struct_base_address, lowered_swift_struct.offsets [idx_lowered], 0);
*sp++ = lowered_arg;

++new_param_count;
g_array_append_val (new_params, lowered_swift_struct.lowered_elements [idx_lowered]);
++new_param_count;
}
} else {
// For structs that cannot be lowered, we change the argument to byref type
ptype = mono_class_get_byref_type (mono_defaults.typed_reference_class);
// Load the address of the struct
MonoInst *struct_base_address = mono_compile_create_var (cfg, mono_get_int_type (), OP_LOCAL);
CHECK_ARG (idx_param);
NEW_ARGLOADA (cfg, struct_base_address, idx_param);
MONO_ADD_INS (cfg->cbb, struct_base_address);
*sp++ = struct_base_address;
ptype = mono_class_get_byref_type (mono_defaults.typed_reference_class);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not clear to me why we can use mono_class_get_byref_type (mono_defaults.typed_reference_class) instead of mono_class_get_byref_type (klass);

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not clear to me why we can use mono_class_get_byref_type (mono_defaults.typed_reference_class) instead of mono_class_get_byref_type (klass);

I'm not sure either. I did some investigating and it seems that the all byref types get changed to generic MONO_TYPE_I which is then handled by codegen as a pointer-sized integer. I will change it to mono_class_get_byref_type (klass) as it makes more sense.


++new_param_count;
g_array_append_val (new_params, ptype);
++new_param_count;
}
} else {
// Copy over non-struct arguments
Expand Down
Loading
Loading