[mono] ILStrip sorts custom attribute table #87923
Merged
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
dotnet-issue-labeler
bot
added
the
needs-area-label
jandupej
added
area-Build-mono
and removed
needs-area-label
akoeplinger
approved these changes
Jun 22, 2023
| @@ -192,6 +203,15 @@ void PatchResources() | |||
| } | |||
| } | |||
|
|
|||
| void SortCustomAttributes() | |||
There was a problem hiding this comment.
can you please add a comment about why we need to sort the custom attributes here?
|
/backport to release/7.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/5349160200 |
This was referenced Jun 28, 2023
lambdageek
reviewed
Jul 5, 2023
| { | ||
| CustomAttributeRow row_left = (CustomAttributeRow)left; | ||
| CustomAttributeRow row_right = (CustomAttributeRow)right; | ||
| return row_left.Parent.RID.CompareTo(row_right.Parent.RID); |
There was a problem hiding this comment.
This is subtly wrong. the problem is that RID on a cecil metadata token masks out the token type.
We actually have to reconstruct the custom attribute coded-index.
something like:
var leftParentCodedIdx = Utilities.CompressMetadataToken(CodedIndex.HasCustomAttribute, row_left.Parent);
var rightParentCodedIdx = Utilities.CompressMetadataToken(CodedIndex.HasCustomAttribute, row_right.Parent);
return leftParentCodedIdx.CompareTo(rightParentCodedIdx);There was a problem hiding this comment.
This fixed the issue I was running into on #88167
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Jul 5, 2023
The change in dotnet#87923 was subtly wrong, the problem is that RID on a Cecil metadata token masks out the token type. We actually have to reconstruct the custom attribute coded-index.
github-actions bot
pushed a commit
that referenced
this pull request
Jul 5, 2023
The change in #87923 was subtly wrong, the problem is that RID on a Cecil metadata token masks out the token type. We actually have to reconstruct the custom attribute coded-index.
lewing
pushed a commit
that referenced
this pull request
Jul 5, 2023
The change in #87923 was subtly wrong, the problem is that RID on a Cecil metadata token masks out the token type. We actually have to reconstruct the custom attribute coded-index.
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.
This prevents custom attribute table corruption by sorting it as the last step when stripping an assembly. Addresses #85414.
The PR will have to be backported to net7.0.