Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix by-name parameter in beta-reduction #20096

Merged
merged 1 commit into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions compiler/src/dotty/tools/dotc/transform/BetaReduce.scala
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,20 @@ object BetaReduce:
case ref @ TermRef(NoPrefix, _) if isPurePath(arg) =>
ref.symbol
case _ =>
val flags = Synthetic | (param.symbol.flags & Erased)
val tpe =
val isByNameArg = param.tpt.tpe.isInstanceOf[ExprType]
val flags =
if isByNameArg then Synthetic | Method | (param.symbol.flags & Erased)
else Synthetic | (param.symbol.flags & Erased)
val tpe0 =
if arg.tpe.isBottomType then param.tpe.widenTermRefExpr
else if arg.tpe.dealias.isInstanceOf[ConstantType] then arg.tpe.dealias
else arg.tpe.widen
val binding = ValDef(newSymbol(ctx.owner, param.name, flags, tpe, coord = arg.span), arg).withSpan(arg.span)
if !((tpe.isInstanceOf[ConstantType] || tpe.derivesFrom(defn.UnitClass)) && isPureExpr(arg)) then
bindings += binding
binding.symbol
val tpe = if isByNameArg then ExprType(tpe0) else tpe0
val bindingSymbol = newSymbol(ctx.owner, param.name, flags, tpe, coord = arg.span)
val binding = if isByNameArg then DefDef(bindingSymbol, arg) else ValDef(bindingSymbol, arg)
if isByNameArg || !((tpe.isInstanceOf[ConstantType] || tpe.derivesFrom(defn.UnitClass)) && isPureExpr(arg)) then
bindings += binding.withSpan(arg.span)
bindingSymbol

val expansion = TreeTypeMap(
oldOwners = ddef.symbol :: Nil,
Expand Down
2 changes: 2 additions & 0 deletions tests/run/i20095.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
foo
foo
9 changes: 9 additions & 0 deletions tests/run/i20095.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
inline def twice(inline thunk: =>Unit): Unit =
thunk
thunk

inline def pipe(inline t: =>Unit, inline f: (=>Unit) => Unit): Unit = f(t)

@main def Test =
pipe((), twice)
pipe(println("foo"), twice)
Loading