[Release/5.0] Fix covariant returns when overriding method of non-parent ancestor #47937
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
janvorli
added
Servicing-consider
jeffschwMSFT
approved these changes
Feb 8, 2021
davidwrighton
approved these changes
Feb 8, 2021
leecow
added
Servicing-approved
|
@janvorli can you address the merge conflicts here ? |
|
Sure, I'll resolve it in a minute. |
…ent ancestor There is a problem in the ClassLoader::ValidateMethodsWithCovariantReturnTypes that results in failed verification of valid override in case the return type of the method being overriden is generic in canonical form and it is defined in an ancestor class that is not the parent. The problem is that we attempt to use instantiation of the parent class instead of the ancestor class that contains definition of the method being overriden. This change fixes it by locating the proper ancestor MethodTable and using it.
janvorli
force-pushed
the
port-fix-covariant-returns-issue-4
branch
from
7384f76
to
43a8b88
Compare
|
@Anipik done |
|
It looks like brew installation of dependencies is broken on OSX / iOS / tvOS: |
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.
Port #47846 to release/5.0
There is a problem in the
ClassLoader::ValidateMethodsWithCovariantReturnTypes that results in
failed verification of valid override in case the return type of the
method being overriden is generic in canonical form and it is defined
in an ancestor class that is not the parent.
The problem is that we attempt to use instantiation of the parent class
instead of the ancestor class that contains definition of the method
being overriden.
This change fixes it by locating the proper ancestor MethodTable and
using it.
Customer Impact
Valid application that uses multiple generic type arguments in covariant return override where some of them but not all are canonical crashes at runtime with System.TypeLoadException when attempting to use the underlying type.
Testing
CoreCLR pri1 tests, including the new test added that specifically target the problematic cases (copy of the repro provided by our customer that have found the issue)
Risk
Low
Regression
No