diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-04-09 15:09:54 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-09 15:09:54 +0200 |
| commit | 756ba3d0dd5fe6f0f1dd0a954fb764503433da02 (patch) | |
| tree | 46d7f00946ad83abcb7c12a941bad7b076aa0fd9 /compiler/src/dotty/tools/dotc/core/TypeComparer.scala | |
| parent | 10546245dd903a6c132253fc17ee344fbcdd8f70 (diff) | |
| download | dotty-756ba3d0dd5fe6f0f1dd0a954fb764503433da02.tar.gz dotty-756ba3d0dd5fe6f0f1dd0a954fb764503433da02.tar.bz2 dotty-756ba3d0dd5fe6f0f1dd0a954fb764503433da02.zip | |
Tweak logic for hk type comparisons
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/TypeComparer.scala')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/TypeComparer.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index da6d63387..54b96a253 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -726,10 +726,9 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { tycon2 match { case param2: TypeParamRef => - isMatchingApply(tp1) || { - if (canConstrain(param2)) canInstantiate(param2) - else compareLower(bounds(param2), tyconIsTypeRef = false) - } + isMatchingApply(tp1) || + canConstrain(param2) && canInstantiate(param2) || + compareLower(bounds(param2), tyconIsTypeRef = false) case tycon2: TypeRef => isMatchingApply(tp1) || compareLower(tycon2.info.bounds, tyconIsTypeRef = true) |