Merge pull request #13719 from dotty-staging/toplevel-export-cycle

Avoid cycle with top-level export and trait
scala · Oct 8, 2021 · 97c772b · 97c772b
2 parents 1cffaa4 + 37d6d1e
commit 97c772b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2546,6 +2546,10 @@ class Typer extends Namer
     pid1 match
       case pid1: RefTree if pkg.is(Package) =>
         inContext(ctx.packageContext(tree, pkg)) {
+          // If it exists, complete the class containing the top-level definitions
+          // before typing any statement in the package to avoid cycles as in i13669.scala
+          val topLevelClassName = desugar.packageObjectName(ctx.source).moduleClassName
+          pkg.moduleClass.info.decls.lookup(topLevelClassName).ensureCompleted()
           var stats1 = typedStats(tree.stats, pkg.moduleClass)._1
           if (!ctx.isAfterTyper)
             stats1 = stats1 ++ typedBlockStats(MainProxies.mainProxies(stats1))._1

diff --git a/tests/pos/i13669.scala b/tests/pos/i13669.scala
@@ -0,0 +1,6 @@
+trait MyExtensions:
+  extension (lhs: Int) def bash: Unit = {}
+object MyExtensions extends MyExtensions
+
+export MyExtensions.*
+val fails = 1.bash