Skip to content

Commit 09d4a8c

Browse files
Use symbol.owner
1 parent cf54051 commit 09d4a8c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ class Definitions {
483483
lazy val BoxedFloatModule = ctx.requiredModule("java.lang.Float")
484484
lazy val BoxedDoubleModule = ctx.requiredModule("java.lang.Double")
485485
lazy val BoxedUnitModule = ctx.requiredModule("java.lang.Void")
486-
lazy val SystemModule = ctx.requiredModule("java.lang.System")
487486

488487
lazy val ByNameParamClass2x = enterSpecialPolyClass(tpnme.BYNAME_PARAM_CLASS, Covariant, Seq(AnyType))
489488
lazy val EqualsPatternClass = enterSpecialPolyClass(tpnme.EQUALS_PATTERN, EmptyFlags, Seq(AnyType))
@@ -516,6 +515,9 @@ class Definitions {
516515
lazy val JavaSerializableClass = ctx.requiredClass("java.io.Serializable")
517516
lazy val ComparableClass = ctx.requiredClass("java.lang.Comparable")
518517

518+
lazy val SystemClass = ctx.requiredClass("java.lang.System")
519+
lazy val SystemModule = SystemClass.linkedClass
520+
519521
// in scalac modified to have Any as parent
520522

521523
lazy val SerializableType: TypeRef = ctx.requiredClassRef("scala.Serializable")

compiler/src/dotty/tools/dotc/transform/localopt/Simplify.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ object Simplify {
153153
*/
154154
def isEffectivelyMutable(t: Tree)(implicit ctx: Context): Boolean = t match {
155155
case _ if t.symbol.is(Mutable) => true
156-
case s: Select => (s.symbol == defn.SystemModule)
156+
case s: Select => s.symbol.owner == defn.SystemModule
157157
case i: Ident => desugarIdent(i).exists(isEffectivelyMutable)
158158
case _ => false
159159
}

0 commit comments

Comments
 (0)