Also handle ImportTypes depending on this references

scala · Jun 27, 2024 · 6ad4fd8 · 6ad4fd8
1 parent d9d7f28
commit 6ad4fd8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -567,9 +567,8 @@ class Inliner(val call: tpd.Tree)(using Context):
             case t: TypeRef => paramProxy.getOrElse(t, mapOver(t))
             case t: TermRef if t.symbol.isImport =>
               val ImportType(e) = t.widenTermRefExpr: @unchecked
-              paramProxy.get(e.tpe) match
-                case Some(p) => newImportSymbol(ctx.owner, singleton(p)).termRef
-                case None => mapOver(t)
+              val e1 = singleton(apply(e.tpe))
+              newImportSymbol(ctx.owner, e1).termRef
             case t: SingletonType =>
               if t.termSymbol.isAllOf(InlineParam) then apply(t.widenTermRefExpr)
               else paramProxy.getOrElse(t, mapOver(t))

diff --git a/tests/pos/i19493.scala b/tests/pos/i19493.scala
@@ -22,8 +22,21 @@ object Minimization:
 
   inline def foo(x: GivesString): Unit =
     import x.aString
-    summon[String]
+    summon[String] // ok
     summonInline[String] // was error
 
   foo(???)
+
+
+  trait A:
+    val x: GivesString
+
+    inline def bar: Unit =
+      import this.x.aString
+      summon[String] // ok
+      summonInline[String] // was error
+
+  val a: A = ???
+  a.bar
+
 end Minimization