Fix #1540: overloaded get and isDefined in option-less patmat #1597
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
odersky
reviewed
Oct 14, 2016
| Block(List(ValDef(b.asTerm, prevValue)), next) | ||
| ) | ||
| val tmpSym = freshSym(prev.pos, prev.tpe, "o") | ||
| val prevValue = ref(tmpSym).select(getDenot.namedType).ensureApplied |
There was a problem hiding this comment.
I don't think that can work. getDenot has a type that's dependent on prev. But the denotation gets added to another prefix, tmpSym. You could try instead:
ref(tmpSym).select(getDenot.symbol).ensureApplied
There was a problem hiding this comment.
Thanks for the tip @odersky !
odersky
requested changes
Oct 14, 2016
| List(ValDef(tmpSym, prev)), | ||
| // must be isEmpty and get as we don't control the target of the call (prev is an extractor call) | ||
| ifThenElseZero( | ||
| ref(tmpSym).select(isDefinedDenot.namedType), |
There was a problem hiding this comment.
I think you need to do the same as for prevValue here; same reasoning applies.
There was a problem hiding this comment.
Thanks for the feedback @odersky , I was wondering why the second succeeded without change. Now I added another test that fails my initial attempt.
|
LGTM, thanks! |
smarter
reviewed
Oct 14, 2016
| @@ -240,17 +240,21 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer { | |||
| val isDefined = extractorMemberType(prev.tpe, nme.isDefined) | |||
|
|
|||
| if ((isDefined isRef defn.BooleanClass) && getTp.exists) { | |||
| val tmpSym = freshSym(prev.pos, prev.tpe, "o") | |||
| val prevValue = ref(tmpSym).select("get".toTermName).ensureApplied | |||
| // isDefined and get maybe overloaded | |||
There was a problem hiding this comment.
Thanks for the catch @smarter , it's fixed in the latest commit.
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.
Fix #1540 .
When
isDefinedandgetare overloaded, make sure the translated code use the correct version of the methods.