From 3d9d1f6c99d2ee803402b02cccba72086af74b38 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Sun, 11 Jan 2015 19:01:09 +1000 Subject: SI-9074 Fix generic substitution with package objects, overloading Takes a leaf out of dotty's book [1] and makes `asSeenFrom` transparently change the prefix from the package class to the package object when needed. This fixes generic subsitution during overload resolution, as reported in SI-9074. This subsumes the former fix for SI-6225, which is removed here. [1] https://github.com/lampepfl/dotty/pull/282 --- src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala') diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index b3e207b334..98289f6a3c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -810,12 +810,7 @@ trait Contexts { self: Analyzer => val qual = imp.qual val qualSym = qual.tpe.typeSymbol - val pre = - if (qualSym.isPackageClass) - // SI-6225 important if the imported symbol is inherited by the the package object. - qualSym.packageObject.typeOfThis - else - qual.tpe + val pre = qual.tpe def collect(sels: List[ImportSelector]): List[ImplicitInfo] = sels match { case List() => List() -- cgit v1.2.3