Avoid forcing whole package when using -experimental (#20409)

scala · May 16, 2024 · 73bb2aa · 73bb2aa
2 parents 177b489 + c8764ba
commit 73bb2aa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -806,10 +806,11 @@ object Checking {
   def checkAndAdaptExperimentalImports(trees: List[Tree])(using Context): Unit =
     def nonExperimentalTopLevelDefs(pack: Symbol): Iterator[Symbol] =
       def isNonExperimentalTopLevelDefinition(sym: Symbol) =
-        !sym.isExperimental
+        sym.isDefinedInCurrentRun
         && sym.source == ctx.compilationUnit.source
         && !sym.isConstructor // not constructor of package object
         && !sym.is(Package) && !sym.name.isPackageObjectName
+        && !sym.isExperimental
 
       pack.info.decls.toList.iterator.flatMap: sym =>
         if sym.isClass && (sym.is(Package) || sym.isPackageObject) then

diff --git a/sbt-test/java-compat/moduleInfo/A.scala b/sbt-test/java-compat/moduleInfo/A.scala
@@ -0,0 +1,2 @@
+// Previously, we crashed trying to parse module-info.class in the empty package.
+class A
diff --git a/sbt-test/java-compat/moduleInfo/build.sbt b/sbt-test/java-compat/moduleInfo/build.sbt
@@ -0,0 +1,5 @@
+scalaVersion := sys.props("plugin.scalaVersion")
+
+scalacOptions ++= Seq(
+  "-experimental"
+)
diff --git a/sbt-test/java-compat/moduleInfo/test b/sbt-test/java-compat/moduleInfo/test
@@ -0,0 +1 @@
+> compile
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// Previously, we crashed trying to parse module-info.class in the empty package.
		class A