aboutsummaryrefslogtreecommitdiff
path: root/compiler/src/dotty/tools/dotc/core/TypeOps.scala
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2017-03-16 20:27:09 +0100
committerGuillaume Martres <smarter@ubuntu.com>2017-03-18 20:43:25 +0100
commit00bbb97a5bf6ea32de7ca92cb1a7b32280fa4e9e (patch)
treef9b8c352581f3c2507e95479574757bc82af22f4 /compiler/src/dotty/tools/dotc/core/TypeOps.scala
parent215c13408f7709c416baf561c513159622f10ba5 (diff)
downloaddotty-00bbb97a5bf6ea32de7ca92cb1a7b32280fa4e9e.tar.gz
dotty-00bbb97a5bf6ea32de7ca92cb1a7b32280fa4e9e.tar.bz2
dotty-00bbb97a5bf6ea32de7ca92cb1a7b32280fa4e9e.zip
Better type inference in harmonizeUnion
Before this commit, the added testcase failed because the type of `inv` was inferred to be `Inv[Any]` instead of `Inv[Int]`. The situation looks like this: def inv(cond: Boolean) = if (cond) new Inv(1) // : Inv[A] where A >: Int else Inv.empty // : Inv[A'] where A' unconstrained // : Inv[A] | Inv[A'] To get the type of `inv`, we call `harmonizeUnion` which will take the lub of `Inv[A]` and `Inv[A']`, eventually this mean that we do: A' <:< A But since `harmonizeUnion` uses `fluidly`, this does not result in `A'` getting constrained to be a subtype of `A`, instead we constrain `A` to the upper bound of `A'`: Any <:< A We use `fluidly` to avoid creating OrTypes in `lub`, but it turns out that there is a less aggressive solution: `lub` calls `mergeIfSuper` which then calls `isSubTypeWhenFrozen`, if we just make these subtype calls non-frozen, we can achieve what we want. This is what the new `lub` parameter `canConstrain` allows.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/TypeOps.scala')
-rw-r--r--compiler/src/dotty/tools/dotc/core/TypeOps.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
index 6c40794e3..3d2906320 100644
--- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala
+++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
@@ -282,7 +282,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
*/
def harmonizeUnion(tp: Type): Type = tp match {
case tp: OrType =>
- joinIfScala2(typeComparer.fluidly(tp.tp1 | tp.tp2))
+ joinIfScala2(ctx.typeComparer.lub(harmonizeUnion(tp.tp1), harmonizeUnion(tp.tp2), canConstrain = true))
case tp @ AndType(tp1, tp2) =>
tp derived_& (harmonizeUnion(tp1), harmonizeUnion(tp2))
case tp: RefinedType =>