Merge pull request #15269 from dotty-staging/fix-15228

Compute correct argument type in ExprMap

Author: anatoliykmetyuk

library/src/scala/quoted/ExprMap.scala

@@ -49,7 +49,11 @@ trait ExprMap:
           tree
         case tree @ Apply(fun, args) =>
           val MethodType(_, tpes, _) = fun.tpe.widen: @unchecked
-          Apply.copy(tree)(transformTerm(fun, TypeRepr.of[Any])(owner), transformTerms(args, tpes)(owner))
+          val tpes1 = tpes.map {
+            case ByNameType(tpe) => tpe
+            case tpe => tpe
+          }
+          Apply.copy(tree)(transformTerm(fun, TypeRepr.of[Any])(owner), transformTerms(args, tpes1)(owner))
         case TypeApply(fun, args) =>
           TypeApply.copy(tree)(transformTerm(fun, TypeRepr.of[Any])(owner), args)
         case _: Literal =>

tests/pos-macros/i15228/Macro_1.scala

@@ -0,0 +1,13 @@
+import scala.quoted.*
+
+inline def mac[T](inline expr: T): T =
+  ${ impl('expr) }
+
+class MyMap() extends ExprMap {
+  override def transform[T](e: Expr[T])(using Type[T])(using q: Quotes): Expr[T] =
+    transformChildren(e)
+}
+
+def impl[T: Type](expr: Expr[T])(using quotes: Quotes): Expr[T] = {
+  MyMap().transform(expr)
+}

tests/pos-macros/i15228/Test_2.scala

@@ -0,0 +1 @@
+def test = mac(None.getOrElse(3))