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] scala/scala3#282

Author: retronym

src/compiler/scala/tools/nsc/typechecker/Contexts.scala

@@ -807,12 +807,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()

src/compiler/scala/tools/nsc/typechecker/Implicits.scala

@@ -1012,9 +1012,7 @@ trait Implicits {
               }
             case None =>
               if (pre.isStable && !pre.typeSymbol.isExistentiallyBound) {
-                val pre1 =
-                  if (sym.isPackageClass) sym.packageObject.typeOfThis
-                  else singleType(pre, companionSymbolOf(sym, context))
+                val pre1 = pre memberType companionSymbolOf(sym, context)
                 val infos = pre1.implicitMembers.iterator.map(mem => new ImplicitInfo(mem.name, pre1, mem)).toList
                 if (infos.nonEmpty)
                   infoMap += (sym -> infos)

src/interactive/scala/tools/nsc/interactive/Global.scala

@@ -148,18 +148,6 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
   override def forInteractive = true
   override protected def synchronizeNames = true
 
-  override def newAsSeenFromMap(pre: Type, clazz: Symbol): AsSeenFromMap =
-    new InteractiveAsSeenFromMap(pre, clazz)
-
-  class InteractiveAsSeenFromMap(pre: Type, clazz: Symbol) extends AsSeenFromMap(pre, clazz) {
-    /** The method formerly known as 'instParamsRelaxed' goes here if it's still necessary,
-     *  which it is currently supposed it is not.
-     *
-     *  If it is, change AsSeenFromMap method correspondingTypeArgument to call an overridable
-     *  method rather than aborting in the failure case.
-     */
-  }
-
   /** A map of all loaded files to the rich compilation units that correspond to them.
    */
   val unitOfFile = mapAsScalaMapConverter(new ConcurrentHashMap[AbstractFile, RichCompilationUnit] {

src/reflect/scala/reflect/internal/tpe/TypeMaps.scala

@@ -433,8 +433,12 @@ private[internal] trait TypeMaps {
     (pre eq NoType) || (pre eq NoPrefix) || !isPossiblePrefix(clazz)
     )
 
-  def newAsSeenFromMap(pre: Type, clazz: Symbol): AsSeenFromMap =
-    new AsSeenFromMap(pre, clazz)
+  final def newAsSeenFromMap(pre: Type, clazz: Symbol): AsSeenFromMap = {
+    val prePackageObjectExpanded = if (pre.typeSymbolDirect.hasPackageFlag && !clazz.hasPackageFlag)
+      pre.packageObject.typeOfThis
+    else pre
+    new AsSeenFromMap(prePackageObjectExpanded, clazz)
+  }
 
   /** A map to compute the asSeenFrom method.
     */

test/files/pos/t9074.scala

@@ -0,0 +1,24 @@
+package blam {
+
+  package foo {
+
+    trait F[T] {
+      def f(d: Double, t: T): T = ???
+      def f(d: Int, t: T): T = ???
+      def f(d: String, t: T): T = ???
+
+      def g[A](a: T): T = ???
+      def g(a: Int) = ???
+    }
+  }
+
+  package object foo extends foo.F[Double] {
+    override def f(d: Double, t: Double): Double = ???
+  }
+}
+
+object Test {
+  import blam._
+  foo.f("3", 4.0)
+  foo.g[Any](1d) : Double
+}

test/files/pos/t9074b.scala

@@ -0,0 +1,15 @@
+trait Echo [T] {
+  def echo(t: T): Unit
+}
+
+trait IntEcho extends Echo[Int] {
+  def echo(t: Int) = println(t)
+}
+
+object echo extends IntEcho
+package object echo1  extends IntEcho
+
+object App extends App {
+  echo.echo(1)
+  echo1.echo(1)
+}