Fix #2998: Constrain type from above before interpolating variables #3774
Conversation
|
test performance please |
|
performance test scheduled: 1 job(s) in queue, 0 running. |
|
Performance test finished successfully: Visit http://dotty-bench.epfl.ch/3774/ to see the changes. Benchmarks is based on merging with master (7e402a7) |
When interpolating type variables we should use all available information at this point, including the expected result type. One situation where this makes a difference is if the expected type is a singleton type, because type variables are instantiated to singleton types only if their upper bounds are singleton types. Also fixes scala#2997.
|
test performance please |
|
performance test scheduled: 1 job(s) in queue, 0 running. |
|
Performance test finished successfully: Visit http://dotty-bench.epfl.ch/3774/ to see the changes. Benchmarks is based on merging with master (7e402a7) |
Performance tests indicated a 3% slowdown for dotty. Trying to mitigate that by avoiding constraining types multiple times.
|
test performance please |
|
performance test scheduled: 1 job(s) in queue, 0 running. |
|
Performance test finished successfully: Visit http://dotty-bench.epfl.ch/3774/ to see the changes. Benchmarks is based on merging with master (7e402a7) |
|
The last commit seemed to have helped performance, so we are good on that count, I think. |
| case _ => false | ||
| } | ||
|
|
||
| var isConstrained = false |
There was a problem hiding this comment.
I think it would be cleaner to do:
var isConstrained = tree.isInstanceOf[Apply] || tree.tpe.isInstanceOf[MethodOrPoly]There was a problem hiding this comment.
I saw that comment to late, after merging. I'll attach the change to a subsequent PR.
This commit cleans up a piece of code of scala#3774 (which is already merged). It was suggested in review comments.
This commit cleans up a piece of code of scala#3774 (which is already merged). It was suggested in review comments.
This commit cleans up a piece of code of scala#3774 (which is already merged). It was suggested in review comments.
This commit cleans up a piece of code of scala#3774 (which is already merged). It was suggested in a review comments.
When interpolating type variables we should use all available information
at this point, including the expected result type. One situation where this makes
a difference is if the expected type is a singleton type, because type variables
are instantiated to singleton types only if their upper bounds are singleton types.
Also fixes #2997.