NotificationsYou must be signed in to change notification settings
Fork3.1k
Star14.4k

Commit9cc281e

committed

Notice args of forwarder when generating it

1 parent5381be8 commit9cc281eCopy full SHA for 9cc281e

File tree

5 files changed

+18

-12

lines changed

src
- compiler/scala/tools/nsc
  - ast
    - TreeGen.scala
  - transform
    - UnCurry.scala
- reflect/scala/reflect
  - internal
    - StdAttachments.scala
  - runtime
    - JavaUniverseForce.scala
test/files/run
- t11237.scala

5 files changed

+18

-12

lines changed

`‎src/compiler/scala/tools/nsc/ast/TreeGen.scala`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,16 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {`
`327`	`327`	`enclosingStaticModules.foldLeft(tree)((tree, moduleClass)=> tree.substituteThis(moduleClass, gen.mkAttributedIdent(moduleClass.sourceModule)) )`
`328`	`328`	`}`
`329`	`329`
`330`		`- newDefDef(methSym, substThisForModule(moveToMethod(useMethodParams(fun.body))))(tpt=TypeTree(resTp))`
	`330`	`+valbody= useMethodParams(fun.body)`
	`331`	`+if (methParamSyms.exists(p=> isByNameParamType(p.info))) {`
	`332`	`+valbynames= methParamSyms.zip(fun.vparams).collect {case (mp, vp)if isByNameParamType(mp.info)!= isByNameParamType(vp.tpt.tpe)=> mp }`
	`333`	`+if (bynames.nonEmpty)`
	`334`	`+ body.foreach {`
	`335`	`+case t@Ident(_)if bynames.contains(t.symbol)=> t.updateAttachment(PreserveArg)`
	`336`	`+case _=>`
	`337`	`+ }`
	`338`	`+ }`
	`339`	`+ newDefDef(methSym, substThisForModule(moveToMethod(body)))(tpt=TypeTree(resTp))`
`331`	`340`	`}`
`332`	`341`
`333`	`342`	`/**`

`‎src/compiler/scala/tools/nsc/transform/UnCurry.scala`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -246,14 +246,6 @@ abstract class UnCurry extends InfoTransform`
`246`	`246`	`else typeNewFunmatch {`
`247`	`247`	`case typedNewFun@Block(stats,expr:Function)=>`
`248`	`248`	`valexpansion= gen.expandFunction(localTyper)(expr, inConstructorFlag)`
`249`		`- expansionmatch {`
`250`		`-caseBlock(ClassDef(_, _, _,Template(_, _, body))::Nil, _)=>`
`251`		`- body.lastmatch {`
`252`		`-caseDefDef(_, _, _, _, _,Apply(_, args))=> noApply.addAll(args)// samDef args are pass-thru`
`253`		`-case _=>`
`254`		`- }`
`255`		`-case _=>`
`256`		`- }`
`257`	`249`	`treeCopy.Block(typedNewFun, stats, expansion)`
`258`	`250`	`case x=>thrownewMatchError(x)`
`259`	`251`	`}`
`@@ -467,7 +459,7 @@ abstract class UnCurry extends InfoTransform`
`467`	`459`	`else translateSynchronized(tree)match {`
`468`	`460`	`case dd@DefDef(mods, name, tparams, _, tpt, rhs)=>`
`469`	`461`	`// Remove default argument trees from parameter ValDefs, scala/bug#4812`
`470`		`-valvparamssNoRhs= dd.vparamssmapConserve (_mapConserve {p=>`
	`462`	`+valvparamssNoRhs= dd.vparamss.mapConserve(_.mapConserve {p=>`
`471`	`463`	`treeCopy.ValDef(p, p.mods, p.name, p.tpt,EmptyTree)`
`472`	`464`	`})`
`473`	`465`
`@@ -558,7 +550,7 @@ abstract class UnCurry extends InfoTransform`
`558`	`550`	`if (isByNameRef(tree1)) {`
`559`	`551`	`valtree2= tree1 setType functionType(Nil, tree1.tpe)`
`560`	`552`	`return {`
`561`		`-if (noApplycontainstree2) tree2`
	`553`	`+if (tree.attachments.contains[PreserveArg.type]\|\| noApply.contains(tree2)) tree2`
`562`	`554`	`else localTyper.typedPos(tree1.pos)(Apply(Select(tree2, nme.apply),Nil))`
`563`	`555`	`}`
`564`	`556`	`}`

`‎src/reflect/scala/reflect/internal/StdAttachments.scala`

Lines changed: 3 additions & 0 deletions

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`	`caseclassVarAlias(tree:Tree/Bind \| ValDef/)extendsPlainAttachment`
	`189`	`+`
	`190`	`+/** Do not mangle the arg. It is passed directly in a forwarding application.*/`
	`191`	`+caseobjectPreserveArgextendsPlainAttachment`
`189`	`192`	`}`

`‎src/reflect/scala/reflect/runtime/JavaUniverseForce.scala`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ trait JavaUniverseForce { self: runtime.JavaUniverse =>`
`92`	`92`	`this.DiscardedExpr`
`93`	`93`	`this.BooleanParameterType`
`94`	`94`	`this.VarAlias`
	`95`	`+this.PreserveArg`
`95`	`96`	`this.noPrint`
`96`	`97`	`this.typeDebug`
`97`	`98`	`// inaccessible: this.posAssigner`

`‎test/files/run/t11237.scala`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-//> abusing options -Vprint:~uncurry`
	`1`	`+// using options -Vprint:~uncurry`
	`2`	`+`
`2`	`3`	`traitSemigroup[F] { self=>`
`3`	`4`	`defappend(f1:F,f2:=>F):F`
`4`	`5`	`valz=10`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9cc281e

File tree

5 files changed

5 files changed

`‎src/compiler/scala/tools/nsc/ast/TreeGen.scala`

`‎src/compiler/scala/tools/nsc/transform/UnCurry.scala`

`‎src/reflect/scala/reflect/internal/StdAttachments.scala`

`‎src/reflect/scala/reflect/runtime/JavaUniverseForce.scala`

`‎test/files/run/t11237.scala`

0 commit comments