Merge pull request #15631 from dotty-staging/fix-15629

dwijnand · web-flow · commit 1fb83bda632c · 2022-07-11T09:47:33.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -478,7 +478,7 @@ class Namer { typer: Typer =>
           if (child == other)
             annots // can happen if a class has several inaccessible children
           else {
-            assert(childStart != other.span.start, i"duplicate child annotation $child / $other")
+            assert(childStart != other.span.start || child.source != other.source, i"duplicate child annotation $child / $other")
             val (prefix, otherAnnot :: rest) = annots.span(_.symbol != defn.ChildAnnot): @unchecked
             prefix ::: otherAnnot :: insertInto(rest)
           }

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ class Namer { typer: Typer =>`
`478`	`478`	`if (child == other)`
`479`	`479`	`annots // can happen if a class has several inaccessible children`
`480`	`480`	`else {`
`481`		`- assert(childStart != other.span.start, i"duplicate child annotation $child / $other")`
	`481`	`+ assert(childStart != other.span.start \|\| child.source != other.source, i"duplicate child annotation $child / $other")`
`482`	`482`	`val (prefix, otherAnnot :: rest) = annots.span(_.symbol != defn.ChildAnnot): @unchecked`
`483`	`483`	`prefix ::: otherAnnot :: insertInto(rest)`
`484`	`484`	`}`