Merge pull request #2269 from dotty-staging/fix-#2265

Fix #2265: Make new symbols for inlined module proxies.

Author: odersky

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -366,14 +366,11 @@ class Inliner(call: tpd.Tree, rhs: tpd.Tree)(implicit ctx: Context) {
     case tpe: ThisType
     if !ctx.owner.isContainedIn(tpe.cls) && !tpe.cls.is(Package) &&
        !thisProxy.contains(tpe.cls) =>
-      if (tpe.cls.isStaticOwner)
-        thisProxy(tpe.cls) = tpe.cls.sourceModule.termRef
-      else {
-        val proxyName = s"${tpe.cls.name}_this".toTermName
-        val proxyType = tpe.asSeenFrom(prefix.tpe, meth.owner)
-        thisProxy(tpe.cls) = newSym(proxyName, EmptyFlags, proxyType).termRef
+      val proxyName = s"${tpe.cls.name}_this".toTermName
+      val proxyType = tpe.asSeenFrom(prefix.tpe, meth.owner)
+      thisProxy(tpe.cls) = newSym(proxyName, EmptyFlags, proxyType).termRef
+      if (!tpe.cls.isStaticOwner)
         registerType(meth.owner.thisType) // make sure we have a base from which to outer-select
-      }
     case tpe: NamedType
     if tpe.symbol.is(Param) && tpe.symbol.owner == meth &&
        !paramProxy.contains(tpe) =>

tests/run/inline-object.check

@@ -0,0 +1 @@
+bar

tests/run/inline-object.scala

@@ -0,0 +1,14 @@
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    Foo.foo
+  }
+}
+
+object Foo extends Bar {
+  inline def foo: Unit = bar
+}
+
+class Bar {
+  def bar: Unit = println("bar")
+}