Merge pull request #10524 from lrytz/t12858

lrytz · web-flow · commit 80514f73a6c7 · 2023-09-01T15:48:11.000+02:00
Fix spurious "nullary overrides nilary" warning
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -487,9 +487,9 @@ abstract class RefChecks extends Transform {
                   warnAdaptedNullaryOverride()
               }
               else if (member.paramLists.isEmpty) {
-                // NullaryOverrideAdapted is only added to symbols being compiled, so check for a mismatch
-                // if both symbols are mixed in from the classpath
-                if (!member.isStable && other.paramLists.nonEmpty && !exempted)
+                // Definitions that directly override get a parameter list and a `NullaryOverrideAdapted` attachment
+                // in Namers. Here we also warn when there's a mismatch between two mixed-in members.
+                if (!member.isStable && other.paramLists.nonEmpty && !exempted && !other.overrides.exists(javaDetermined))
                   warnAdaptedNullaryOverride()
               }
               else if (other.paramLists.isEmpty) {
diff --git a/test/files/pos/t12858/A.java b/test/files/pos/t12858/A.java
@@ -0,0 +1,3 @@
+interface A {
+  int f();
+}
diff --git a/test/files/pos/t12858/B.scala b/test/files/pos/t12858/B.scala
@@ -0,0 +1,9 @@
+// scalac: -Werror
+
+trait B1 extends A { def f: Int }
+trait C1 { def f = 2 }
+class T1 extends B1 with C1
+
+trait B2 extends A { def f: Int = 1}
+trait C2 { self: B2 => override def f = 2 }
+class T2 extends B2 with C2

Original file line number	Diff line number	Diff line change
`@@ -487,9 +487,9 @@ abstract class RefChecks extends Transform {`
`487`	`487`	`warnAdaptedNullaryOverride()`
`488`	`488`	`}`
`489`	`489`	`else if (member.paramLists.isEmpty) {`
`490`		`- // NullaryOverrideAdapted is only added to symbols being compiled, so check for a mismatch`
`491`		`- // if both symbols are mixed in from the classpath`
`492`		`- if (!member.isStable && other.paramLists.nonEmpty && !exempted)`
	`490`	+ // Definitions that directly override get a parameter list and a `NullaryOverrideAdapted` attachment
	`491`	`+ // in Namers. Here we also warn when there's a mismatch between two mixed-in members.`
	`492`	`+ if (!member.isStable && other.paramLists.nonEmpty && !exempted && !other.overrides.exists(javaDetermined))`
`493`	`493`	`warnAdaptedNullaryOverride()`
`494`	`494`	`}`
`495`	`495`	`else if (other.paramLists.isEmpty) {`