Merge pull request scala#5960 from lrytz/t10389

User-defined case companion apply: unlink default getters

Author: lrytz

src/compiler/scala/tools/nsc/typechecker/Namers.scala

@@ -678,7 +678,14 @@ trait Namers extends MethodSynthesis {
             // which could upset other code paths)
             if (!scopePartiallyCompleted)
               companionContext.scope.unlink(sym)
+
+            for (a <- sym.attachments.get[CaseApplyDefaultGetters]; defaultGetter <- a.defaultGetters) {
+              companionContext.unit.synthetics -= defaultGetter
+              companionContext.scope.unlink(defaultGetter)
+            }
           }
+
+          sym.removeAttachment[CaseApplyDefaultGetters] // no longer needed once the completer is done
         }
       }
 
@@ -1544,6 +1551,14 @@ trait Namers extends MethodSynthesis {
             if (!isConstr)
               methOwner.resetFlag(INTERFACE) // there's a concrete member now
             val default = parentNamer.enterSyntheticSym(defaultTree)
+            if (meth.name == nme.apply && meth.hasAllFlags(CASE | SYNTHETIC)) {
+              val att = meth.attachments.get[CaseApplyDefaultGetters].getOrElse({
+                val a = new CaseApplyDefaultGetters()
+                meth.updateAttachment(a)
+                a
+              })
+              att.defaultGetters += default
+            }
             if (default.owner.isTerm)
               saveDefaultGetter(meth, default)
           }

src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala

@@ -29,6 +29,13 @@ trait NamesDefaults { self: Analyzer =>
   // as an attachment in the companion module symbol
   class ConstructorDefaultsAttachment(val classWithDefault: ClassDef, var companionModuleClassNamer: Namer)
 
+  // Attached to the synthetic companion `apply` method symbol generated for case classes, holds
+  // the set contains all default getters for that method. If the synthetic `apply` is unlinked in
+  // its completer because there's a user-defined matching method (PR #5730), we have to unlink the
+  // default getters as well. For cleanliness, the attachment is removed at the end of the completer
+  // of the synthetic `apply`, as it's no longer needed.
+  class CaseApplyDefaultGetters(val defaultGetters: mutable.Set[Symbol] = mutable.Set.empty)
+
   // To attach the default getters of local (term-owned) methods to the method symbol.
   // Used in Namer.enterExistingSym: it needs to re-enter the method symbol and also
   // default getters, which could not be found otherwise.

test/files/run/t10389.scala

@@ -0,0 +1,8 @@
+case class C(x: Int = 1)
+object C {
+  def apply(x: Int = 2) = new C(x)
+}
+object Test extends App {
+  assert(new C().x == 1)
+  assert(C().x == 2)
+}