Merge pull request #10926 from dotty-staging/fix-#10866

Don't generate case class method if it clashes with inherited concret…

Author: odersky

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

@@ -766,23 +766,33 @@ class Namer { typer: Typer =>
      *  `denot` is a compiler generated case class method that clashes
      *  with a user-defined method in the same scope with a matching type.
      */
-    private def invalidateIfClashingSynthetic(denot: SymDenotation): Unit = {
-      def isCaseClass(owner: Symbol) =
+    private def invalidateIfClashingSynthetic(denot: SymDenotation): Unit =
+
+      def isCaseClassOrCompanion(owner: Symbol) =
         owner.isClass && {
           if (owner.is(Module)) owner.linkedClass.is(CaseClass)
           else owner.is(CaseClass)
         }
-      val isClashingSynthetic =
-        denot.is(Synthetic) &&
-        desugar.isRetractableCaseClassMethodName(denot.name) &&
-        isCaseClass(denot.owner) &&
+
+      def definesMember =
         denot.owner.info.decls.lookupAll(denot.name).exists(alt =>
           alt != denot.symbol && alt.info.matchesLoosely(denot.info))
-      if (isClashingSynthetic) {
+
+      def inheritsConcreteMember =
+        denot.owner.asClass.classParents.exists(parent =>
+          parent.member(denot.name).hasAltWith(sd =>
+            !sd.symbol.is(Deferred) && sd.matches(denot)))
+
+      val isClashingSynthetic =
+        denot.is(Synthetic, butNot = ConstructorProxy)
+        && desugar.isRetractableCaseClassMethodName(denot.name)
+        && isCaseClassOrCompanion(denot.owner)
+        && (definesMember || inheritsConcreteMember)
+
+      if isClashingSynthetic then
         typr.println(i"invalidating clashing $denot in ${denot.owner}")
         denot.markAbsent()
-      }
-    }
+    end invalidateIfClashingSynthetic
 
     /** If completed symbol is an enum value or a named class, register it as a child
      *  in all direct parent classes which are sealed.

tests/neg/i4564a.scala

@@ -1,6 +1,5 @@
-
-class BaseCP[T] {
-  def apply(x: T): ClashPoly = if (???) ClashPoly(1) else ???
+abstract class BaseCP[T] {
+  def apply(x: T): ClashPoly
 }
-object ClashPoly extends BaseCP[Int]
+object ClashPoly extends BaseCP[Int] // error: object creation impossible
 case class ClashPoly private(x: Int) // error: private method apply cannot override method apply in class BaseCP

tests/run/i10866.scala

@@ -0,0 +1,14 @@
+abstract class B{
+  def unapply(arg:A)={println ("Unapply from B"); true}
+}
+
+case class A()
+
+object A extends B
+
+object Test extends App {
+  println("Test")
+  A() match {
+    case A() => println("done")
+  }
+}