From 3b60c3bfd675c9c650a006a302fb35163181db89 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 6 Oct 2015 18:06:08 +0200 Subject: Revert "Make prefix covariant in type maps." This reverts commit 0a48b2a6d3516f1f7d10d9a2a594a744ef98d5e8. --- src/dotty/tools/dotc/core/Types.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/dotty/tools/dotc/core/Types.scala') diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala index 1d438daf0..e4f228915 100644 --- a/src/dotty/tools/dotc/core/Types.scala +++ b/src/dotty/tools/dotc/core/Types.scala @@ -2884,7 +2884,13 @@ object Types { tp match { case tp: NamedType => if (stopAtStatic && tp.symbol.isStatic) tp - else tp.derivedSelect(this(tp.prefix)) + else { + val saved = variance + variance = 0 + val result = tp.derivedSelect(this(tp.prefix)) + variance = saved + result + } case _: ThisType | _: BoundType -- cgit v1.2.3