Skip to content

Commit 2005cd9

Browse files
committed
Fix rebase breakage
1 parent bb88d41 commit 2005cd9

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

compiler/src/dotty/tools/dotc/core/StdNames.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ object StdNames {
3434
final val INTERPRETER_LINE_PREFIX = "line"
3535
final val INTERPRETER_VAR_PREFIX = "res"
3636
final val INTERPRETER_WRAPPER_SUFFIX = "$object"
37-
final val MODULE_INSTANCE_FIELD = NameTransformer.MODULE_INSTANCE_NAME // "MODULE$"
37+
final val MODULE_INSTANCE_FIELD = "MODULE$"
3838

3939
final val Function = "Function"
4040
final val ImplicitFunction = "ImplicitFunction"
@@ -260,7 +260,6 @@ object StdNames {
260260
val REIFY_FREE_THIS_SUFFIX: N = "$this"
261261
val REIFY_FREE_VALUE_SUFFIX: N = "$value"
262262
val REIFY_SYMDEF_PREFIX: N = "symdef$"
263-
val MODULE_INSTANCE_FIELD: N = "MODULE$"
264263
val OUTER: N = "$outer"
265264
val REFINE_CLASS: N = "<refinement>"
266265
val ROOTPKG: N = "_root_"

compiler/src/dotty/tools/dotc/transform/LambdaLift.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform
334334
private def newName(sym: Symbol)(implicit ctx: Context): Name =
335335
if (sym.isAnonymousFunction && sym.owner.is(Method, butNot = Label))
336336
sym.name.rewrite {
337-
case name: SimpleTermName => ExpandPrefixName(sym.owner.name.asTermName, name)
337+
case name: SimpleName => ExpandPrefixName(sym.owner.name.asTermName, name)
338338
}.freshened
339339
else sym.name.freshened
340340

0 commit comments

Comments
 (0)