ResolveSuper: add missing methods overrides for disambiguation #5662
Conversation
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
In mixin-overrides.scala, when we compute the overrides for QInt in ResolveSuper, we need to add an override for Baz#op because it matches the concrete method Bar#op (otherwise we'll get a "Conflicting default methods" error at runtime). Before this commit, this did not happen because Baz#op was not considered to match Bar#op, because one refers to Baz.this.A and the other to Bar.this.A. We fix this by calling `matchingDenotation` with a `targetType` corresponding to the current class (`QInt` here) instead of the trait where the denotation is defined. This also allows us to remove the PrimitiveForwarders mini-phase which was apparently doing a subset of this work and is now redundant.
odersky
approved these changes
Dec 29, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In mixin-overrides.scala, when we compute the overrides for QInt in
ResolveSuper, we need to add an override for Baz#op because it matches
the concrete method Bar#op (otherwise we'll get a "Conflicting default
methods" error at runtime). Before this commit, this did not happen
because Baz#op was not considered to match Bar#op, because one refers to
Baz.this.A and the other to Bar.this.A.
We fix this by calling
matchingDenotationwith atargetTypecorresponding to the current class (
QInthere) instead of thetrait where the denotation is defined.
This also allows us to remove the PrimitiveForwarders mini-phase which was
apparently doing a subset of this work and is now redundant.