aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dotty/tools/dotc/Compiler.scala2
-rw-r--r--src/dotty/tools/dotc/transform/ElimWildcardIdents.scala3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/Compiler.scala b/src/dotty/tools/dotc/Compiler.scala
index 0f0da76ee..8b0e08a4c 100644
--- a/src/dotty/tools/dotc/Compiler.scala
+++ b/src/dotty/tools/dotc/Compiler.scala
@@ -71,12 +71,12 @@ class Compiler {
List(new LambdaLift, // in this mini-phase block scopes are incorrect. No phases that rely on scopes should be here
new Flatten,
new ElimStaticThis,
+ new ElimWildcardIdents,
new RestoreScopes),
List(/*new PrivateToStatic,*/
new ExpandPrivate,
new CollectEntryPoints,
new LabelDefs,
- new ElimWildcardIdents,
new TraitConstructors),
List(new GenBCode)
)
diff --git a/src/dotty/tools/dotc/transform/ElimWildcardIdents.scala b/src/dotty/tools/dotc/transform/ElimWildcardIdents.scala
index 29194d235..300f468f6 100644
--- a/src/dotty/tools/dotc/transform/ElimWildcardIdents.scala
+++ b/src/dotty/tools/dotc/transform/ElimWildcardIdents.scala
@@ -29,6 +29,9 @@ class ElimWildcardIdents extends MiniPhaseTransform {
recur(tree)
}
+ override def transformAssign(tree: tpd.Assign)(implicit ctx: Context, info: TransformerInfo): tpd.Tree =
+ cpy.Assign(tree)(tree.lhs, wildcardToDefaultValue(tree.rhs))
+
override def transformValDef(tree: tpd.ValDef)(implicit ctx: Context, info: TransformerInfo): tpd.Tree =
cpy.ValDef(tree)(rhs = wildcardToDefaultValue(tree.rhs))