diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2016-10-11 22:28:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-11 22:28:42 +0200 |
| commit | f738201973f6965b861fe4b0b580c2dfed61f158 (patch) | |
| tree | e8918383ef651fb3e5df0da0e09b2093964954f6 /src/dotty/tools/dotc/core/OrderingConstraint.scala | |
| parent | d96bba0bfd5ab4d80c269bd04ff9ac4d863713db (diff) | |
| parent | ba18173c4ac655eb07eca036a81a7a8b9e76caa7 (diff) | |
| download | dotty-f738201973f6965b861fe4b0b580c2dfed61f158.tar.gz dotty-f738201973f6965b861fe4b0b580c2dfed61f158.tar.bz2 dotty-f738201973f6965b861fe4b0b580c2dfed61f158.zip | |
Merge pull request #1550 from dotty-staging/union-types
True union types
Diffstat (limited to 'src/dotty/tools/dotc/core/OrderingConstraint.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/OrderingConstraint.scala | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/dotty/tools/dotc/core/OrderingConstraint.scala b/src/dotty/tools/dotc/core/OrderingConstraint.scala index 458f8b82f..68c7655ef 100644 --- a/src/dotty/tools/dotc/core/OrderingConstraint.scala +++ b/src/dotty/tools/dotc/core/OrderingConstraint.scala @@ -521,6 +521,11 @@ class OrderingConstraint(private val boundsMap: ParamBounds, case _ if e1 contains e2 => e2 case _ => mergeError } + case tv1: TypeVar => + e2 match { + case tv2: TypeVar if tv1.instanceOpt eq tv2.instanceOpt => e1 + case _ => mergeError + } case _ if e1 eq e2 => e1 case _ => mergeError } |