Skip to content

Don't remove MethodImpl if overridden method is not in a link assembly #2771

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
jtschuster merged 4 commits into from
Apr 29, 2022
Merged

Don't remove MethodImpl if overridden method is not in a link assembly #2771

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc582ba
Quick fix for INumberBase overrides being removed
jtschuster Apr 28, 2022
9b652fc
formatting...
jtschuster Apr 28, 2022
f603ba8
Add test for skip library references
jtschuster Apr 29, 2022
e999084
formatting...
jtschuster Apr 29, 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
12 changes: 11 additions & 1 deletion src/linker/Linker.Steps/SweepStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,12 +472,22 @@ protected virtual void SweepMethods (Collection<MethodDefinition> methods)
void SweepOverrides (MethodDefinition method)
{
for (int i = 0; i < method.Overrides.Count;) {
if (Context.Resolve (method.Overrides[i]) is MethodDefinition ov && ShouldRemove (ov))
if (Context.Resolve (method.Overrides[i]) is MethodDefinition ov && ShouldRemove (ov) && !IgnoreScope (ov.DeclaringType.Scope))
method.Overrides.RemoveAt (i);
else
i++;
}
}

/// <summary>
/// Returns true if the assembly of the <paramref name="scope"></paramref> is not set to link (i.e. action=copy is set for that assembly)
/// </summary>
private bool IgnoreScope (IMetadataScope scope)
{
AssemblyDefinition? assembly = Context.Resolve (scope);
return assembly != null && Annotations.GetAction (assembly) != AssemblyAction.Link;
}

void SweepDebugInfo (Collection<MethodDefinition> methods)
{
List<ScopeDebugInformation>? sweptScopes = null;
Expand Down