aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer/ProtoTypes.scala
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2016-02-06 00:51:20 +0100
committerGuillaume Martres <smarter@ubuntu.com>2016-02-06 01:21:49 +0100
commit534e4ad9f6ef1dfb767adc89c9544484cab4f48a (patch)
tree8a7a24b5fe18abc4917a32790a1ef0b7fa247abc /src/dotty/tools/dotc/typer/ProtoTypes.scala
parent2c08c72a7f9b968e1f659d1d3d811f3166524983 (diff)
downloaddotty-534e4ad9f6ef1dfb767adc89c9544484cab4f48a.tar.gz
dotty-534e4ad9f6ef1dfb767adc89c9544484cab4f48a.tar.bz2
dotty-534e4ad9f6ef1dfb767adc89c9544484cab4f48a.zip
Fix #1044: handle TypevarsMissContext mode in wildApprox
When `wildApprox` encounters a PolyParam it approximates it by its bounds in the current constraint set, but this is incorrect if `TypevarsMissContext` is set, we might get the bounds of another use of this `PolyType`. This is exactly what happened in i1044.scala where the implicit view `refArrayOps` needs to be used twice with two different type parameters. The fix is to approximate a PolyParam by its original bounds in its PolyType if `TypevarsMissContext` is set. This fix was inspired by the approach of #1054.
Diffstat (limited to 'src/dotty/tools/dotc/typer/ProtoTypes.scala')
-rw-r--r--src/dotty/tools/dotc/typer/ProtoTypes.scala14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/typer/ProtoTypes.scala b/src/dotty/tools/dotc/typer/ProtoTypes.scala
index db196f0c2..8a758bcc8 100644
--- a/src/dotty/tools/dotc/typer/ProtoTypes.scala
+++ b/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -391,11 +391,15 @@ object ProtoTypes {
case tp: TypeAlias => // default case, inlined for speed
tp.derivedTypeAlias(wildApprox(tp.alias, theMap))
case tp @ PolyParam(poly, pnum) =>
- ctx.typerState.constraint.entry(tp) match {
- case bounds: TypeBounds => wildApprox(WildcardType(bounds))
- case NoType => WildcardType(wildApprox(poly.paramBounds(pnum)).bounds)
- case inst => wildApprox(inst)
- }
+ def unconstrainedApprox = WildcardType(wildApprox(poly.paramBounds(pnum)).bounds)
+ if (ctx.mode.is(Mode.TypevarsMissContext))
+ unconstrainedApprox
+ else
+ ctx.typerState.constraint.entry(tp) match {
+ case bounds: TypeBounds => wildApprox(WildcardType(bounds))
+ case NoType => unconstrainedApprox
+ case inst => wildApprox(inst)
+ }
case MethodParam(mt, pnum) =>
WildcardType(TypeBounds.upper(wildApprox(mt.paramTypes(pnum))))
case tp: TypeVar =>