Skip to content

[mono] Fix detecting [DisableRuntimeMarshalling] in MarshalingPInvokeScanner. #112981

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
akoeplinger merged 3 commits into from
Mar 7, 2025
Merged

[mono] Fix detecting [DisableRuntimeMarshalling] in MarshalingPInvokeScanner. #112981

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aba1d1f
[mono] Fix detecting [DisableRuntimeMarshalling] in MarshalingPInvoke…
rolfbjarne Feb 27, 2025
599bb7c
Update src/tasks/MonoTargetsTasks/MarshalingPInvokeScanner/Marshaling…
rolfbjarne Feb 27, 2025
ec89808
Fix formatting.
rolfbjarne Mar 3, 2025
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
20 changes: 18 additions & 2 deletions src/tasks/MonoTargetsTasks/MarshalingPInvokeScanner/MarshalingPInvokeScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ private void ResolveInconclusiveTypes(HashSet<string> incompatible, string assyP
}
}

private static bool IsDisableRuntimeMarshallingAttribute(MetadataReader mdtReader, StringHandle ns, StringHandle name)
{
return mdtReader.StringComparer.Equals(ns, "System.Runtime.CompilerServices") &&
mdtReader.StringComparer.Equals(name, "DisableRuntimeMarshallingAttribute");
}

private bool IsAssemblyIncompatible(string assyPath, MinimalMarshalingTypeCompatibilityProvider mmtcp)
{
using FileStream file = new FileStream(assyPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
Expand All @@ -124,10 +130,20 @@ private bool IsAssemblyIncompatible(string assyPath, MinimalMarshalingTypeCompat
TypeDefinitionHandle tdh = md.GetDeclaringType();
TypeDefinition td = mdtReader.GetTypeDefinition(tdh);

if (mdtReader.GetString(td.Namespace) == "System.Runtime.CompilerServices" &&
mdtReader.GetString(td.Name) == "DisableRuntimeMarshallingAttribute")
if (IsDisableRuntimeMarshallingAttribute(mdtReader, td.Namespace, td.Name))
return false;
}
else if (attr.Constructor.Kind == HandleKind.MemberReference)
{
MemberReferenceHandle mrh = (MemberReferenceHandle)attr.Constructor;
MemberReference mr = mdtReader.GetMemberReference(mrh);
if (mr.Parent.Kind == HandleKind.TypeReference) {
TypeReference tr = mdtReader.GetTypeReference((TypeReferenceHandle)mr.Parent);

if (IsDisableRuntimeMarshallingAttribute(mdtReader, tr.Namespace, tr.Name))
return false;
}
}
}

foreach (TypeDefinitionHandle typeDefHandle in mdtReader.TypeDefinitions)
Expand Down
Loading