Merged
Conversation
adamsitnik
reviewed
Aug 12, 2022
vitek-karas
approved these changes
Aug 12, 2022
Member
vitek-karas
left a comment
vitek-karas
left a comment
There was a problem hiding this comment.
The code is currently not written to handle replacing instruction sequences of various length for conditions - in this case we would have to remove the ldc.i4.1 and brtrue.s to replace it with a simple br.s. Obviously doable, but would require much more code churn.
#2905 runs into a similar limitation. I haven't look in detail if we could use the same approach for both though. In any case I think this targeted fix is OK for 7.
Co-authored-by: Adam Sitnik <[email protected]>
agocke
pushed a commit
to dotnet/runtime
that referenced
this pull request
Nov 16, 2022
This prevents invalid IL in situations where removing the last instruction of a method would result in the last instruction being a conditional branch. There needs to be some IL in the not-taken branch for the IL to be valid, so this fixes the issue by injecting "ldnull; throw" at the end. Co-authored-by: vitek-karas <[email protected]> Co-authored-by: Adam Sitnik <[email protected]> Commit migrated from dotnet/linker@d559347
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Thanks for sharing the fix @vitek-karas. I cleaned it up a little to be more specific (existing tests which ended in removed ret instructions - for example in a removed else branch - were failing), and changed the test to check the instruction sequence.
This is intended to fix dotnet/runtime#73474. I had trouble creating a repro of the original issue encountered on runtime bits, but the new testcase exhibits what looks like the same issue.
To me it would feel like a cleaner fix to rewrite the always-taken conditional branches to be unconditional branches, but maybe there is some reason we don't do so today. The current fix has lower risk since it is so specifically targeted.