Use AvoidMap to take bounds and variance into account

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala

@@ -19,6 +19,7 @@ import dotty.tools.dotc.config.ScalaRelease.*
 import scala.collection.mutable
 import dotty.tools.dotc.core.Annotations._
 import dotty.tools.dotc.core.StdNames._
+import dotty.tools.dotc.core.TypeOps.AvoidMap
 import dotty.tools.dotc.quoted._
 import dotty.tools.dotc.inlines.Inlines
 
@@ -135,16 +136,9 @@ class PickleQuotes extends MacroTransform {
       }
 
       /** Remove references to local types that will not be defined in this quote */
-      private def getTermHoleType(using Context) = new TypeMap() {
-        override def apply(tp: Type): Type = tp match
-          case tp @ TypeRef(NoPrefix, _) =>
-            // reference to term with a type defined in outer quote
-            getTypeHoleType(tp)
-          case tp @ TermRef(NoPrefix, _) =>
-            // widen term refs to terms defined in outer quote
-            apply(tp.widenTermRefExpr)
-          case tp =>
-            mapOver(tp)
+      private def getTermHoleType(using Context) = new AvoidMap {
+        def toAvoid(tp: NamedType): Boolean =
+          tp.prefix == NoPrefix // reference to terms and type defined in outer quote
       }
 
       /** Get the contents of the transformed tree */
@@ -210,24 +204,15 @@ class PickleQuotes extends MacroTransform {
   }
 
   /** Remove references to local types that will not be defined in this quote */
-  private def getTypeHoleType(using Context) = new TypeMap() {
-    override def apply(tp: Type): Type = tp match
-      case tp: TypeRef if tp.typeSymbol.isTypeSplice =>
-        apply(tp.dealias)
-      case tp @ TypeRef(pre, _) if isLocalPath(pre) =>
-        val hiBound = tp.typeSymbol.info match
-          case info: ClassInfo => info.parents.reduce(_ & _)
-          case info => info.hiBound
-        apply(hiBound)
-      case tp =>
-        mapOver(tp)
+  private def getTypeHoleType(using Context) = new AvoidMap {
+    def toAvoid(tp: NamedType): Boolean =
+      tp.typeSymbol.isTypeSplice || isLocalPath(tp.prefix)
 
     private def isLocalPath(tp: Type): Boolean = tp match
       case NoPrefix => true
       case tp: TermRef if !tp.symbol.is(Package) => isLocalPath(tp.prefix)
       case tp => false
   }
-
 }
 
 object PickleQuotes {