Fix covariant returns when overriding method of non-parent ancestor#47846
Merged
janvorli merged 1 commit intodotnet:masterfrom Feb 5, 2021
Merged
Fix covariant returns when overriding method of non-parent ancestor#47846janvorli merged 1 commit intodotnet:masterfrom
janvorli merged 1 commit intodotnet:masterfrom
Conversation
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.
b860bfc to
9b69ad2
Compare
davidwrighton
approved these changes
Feb 5, 2021
Member
Author
|
/backport to release/5.0 |
Contributor
|
Started backporting to release/5.0: https://github.com/dotnet/runtime/actions/runs/539974060 |
Contributor
|
@janvorli backporting to release/5.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix covariant returns when overriding method of non-parent ancestor
error: sha1 information is lacking or useless (src/coreclr/vm/class.cpp).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix covariant returns when overriding method of non-parent ancestor
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
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 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.
There is a problem in the
ClassLoader::ValidateMethodsWithCovariantReturnTypesthat results infailed 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 overridden.
This change fixes it by locating the proper ancestor
MethodTableandusing it.
Close #45053