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

Workaround NRE in SweepStep #2264

Merged
merged 5 commits into from
Sep 8, 2021
Merged

Workaround NRE in SweepStep #2264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f69d4fd
Workaround NRE in SweepStep
vitek-karas Sep 7, 2021
014d3f8
Fix build
vitek-karas Sep 7, 2021
1bd9321
PR feedback
vitek-karas Sep 8, 2021
9b6049c
PR feedback
vitek-karas Sep 8, 2021
90f02ea
Enable test targetting this issue
vitek-karas Sep 8, 2021
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
18 changes: 12 additions & 6 deletions src/linker/Linker.Steps/SweepStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ protected virtual void SweepAssembly (AssemblyDefinition assembly)
SweepAssemblyReferences (assembly);
}

bool SweepAssemblyReferences (AssemblyDefinition assembly)
static bool SweepAssemblyReferences (AssemblyDefinition assembly)
{
//
// We used to run over list returned by GetTypeReferences but
Expand All @@ -266,7 +266,7 @@ bool SweepAssemblyReferences (AssemblyDefinition assembly)
//
assembly.MainModule.AssemblyReferences.Clear ();

var ars = new AssemblyReferencesCorrector (assembly, Context);
var ars = new AssemblyReferencesCorrector (assembly);
return ars.Process ();
}

Expand Down Expand Up @@ -568,16 +568,14 @@ struct AssemblyReferencesCorrector
{
readonly AssemblyDefinition assembly;
readonly DefaultMetadataImporter importer;
readonly ITryResolveMetadata resolver;

HashSet<TypeReference> updated;
bool changedAnyScopes;

public AssemblyReferencesCorrector (AssemblyDefinition assembly, ITryResolveMetadata resolver)
public AssemblyReferencesCorrector (AssemblyDefinition assembly)
{
this.assembly = assembly;
this.importer = new DefaultMetadataImporter (assembly.MainModule);
this.resolver = resolver;

updated = null;
changedAnyScopes = false;
Expand Down Expand Up @@ -925,7 +923,15 @@ void UpdateScopeOfTypeReference (TypeReference type)
//
// Resolve to type definition to remove any type forwarding imports
//
TypeDefinition td = resolver.TryResolve (type);
// Workaround for https://github.com/mono/linker/issues/2260
// Context has a cache which stores ref->def mapping. This code runs during sweeping
// which can remove the type-def from its assembly, effectively making the ref unresolvable.
// But the cache doesn't know that, it would still "resolve" the type-ref to now defunct type-def.
// For this reason we can't use the context resolution here, and must force Cecil to perform
// real type resolution again (since it can fail, and that's OK).
#pragma warning disable RS0030 // Do not used banned APIs
TypeDefinition td = type.Resolve ();
#pragma warning restore RS0030 // Do not used banned APIs
if (td == null) {
//
// This can happen when not all assembly refences were provided and we
Expand Down
8 changes: 1 addition & 7 deletions ...nheritance.AbstractClasses/NoKeptCtor/OverrideRemoval/OverrideOfAbstractIsKeptNonEmpty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ namespace Mono.Linker.Tests.Cases.Inheritance.AbstractClasses.NoKeptCtor.Overrid
[KeptAssembly ("library.dll")]
[KeptAssembly ("librarywithnonempty.dll")]

// Uncomment after this bug is fixed
// https://github.com/mono/linker/issues/2260
//[RemovedTypeInAssembly ("library.dll", typeof (Dependencies.OverrideOfAbstractIsKeptNonEmpty_UnusedType))]
[RemovedTypeInAssembly ("library.dll", typeof (Dependencies.OverrideOfAbstractIsKeptNonEmpty_UnusedType))]

public class OverrideOfAbstractIsKeptNonEmpty
{
Expand All @@ -28,10 +26,6 @@ public static void Main ()

Dependencies.OverrideOfAbstractIsKeptNonEmpty_BaseType c = HelperToMarkLibraryAndRequireItsBase ();
c.Method ();

// Remove after this bug is fixed
// https://github.com/mono/linker/issues/2260
new Dependencies.OverrideOfAbstractIsKeptNonEmpty_UnusedType ();
}

[Kept]
Expand Down