Skip to content

Move DllImportGenerator to use DisableRuntimeMarshalling for its blittable classification #64279

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

Merged
jkoritzinsky merged 6 commits into from
Feb 10, 2022
Merged

Move DllImportGenerator to use DisableRuntimeMarshalling for its blittable classification #64279

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
731b0ba
First pass of moving over to the DisableRuntimeMarshalling-based blit…
jkoritzinsky Jan 20, 2022
1eaf8b6
Fix enum handling for the runtime marshalling disabled case.
jkoritzinsky Jan 31, 2022
ac825ab
Use the dynamic assembly instead of CoreLib for the "module" referenc…
jkoritzinsky Feb 3, 2022
bfcb0ff
Update the runtime to use DisableRuntimeMarshalling where required.
jkoritzinsky Jan 21, 2022
50474a3
Add tests for forwarding [In, Out] attributes
jkoritzinsky Feb 2, 2022
86c0f5b
Use StartupInputEx instead of StartupInput to ensure that we're initi…
jkoritzinsky Feb 7, 2022
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
Next Next commit
Fix enum handling for the runtime marshalling disabled case.
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Feb 9, 2022
commit 1eaf8b62603f30752465ae0678ca197451b9ae0d
14 changes: 8 additions & 6 deletions src/coreclr/tools/Common/TypeSystem/Interop/IL/MarshalHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,26 +872,28 @@ private static MarshallerKind GetArrayElementMarshallerKind(
internal static MarshallerKind GetDisabledMarshallerKind(
TypeDesc type)
{
if (type.Category == TypeFlags.Void)
// Get the underlying type for enum types.
TypeDesc underlyingType = type.UnderlyingType;
if (underlyingType.Category == TypeFlags.Void)
{
return MarshallerKind.VoidReturn;
}
else if (type.IsByRef)
else if (underlyingType.IsByRef)
{
// Managed refs are not supported when runtime marshalling is disabled.
return MarshallerKind.Invalid;
}
else if (type.IsPrimitive)
else if (underlyingType.IsPrimitive)
{
return MarshallerKind.BlittableValue;
}
else if (type.IsPointer || type.IsFunctionPointer)
else if (underlyingType.IsPointer || underlyingType.IsFunctionPointer)
{
return MarshallerKind.BlittableValue;
}
else if (type.IsValueType)
else if (underlyingType.IsValueType)
{
var defType = (DefType)type;
var defType = (DefType)underlyingType;
if (!defType.ContainsGCPointers && !defType.IsAutoLayoutOrHasAutoLayoutFields)
{
return MarshallerKind.BlittableValue;
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/vm/dllimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3349,6 +3349,7 @@ BOOL NDirect::MarshalingRequired(
// any types that contain gc pointers, but all "unmanaged" types are treated as blittable
// as long as they aren't auto-layout and don't have any auto-layout fields.
if (!runtimeMarshallingEnabled &&
!hndArgType.IsEnum() &&
(hndArgType.GetMethodTable()->ContainsPointers()
|| hndArgType.GetMethodTable()->IsAutoLayoutOrHasAutoLayoutField()))
{
Expand Down