Remove redundant definesMember check.

[Cherry-picked 5be6fac]
scala · Jun 30, 2024 · 773aac8 · 773aac8
1 parent 3a3a775
commit 773aac8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -905,7 +905,7 @@ class Namer { typer: Typer =>
           ||
           // remove synthetic constructor or method of a java Record if it clashes with a non-synthetic constructor
           (isJavaRecord(denot.owner)
-            && (denot.isConstructor || definesMember)
+            && denot.is(Method)
             && denot.owner.unforcedDecls.lookupAll(denot.name).exists(c => c != denot.symbol && c.info.matches(denot.info))
           )
         )

diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2442,7 +2442,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
     def canBeInvalidated(sym: Symbol): Boolean =
       sym.is(Synthetic)
       && (desugar.isRetractableCaseClassMethodName(sym.name) ||
-         (sym.owner.is(JavaDefined) && sym.owner.derivesFrom(defn.JavaRecordClass)))
+         (sym.owner.is(JavaDefined) && sym.owner.derivesFrom(defn.JavaRecordClass) && sym.is(Method)))
 
     if !sym.info.exists then
       // it's a discarded method (synthetic case class method or synthetic java record constructor or overriden member), drop it