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

Jump to bottom

Parse CallConvSwift in CoreCLR/NativeAOT #96707

Merged
merged 16 commits into from
Jan 30, 2024
Merged

Parse CallConvSwift in CoreCLR/NativeAOT #96707

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a7e3ee4
Parse CallConvSwift in CoreCLR
jkoritzinsky Jan 8, 2024
8027343
Disallow structs in CallConvSwift signatures in CoreCLR
jkoritzinsky Jan 9, 2024
e056d69
Parse the Swift calling convention in the managed type system
jkoritzinsky Jan 9, 2024
d667148
Add same validation as in CoreCLR in the correct places in crossgen2 …
jkoritzinsky Jan 9, 2024
db1abd0
Update managed type system to check for vector types and allow them
jkoritzinsky Jan 19, 2024
9b642c0
Mark Swift register types as Intrinsic
jkoritzinsky Jan 19, 2024
ebe34e0
Allow vector types and SwiftSelf as parameter types for CallConvSwift…
jkoritzinsky Jan 19, 2024
e873f64
Make new overload of IsMarshallingRequired for UCO scenarios (where t…
jkoritzinsky Jan 22, 2024
de1f23a
Qualify name
jkoritzinsky Jan 23, 2024
2ac4812
Remove struct blocking as we will not block structs any more as the R…
jkoritzinsky Jan 25, 2024
fc5c9ff
Merge branch 'callconv-swift-coreclr' of github.com:jkoritzinsky/runt…
jkoritzinsky Jan 25, 2024
0e9934b
Remove now-unused error message
jkoritzinsky Jan 25, 2024
82764a1
Update src/coreclr/tools/Common/TypeSystem/Interop/IL/MarshalHelpers.cs
jkoritzinsky Jan 26, 2024
b115352
Update EncodeAsEmbeddedSignatureData
jkoritzinsky Jan 29, 2024
4bea8a5
Fix one place where we didn't flow through the calling convention and…
jkoritzinsky Jan 29, 2024
1b8eb2c
Flip branch logic
jkoritzinsky Jan 30, 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
Prev Previous commit
Flip branch logic
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Jan 30, 2024
commit 1b8eb2c76347275eed0d1b81b1c77dbc478e5740
20 changes: 9 additions & 11 deletions src/coreclr/tools/Common/TypeSystem/Interop/UnmanagedCallingConventions.cs
View file
Open in desktop
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,16 @@ public static UnmanagedCallingConventions GetDelegateCallingConventions(this Typ
{
Debug.Assert(delegateType.IsDelegate);

if (delegateType is not EcmaType ecmaDelegate)
if (delegateType is EcmaType ecmaDelegate)
Copy link
Member

Choose a reason for hiding this comment

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

Nit: Might want to either do delegateType.GetTypeDefinition() is EcmaType ecmaDelegate or assert the type is not generic so that we just don't do bad codegen if we ever allow interop with generic delegates.

{
return GetPlatformDefaultUnmanagedCallingConvention(delegateType.Context);
}

MethodSignatureFlags unmanagedCallConv = ecmaDelegate.GetDelegatePInvokeFlags().UnmanagedCallingConvention;
if (unmanagedCallConv != MethodSignatureFlags.None)
{
Debug.Assert((int)MethodSignatureFlags.UnmanagedCallingConventionCdecl == (int)UnmanagedCallingConventions.Cdecl
&& (int)MethodSignatureFlags.UnmanagedCallingConventionStdCall == (int)UnmanagedCallingConventions.Stdcall
&& (int)MethodSignatureFlags.UnmanagedCallingConventionThisCall == (int)UnmanagedCallingConventions.Thiscall);
return (UnmanagedCallingConventions)unmanagedCallConv;
MethodSignatureFlags unmanagedCallConv = ecmaDelegate.GetDelegatePInvokeFlags().UnmanagedCallingConvention;
if (unmanagedCallConv != MethodSignatureFlags.None)
{
Debug.Assert((int)MethodSignatureFlags.UnmanagedCallingConventionCdecl == (int)UnmanagedCallingConventions.Cdecl
&& (int)MethodSignatureFlags.UnmanagedCallingConventionStdCall == (int)UnmanagedCallingConventions.Stdcall
&& (int)MethodSignatureFlags.UnmanagedCallingConventionThisCall == (int)UnmanagedCallingConventions.Thiscall);
return (UnmanagedCallingConventions)unmanagedCallConv;
}
}

return GetPlatformDefaultUnmanagedCallingConvention(delegateType.Context);
Expand Down
Loading