aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2016-01-03 12:43:22 +0100
committerodersky <odersky@gmail.com>2016-01-03 12:43:22 +0100
commitbe3ab3f0806cea8cd3993ef486ded254d8b00143 (patch)
treead808fe5478f7f623ac5e4e76d5e3c060cdf768d /src
parent2427f056447ab3f9a0ceaa001353eb0a4067e1bb (diff)
parent8d8fd269a5e798d4951041c2851ee3b7bd33185d (diff)
downloaddotty-be3ab3f0806cea8cd3993ef486ded254d8b00143.tar.gz
dotty-be3ab3f0806cea8cd3993ef486ded254d8b00143.tar.bz2
dotty-be3ab3f0806cea8cd3993ef486ded254d8b00143.zip
Merge pull request #1010 from dotty-staging/fix/new-asSeenFrom
Fix #1009: Do not forget to skolemize some types
Diffstat (limited to 'src')
-rw-r--r--src/dotty/tools/dotc/core/TypeOps.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/src/dotty/tools/dotc/core/TypeOps.scala
index 9232bd185..04cd2249d 100644
--- a/src/dotty/tools/dotc/core/TypeOps.scala
+++ b/src/dotty/tools/dotc/core/TypeOps.scala
@@ -102,7 +102,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
asSeenFrom(tp.parent, pre, cls, theMap),
tp.refinedName,
asSeenFrom(tp.refinedInfo, pre, cls, theMap))
- case tp: TypeAlias if theMap == null => // if theMap exists, need to do the variance calculation
+ case tp: TypeAlias if tp.variance == 1 => // if variance != 1, need to do the variance calculation
tp.derivedTypeAlias(asSeenFrom(tp.alias, pre, cls, theMap))
case _ =>
(if (theMap != null) theMap else new AsSeenFromMap(pre, cls))