Fix #4342: Adapt outer types when calling into Scala 2 classes #4344
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
dottybot
reviewed
Apr 19, 2018
| @@ -336,12 +336,23 @@ object ExplicitOuter { | |||
| class OuterOps(val ictx: Context) extends AnyVal { | |||
| private implicit def ctx: Context = ictx | |||
|
|
|||
| private def outerType(cls: ClassSymbol): Type = { | |||
There was a problem hiding this comment.
Can you add a comment explaining why this is needed
|
Sure, there you go! |
We can ignore packages when collecting dependencies for incremental compilation. We make sure not to ignore dependencies on package object.
1. ApproximatingTypeMap produces Nothing, which is not what is needed. 2. Avoid blind erasure which lose information about the pattern, see tests/patmat/i4314b.scala
Blind substitution of pattern bound type symbol with WildcardType
will cause t2425.scala fail, as the following holds:
Array[_] <:< Array[Array[_]]
To walkaround the problem, we don't substitute pattern bound symbols
that are immediate parameters to `Array`.
Use TypeBounds instead of WildcardType. WildcardType has the
following unexpected behavior:
Array[?] <:< Array[Array[?]]
…er, adapt to the old behavior in picking the outer parameter's type, i.e., prefer the enclosing class's self type, rather than the enclosing class itself.
|
This PR needs to be rebased to get rid of commits already in master. |
odersky
approved these changes
Jan 12, 2019
There was a problem hiding this comment.
Sorry for coming to this only now. We have too many open PRs so unless I am assigned I usually don't see what the status is.
The changes to ExplicitOuter look good to me.
@liufengyun @smarter Can you comment on the changes to SpaceEngine and sbt extraction? If they are both good we should merge this now.
|
I think all these other changes come from commits which are already in master, the PR just needs a rebase. |
|
OK @gsps Can you do the rebase then we can get this in quickly. |
|
Rebased PR opened here: #5801 |
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.
See #4342 for some context.