Skip to content

Commit 0899b4b

Browse files
yilinweiWojciechMazur
authored andcommitted
Remove redundant definesMember check.
[Cherry-picked 5be6fac]
1 parent 551816b commit 0899b4b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

compiler/src/dotty/tools/dotc/typer/Namer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ class Namer { typer: Typer =>
905905
||
906906
// remove synthetic constructor or method of a java Record if it clashes with a non-synthetic constructor
907907
(isJavaRecord(denot.owner)
908-
&& (denot.isConstructor || definesMember)
908+
&& denot.is(Method)
909909
&& denot.owner.unforcedDecls.lookupAll(denot.name).exists(c => c != denot.symbol && c.info.matches(denot.info))
910910
)
911911
)

compiler/src/dotty/tools/dotc/typer/Typer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2442,7 +2442,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
24422442
def canBeInvalidated(sym: Symbol): Boolean =
24432443
sym.is(Synthetic)
24442444
&& (desugar.isRetractableCaseClassMethodName(sym.name) ||
2445-
(sym.owner.is(JavaDefined) && sym.owner.derivesFrom(defn.JavaRecordClass)))
2445+
(sym.owner.is(JavaDefined) && sym.owner.derivesFrom(defn.JavaRecordClass) && sym.is(Method)))
24462446

24472447
if !sym.info.exists then
24482448
// it's a discarded method (synthetic case class method or synthetic java record constructor or overriden member), drop it

0 commit comments

Comments
 (0)