Skip to content

[mono] Fix second pass of MarshallingPInvokeScanner with metadata-free DLLs #89555

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
jandupej merged 2 commits into from
Jul 28, 2023
Merged

[mono] Fix second pass of MarshallingPInvokeScanner with metadata-free DLLs #89555

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1fabed
Fix second pass of marshalling scanner to also tolerate metadata-free…
jandupej Jul 27, 2023
638f91a
Assembly name is now checked only when metadata are present.
jandupej Jul 27, 2023
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
17 changes: 9 additions & 8 deletions src/tasks/MonoTargetsTasks/MarshalingPInvokeScanner/MarshalingPInvokeScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@ private string[] ScanAssemblies(string[] assemblies)

private void ResolveInconclusiveTypes(HashSet<string> incompatible, string assyPath, MinimalMarshalingTypeCompatibilityProvider mmtcp)
{
string assyName = MetadataReader.GetAssemblyName(assyPath).Name!;
HashSet<string> inconclusiveTypes = mmtcp.GetInconclusiveTypesForAssembly(assyName);
if(inconclusiveTypes.Count == 0)
return;

using FileStream file = new FileStream(assyPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
using PEReader peReader = new PEReader(file);
if (!peReader.HasMetadata)
Copy link
Member

@kotlarmilos kotlarmilos Jul 27, 2023

Choose a reason for hiding this comment

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

Nit: May be good to encapsulate this, so we don't forget to check peReader.HasMetadata each time it is created, but I think it is nice to have.

return; // Just return. There are no metadata in the DLL to help us with remaining types.

MetadataReader mdtReader = peReader.GetMetadataReader();
string assyName = mdtReader.GetString(mdtReader.GetAssemblyDefinition().Name);
HashSet<string> inconclusiveTypes = mmtcp.GetInconclusiveTypesForAssembly(assyName);
if(inconclusiveTypes.Count == 0)
return;

SignatureDecoder<Compatibility, object> decoder = new(mmtcp, mdtReader, null!);

Expand All @@ -107,9 +109,8 @@ private bool IsAssemblyIncompatible(string assyPath, MinimalMarshalingTypeCompat
using FileStream file = new FileStream(assyPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
using PEReader peReader = new PEReader(file);
if (!peReader.HasMetadata)
{
return false;
}
return false; // No types in this DLL means no incompatible marshaling constructs.

MetadataReader mdtReader = peReader.GetMetadataReader();

foreach(CustomAttributeHandle attrHandle in mdtReader.CustomAttributes)
Expand Down