-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Use level checking for Fresh instances #23101
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
odersky
wants to merge
17
commits into
scala:main
Choose a base branch
from
dotty-staging:drop-disallow-fresh
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+1,855
−838
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
Refactor to avoid generating refsText ahead of time. We need to keep the original capture sets or tree lists so that we can record them as seen.
- Map cap to Result in their original types (was Fresh before) - Map Result to Fresh on access
223b9c6
to
99a4c20
Compare
Turn level checking on under the useFreshLevels config option (which is on by default)
Fall back to previous scheme if there is no recording in Seen. That way, we see what we expect when turning on Ycc-verbose and other printing options.
…bles. The check was not working properly before, which meant that problems went undetected. To make things work again, we need two additional fixes - A more detailed treatment of result mapping for inferred types. In these, we map root.Fresh to root.Result only if the original inferred type was dependent. AppliedType functions are also mapped to RefinedType functions in setup, but this should not count for fresh to result mappings. - A fix in the Fresh to Result mapping of parameterless defs.
When printing types deriving from capability, do print their capture sets even if these are implied. This avoids confusing errors where a capability classes has two different implied Fresh instances which are both elided so the types look the same. Exception: When printing a singleton type (x: T) we do elide in T, since the usually the only part that matters is the `x`. But we don't do the elision under -Ycc-verbose or -explain.
99a4c20
to
d7eb32a
Compare
We had the wrong condition in maxSubsumes before. We need to test for isStaticOwner instead of isStatic. The previous test made all fresh capabilities in global classes slip through the net.
d7eb32a
to
b58327d
Compare
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.
This PR changes the way we treat fresh instances. Instead of disallowing all of them when instantiating type parameters (as well as in a number of other situations), we allow them but check that inner fresh instances do not get widened to outer ones. This makes code like this one compile
Previously, that would not work since the
X
andY
variables ofPair
would be instantiated toRef^
, which was not allowed.The PR also implements lots of improvements to error diagnostics.
^
,cap
, or=>
.