Skip to content

Commit

Permalink
Refactor constant folding of applications
Browse files Browse the repository at this point in the history
Move them in typedApply/typedTypeApply instead of leaving them until adapt.
This aligns these folds with folds of uniary operations, which are done already
in typedSelect and avoids potentially several calls to ConstFold when arguments
are passed to overloaded methods.
  • Loading branch information
odersky committed Apr 5, 2024
1 parent c8c3bde commit 5167ce3
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
6 changes: 4 additions & 2 deletions compiler/src/dotty/tools/dotc/typer/Applications.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1124,12 +1124,13 @@ trait Applications extends Compatibility {
}
app
}
app1 match {
val app2 = app1 match {
case Apply(Block(stats, fn), args) =>
tpd.cpy.Block(app1)(stats, tpd.cpy.Apply(app1)(fn, args))
case _ =>
app1
}
ConstFold(app2)
}

/** Typecheck an Apply node with a typed function and possibly-typed arguments coming from `proto` */
Expand Down Expand Up @@ -1189,7 +1190,8 @@ trait Applications extends Compatibility {
case _ => tree.withType(TryDynamicCallType)
}
if (typedFn.tpe eq TryDynamicCallType) tryDynamicTypeApply()
else assignType(cpy.TypeApply(tree)(typedFn, typedArgs), typedFn, typedArgs)
else
ConstFold(assignType(cpy.TypeApply(tree)(typedFn, typedArgs), typedFn, typedArgs))
}
}

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Typer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4200,7 +4200,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer

def adaptToSubType(wtp: Type): Tree =
// try converting a constant to the target type
ConstFold(tree).tpe.widenTermRefExpr.normalized match
tree.tpe.widenTermRefExpr.normalized match
case ConstantType(x) =>
val converted = x.convertTo(pt)
if converted != null && (converted ne x) then
Expand Down
2 changes: 0 additions & 2 deletions tests/new/test.scala

This file was deleted.

8 changes: 8 additions & 0 deletions tests/pos/constfold.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,12 @@ object Test extends App {
Console.println(A.y);
Console.println(A.z);
Console.println(A.s);

def f(x: 12): Int = 1
def f(x: Int): Double = 2
val x = f(12)
val _: Int = x
val y = f(2 * 6)
val _: Int = x

}

0 comments on commit 5167ce3

Please sign in to comment.