Fix more compiler crashes with fields, refinement types #5536
+33
−15
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
Member
Author
|
Review by @adriaanm, 2.12.1 ? |
retronym
force-pushed
the
ticket/SD-268
branch
2 times, most recently
from
f8b2a75 to
cd70d91
Compare
adriaanm
reviewed
Nov 21, 2016
| val isUnit = isUnitGetter(lazyAccessor) | ||
| val selectVar = if (isUnit) UNIT else Select(thisRef, lazyVar) | ||
| val storeRes = if (isUnit) rhsAtSlowDef else Assign(selectVar, rhsAtSlowDef) | ||
| val storeRes = if (isUnit) rhsAtSlowDef else Assign(selectVar, fields.castHack(rhsAtSlowDef, lazyVar.info.resultType)) |
Contributor
There was a problem hiding this comment.
Do we need resultType here? I think the lazyVar symbol is synthesized by us (which means we don't need ASF, and straight up info should be good)
Member
Author
There was a problem hiding this comment.
Removed. I probably wasn't sure if this the symbol was a method (with a NullaryType to be stripped with resultType) or a field when I wrote that...
In the same manner as scala/scala-dev#219, the placement of the fields phase after uncurry is presenting some challenges in keeping our trees type correct. This commit whacks a few more moles by adding a casts in the body of synthetic methods. Fixes scala/scala-dev#268
retronym
force-pushed
the
ticket/SD-268
branch
from
cd70d91 to
dde82ae
Compare
Contributor
|
LGTM s/mole/pancake/ |
milessabin
added a commit
to milessabin/scala
that referenced
this pull request
Aug 14, 2018
Following on from scala#5536 this commit adds another fields.castHack in AccessorSynthesis#expandLazyClassMember to deal with numeric but singleton typed numeric fields which would otherwise be widened by numericLub. Fixes scala/bug#11071.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 the same manner as scala/scala-dev#219, the placement of the fields
phase after uncurry is presenting some challenges in keeping our trees
type correct.
This commit whacks a few more moles by adding a casts in the body of
synthetic methods.
Fixes scala/scala-dev#268