[illink] refactor code sharing between ILLink and MSBuild tasks #9688
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We already have a few trimmer steps that run under both ILLink and the `<LinkAssembliesNoShrink/>` MSBuild task: * `AddKeepAlivesStep` * `FixAbstractMethodsStep` * `FixLegacyResourceDesignerStep` We want to move various parts of the build to become new trimmer steps like above. Previously, we also had to share these steps with the Xamarin.Android linker pipeline, but that's no longer the case. We can now cleanup how these trimmer steps are shared between ILLink and MSBuild, reducing the need for `#if ILLINK` in many places. I also removed various Mono linker source code that is unused.
This reverts commit 90dfd12.
This reverts commit 24109de.
jonathanpeppers
commented
Feb 4, 2025
Comment on lines
-171
to
-197
| class FixLegacyResourceDesignerStep : MonoDroid.Tuner.FixLegacyResourceDesignerStep | ||
| { | ||
| readonly DirectoryAssemblyResolver resolver; | ||
| readonly TaskLoggingHelper logger; | ||
|
|
||
| public FixLegacyResourceDesignerStep (DirectoryAssemblyResolver resolver, TypeDefinitionCache cache, TaskLoggingHelper logger) | ||
| : base(cache) | ||
| { | ||
| this.resolver = resolver; | ||
| this.logger = logger; | ||
| } | ||
|
|
||
| public override void LogMessage (string message) | ||
| { | ||
| logger.LogDebugMessage ("{0}", message); | ||
| } | ||
|
|
||
| public override void LogError (int code, string message) | ||
| { | ||
| logger.LogCodedError ($"XA{code}", message); | ||
| } | ||
|
|
||
| public override AssemblyDefinition Resolve (AssemblyNameReference name) | ||
| { | ||
| return resolver.Resolve (name); | ||
| } | ||
| } |
There was a problem hiding this comment.
Main benefit is deleting all these.
Comment on lines
-19
to
-33
| #if ILLINK | ||
| protected override void Process () | ||
| { | ||
| cache = Context; | ||
| } | ||
| #else // !ILLINK | ||
| public AddKeepAlivesStep (IMetadataResolver cache) | ||
| { | ||
| this.cache = cache; | ||
| } | ||
|
|
||
| readonly | ||
| #endif // !ILLINK | ||
| IMetadataResolver cache; | ||
|
|
There was a problem hiding this comment.
And then removing stuff like this in every shared step.
dellis1972
approved these changes
Feb 4, 2025
grendello
added a commit
that referenced
this pull request
Feb 6, 2025
* main: [illink] refactor code sharing between ILLink and MSBuild tasks (#9688)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We already have a few trimmer steps that run under both ILLink and the
<LinkAssembliesNoShrink/>MSBuild task:AddKeepAlivesStepFixAbstractMethodsStepFixLegacyResourceDesignerStepWe want to move various parts of the build to become new trimmer steps like above.
Previously, we also had to share these steps with the Xamarin.Android linker pipeline, but that's no longer the case. We can now cleanup how these trimmer steps are shared between ILLink and MSBuild, reducing the need for
#if ILLINKin many places.I also removed various Mono linker source code that is unused.