Backport "Fail compilation if multiple conflicting top-level private defs/vals are in the same package" to 3.7 (scala#22932)

Backports scala#22759 to the 3.7.0-RC2.

PR submitted by the release tooling.

Author: WojciechMazur

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

@@ -134,7 +134,7 @@ class Namer { typer: Typer =>
    *  The logic here is very subtle and fragile due to the fact that
    *  we are not allowed to force anything.
    */
-  def checkNoConflict(name: Name, isPrivate: Boolean, span: Span)(using Context): Name =
+  def checkNoConflict(name: Name, span: Span)(using Context): Name =
     val owner = ctx.owner
     var conflictsDetected = false
 
@@ -169,7 +169,7 @@ class Namer { typer: Typer =>
       def preExisting = ctx.effectiveScope.lookup(name)
       if (!owner.isClass || name.isTypeName) && preExisting.exists then
         conflict(preExisting)
-      else if owner.isPackageObject && !isPrivate && name != nme.CONSTRUCTOR then
+      else if owner.isPackageObject && name != nme.CONSTRUCTOR then
         checkNoConflictIn(owner.owner)
         for pkgObj <- pkgObjs(owner.owner) if pkgObj != owner do
           checkNoConflictIn(pkgObj)
@@ -249,7 +249,7 @@ class Namer { typer: Typer =>
         var flags = checkFlags(tree.mods.flags)
         if ctx.settings.YcompileScala2Library.value then
           flags |= Scala2x
-        val name = checkNoConflict(tree.name, flags.is(Private), tree.span).asTypeName
+        val name = checkNoConflict(tree.name, tree.span).asTypeName
         val cls =
           createOrRefine[ClassSymbol](tree, name, flags, ctx.owner,
             cls => adjustIfModule(new ClassCompleter(cls, tree)(ctx), tree),
@@ -258,7 +258,7 @@ class Namer { typer: Typer =>
         cls
       case tree: MemberDef =>
         var flags = checkFlags(tree.mods.flags)
-        val name = checkNoConflict(tree.name, flags.is(Private), tree.span)
+        val name = checkNoConflict(tree.name, tree.span)
         tree match
           case tree: ValOrDefDef =>
             if tree.isInstanceOf[ValDef] && !flags.is(Param) && name.endsWith("_=") then
@@ -1264,7 +1264,7 @@ class Namer { typer: Typer =>
           val hasDefaults = sym.hasDefaultParams // compute here to ensure HasDefaultParams and NoDefaultParams flags are set
           val forwarder =
             if mbr.isType then
-              val forwarderName = checkNoConflict(alias.toTypeName, isPrivate = false, span)
+              val forwarderName = checkNoConflict(alias.toTypeName, span)
               var target = pathType.select(sym)
               if target.typeParams.nonEmpty then
                 target = target.etaExpand
@@ -1320,7 +1320,7 @@ class Namer { typer: Typer =>
                   (EmptyFlags, mbrInfo)
               var mbrFlags = MandatoryExportTermFlags | maybeStable | (sym.flags & RetainedExportTermFlags)
               if pathMethod.exists then mbrFlags |= ExtensionMethod
-              val forwarderName = checkNoConflict(alias, isPrivate = false, span)
+              val forwarderName = checkNoConflict(alias, span)
               newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)
 
           forwarder.info = avoidPrivateLeaks(forwarder)

tests/neg/i22721.check

@@ -0,0 +1,6 @@
+-- [E161] Naming Error: tests/neg/i22721/test2.scala:3:12 --------------------------------------------------------------
+3 |private def foobar: Int = 0 // error
+  |^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |foobar is already defined as method foobar in tests/neg/i22721/test1.scala
+  |
+  |Note that overloaded methods must all be defined in the same group of toplevel definitions

tests/neg/i22721/test1.scala

@@ -0,0 +1,4 @@
+package example
+
+private def foobar: String = "foo"
+object test1 { def x = foobar }

tests/neg/i22721/test2.scala

@@ -0,0 +1,4 @@
+package example
+
+private def foobar: Int = 0 // error
+object test2 { def x = foobar }

tests/neg/toplevel-overload/moredefs_1.scala

@@ -2,4 +2,4 @@ trait B
 
 def f(x: B) = s"B" // error: has already been compiled
 
-private def g(): Unit = () // OK, since it is private
+private def g(): Unit = () // error: has already been compiled (def is visible in package)