Fix composite Crossgen2 runs on Windows and clean up R2R pipelines #43261
Conversation
This file contains 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
Some time ago I introduced a new option "crossgenframeworkonly" in the test build scripts and I modified the CoreCLR pipeline to use it. Turns out it was never fully functional, crossgenning framework continued taking place in the CORE_ROOT population phase (generatelayoutonly) and only on Windows it got duplicated in the subsequent "crossgen framework" step. This duplication moreover uncovered a bug in the R2RTest tool - when compiling the framework in composite mode twice in a row, the tool was incorrectly manipulating the composite file "framework-r2r.dll", causing an error in the second framework crossgenning step. I believe that it's completely logical to crossgen the framework as part of populating CORE_ROOT. In light of this fact I have just deleted the separate "crossgen framework" step and the corresponding build script options. I have also fixed the described bug in R2RTest related to repeated framework crossgenning in composite mode to restore the invariant that framework crossgenning should be idempotent. Thanks Tomas
nattress
approved these changes
Oct 11, 2020
ghost
locked as resolved and limited conversation to collaborators
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.
Some time ago I introduced a new option "crossgenframeworkonly"
in the test build scripts and I modified the CoreCLR pipeline
to use it. Turns out it was never fully functional, crossgenning
framework continued taking place in the CORE_ROOT population phase
(generatelayoutonly) and only on Windows it got duplicated in the
subsequent "crossgen framework" step. This duplication moreover
uncovered a bug in the R2RTest tool - when compiling the framework
in composite mode twice in a row, the tool was incorrectly
manipulating the composite file "framework-r2r.dll", causing an
error in the second framework crossgenning step.
I believe that it's completely logical to crossgen the framework
as part of populating CORE_ROOT. In light of this fact I have just
deleted the separate "crossgen framework" step and the corresponding
build script options. I have also fixed the described bug in R2RTest
related to repeated framework crossgenning in composite mode to
restore the invariant that framework crossgenning should be idempotent.
Thanks
Tomas
/cc: @dotnet/crossgen-contrib
Fixes: #43198
(In fact this got mostly fixed by my previous checkin but this change should fix the last two remaining composite legs on Windows.)