Notice args of forwarder when generating it

som-snytt · som-snytt · commit 9cc281eb05a1 · 2024-08-21T17:16:12.000-07:00
diff --git a/src/compiler/scala/tools/nsc/ast/TreeGen.scala b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
@@ -327,7 +327,16 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
       enclosingStaticModules.foldLeft(tree)((tree, moduleClass) => tree.substituteThis(moduleClass, gen.mkAttributedIdent(moduleClass.sourceModule)) )
     }
 
-    newDefDef(methSym, substThisForModule(moveToMethod(useMethodParams(fun.body))))(tpt = TypeTree(resTp))
+    val body = useMethodParams(fun.body)
+    if (methParamSyms.exists(p => isByNameParamType(p.info))) {
+      val bynames = methParamSyms.zip(fun.vparams).collect { case (mp, vp) if isByNameParamType(mp.info) != isByNameParamType(vp.tpt.tpe) => mp }
+      if (bynames.nonEmpty)
+        body.foreach {
+          case t @ Ident(_) if bynames.contains(t.symbol) => t.updateAttachment(PreserveArg)
+          case _ =>
+        }
+    }
+    newDefDef(methSym, substThisForModule(moveToMethod(body)))(tpt = TypeTree(resTp))
   }
 
   /**
diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -246,14 +246,6 @@ abstract class UnCurry extends InfoTransform
         else typeNewFun match {
           case typedNewFun @ Block(stats, expr: Function) =>
             val expansion = gen.expandFunction(localTyper)(expr, inConstructorFlag)
-            expansion match {
-              case Block(ClassDef(_, _, _, Template(_, _, body)) :: Nil, _) =>
-                body.last match {
-                  case DefDef(_, _, _, _, _, Apply(_, args)) => noApply.addAll(args) // samDef args are pass-thru
-                  case _ =>
-                }
-              case _ =>
-            }
             treeCopy.Block(typedNewFun, stats, expansion)
           case x => throw new MatchError(x)
         }
@@ -467,7 +459,7 @@ abstract class UnCurry extends InfoTransform
         else translateSynchronized(tree) match {
           case dd @ DefDef(mods, name, tparams, _, tpt, rhs) =>
             // Remove default argument trees from parameter ValDefs, scala/bug#4812
-            val vparamssNoRhs = dd.vparamss mapConserve (_ mapConserve {p =>
+            val vparamssNoRhs = dd.vparamss.mapConserve(_.mapConserve { p =>
               treeCopy.ValDef(p, p.mods, p.name, p.tpt, EmptyTree)
             })
 
@@ -558,7 +550,7 @@ abstract class UnCurry extends InfoTransform
             if (isByNameRef(tree1)) {
               val tree2 = tree1 setType functionType(Nil, tree1.tpe)
               return {
-                if (noApply contains tree2) tree2
+                if (tree.attachments.contains[PreserveArg.type] || noApply.contains(tree2)) tree2
                 else localTyper.typedPos(tree1.pos)(Apply(Select(tree2, nme.apply), Nil))
               }
             }
diff --git a/src/reflect/scala/reflect/internal/StdAttachments.scala b/src/reflect/scala/reflect/internal/StdAttachments.scala
@@ -186,4 +186,7 @@ trait StdAttachments {
 
   /** This Bind tree was derived immediately from the given tree, for unused accounting. */
   case class VarAlias(tree: Tree /*Bind | ValDef*/) extends PlainAttachment
+
+  /** Do not mangle the arg. It is passed directly in a forwarding application. */
+  case object PreserveArg extends PlainAttachment
 }
diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
@@ -92,6 +92,7 @@ trait JavaUniverseForce { self: runtime.JavaUniverse  =>
     this.DiscardedExpr
     this.BooleanParameterType
     this.VarAlias
+    this.PreserveArg
     this.noPrint
     this.typeDebug
     // inaccessible: this.posAssigner
diff --git a/test/files/run/t11237.scala b/test/files/run/t11237.scala
@@ -1,4 +1,5 @@
-//> abusing options -Vprint:~uncurry
+// using options -Vprint:~uncurry
+
 trait Semigroup[F] { self =>
   def append(f1: F, f2: => F): F
   val z = 10

Original file line number	Diff line number	Diff line change
`@@ -186,4 +186,7 @@ trait StdAttachments {`
`186`	`186`
`187`	`187`	`/** This Bind tree was derived immediately from the given tree, for unused accounting. */`
`188`	`188`	`case class VarAlias(tree: Tree /Bind \| ValDef/) extends PlainAttachment`
	`189`	`+`
	`190`	`+ /** Do not mangle the arg. It is passed directly in a forwarding application. */`
	`191`	`+ case object PreserveArg extends PlainAttachment`
`189`	`192`	`}`