Reorganize tests

Author: EnzeXing

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -171,7 +171,7 @@ class Compiler {
     val rctx =
       if ctx.settings.Xsemanticdb.value then
         ctx.addMode(Mode.ReadPositions)
-      else if !ctx.settings.YcheckInitGlobal.isDefault then
+      else if ctx.settings.YcheckInitGlobal.value then
         ctx.addMode(Mode.ReadPositions)
       else
         ctx

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -446,7 +446,7 @@ private sealed trait YSettings:
   val YnoKindPolymorphism: Setting[Boolean] = BooleanSetting(ForkSetting, "Yno-kind-polymorphism", "Disable kind polymorphism.")
   val YexplicitNulls: Setting[Boolean] = BooleanSetting(ForkSetting, "Yexplicit-nulls", "Make reference types non-nullable. Nullable types can be expressed with unions: e.g. String|Null.")
   val YnoFlexibleTypes: Setting[Boolean] = BooleanSetting(ForkSetting, "Yno-flexible-types", "Disable turning nullable Java return types and parameter types into flexible types, which behave like abstract types with a nullable lower bound and non-nullable upper bound.")
-  val YcheckInitGlobal: Setting[String] = ChoiceSetting(ForkSetting, "Ysafe-init-global", "[report-unknown, ignore-unknown]", "Check safe initialization of global objects.", List("report-unknown", "ignore-unknown", "off"), "off")
+  val YcheckInitGlobal: Setting[Boolean] = BooleanSetting(ForkSetting, "Ysafe-init-global", "Check safe initialization of global objects.")
   val YrequireTargetName: Setting[Boolean] = BooleanSetting(ForkSetting, "Yrequire-targetName", "Warn if an operator is defined without a @targetName annotation.")
   val YrecheckTest: Setting[Boolean] = BooleanSetting(ForkSetting, "Yrecheck-test", "Run basic rechecking (internal test only).")
   val YccDebug: Setting[Boolean] = BooleanSetting(ForkSetting, "Ycc-debug", "Used in conjunction with captureChecking language import, debug info for captured references.")

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -85,7 +85,7 @@ object Symbols extends SymUtils {
       denot.owner.isTerm ||                // no risk of leaking memory after a run for these
       denot.isOneOf(InlineOrProxy) ||      // need to keep inline info
       ctx.settings.Whas.checkInit ||       // initialization check
-      !ctx.settings.YcheckInitGlobal.isDefault
+      ctx.settings.YcheckInitGlobal.value
 
     /** The last denotation of this symbol */
     private var lastDenot: SymDenotation = uninitialized

compiler/src/dotty/tools/dotc/transform/init/Checker.scala

@@ -29,7 +29,7 @@ class Checker extends Phase:
   override val runsAfter = Set(Pickler.name)
 
   override def isEnabled(using Context): Boolean =
-    super.isEnabled && (ctx.settings.Whas.checkInit || !ctx.settings.YcheckInitGlobal.isDefault)
+    super.isEnabled && (ctx.settings.Whas.checkInit || ctx.settings.YcheckInitGlobal.value)
 
   def traverse(traverser: InitTreeTraverser)(using Context): Boolean = monitor(phaseName):
     val unit = ctx.compilationUnit
@@ -53,7 +53,7 @@ class Checker extends Phase:
       if ctx.settings.Whas.checkInit then
         Semantic.checkClasses(classes)(using checkCtx)
 
-      if !ctx.settings.YcheckInitGlobal.isDefault then
+      if ctx.settings.YcheckInitGlobal.value then
         val obj = new Objects
         obj.checkClasses(classes)(using checkCtx)
     }

compiler/src/dotty/tools/dotc/transform/init/Objects.scala

@@ -747,8 +747,8 @@ class Objects(using Context @constructorOnly):
 
   /** Check if the checker option reports warnings about unknown code
    */
-  def reportUnknown(using context: Context): Boolean =
-    context.settings.YcheckInitGlobal.value == "report-unknown"
+  val reportUnknown: Boolean = false
+
 
   /** Handle method calls `e.m(args)`.
    *
@@ -967,7 +967,10 @@ class Objects(using Context @constructorOnly):
         UnknownValue
 
     case v @ SafeValue(_) =>
-      report.warning("[Internal error] Unexpected selection on safe value " + v.show + ", field = " + field.show + Trace.show, Trace.position)
+      if v.typeSymbol != defn.NullClass then
+        // selection on Null is sensible on AST level; no warning for it
+        report.warning("[Internal error] Unexpected selection on safe value " + v.show + ", field = " + field.show + ". " + Trace.show, Trace.position)
+      end if
       Bottom
 
     case Package(packageSym) =>

compiler/test/dotc/neg-init-global-scala2-library-tasty.excludelist

@@ -1,9 +1,6 @@
 ## See #18882
 patmat.scala
 t9312.scala
-unapplySeq-implicit-arg.scala
-unapplySeq-implicit-arg2.scala
-unapplySeq-implicit-arg3.scala
 ScalaCheck.scala
 mutable-read8.scala
 TypeCast.scala

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -231,8 +231,12 @@ class CompilationTests {
   // initialization tests
   @Test def checkInitGlobal: Unit = {
     implicit val testGroup: TestGroup = TestGroup("checkInitGlobal")
-    compileFilesInDir("tests/init-global/warn", defaultOptions.and("-Ysafe-init-global:ignore-unknown"), FileFilter.exclude(TestSources.negInitGlobalScala2LibraryTastyExcludelisted)).checkWarnings()
-    compileFilesInDir("tests/init-global/pos", defaultOptions.and("-Ysafe-init-global:ignore-unknown", "-Xfatal-warnings"), FileFilter.exclude(TestSources.posInitGlobalScala2LibraryTastyExcludelisted)).checkCompile()
+    compileFilesInDir("tests/init-global/warn", defaultOptions.and("-Ysafe-init-global"), FileFilter.exclude(TestSources.negInitGlobalScala2LibraryTastyExcludelisted)).checkWarnings()
+    compileFilesInDir("tests/init-global/pos", defaultOptions.and("-Ysafe-init-global", "-Xfatal-warnings"), FileFilter.exclude(TestSources.posInitGlobalScala2LibraryTastyExcludelisted)).checkCompile()
+    if Properties.usingScalaLibraryTasty then
+      compileFilesInDir("tests/init-global/warn-tasty", defaultOptions.and("-Ysafe-init-global"), FileFilter.exclude(TestSources.negInitGlobalScala2LibraryTastyExcludelisted)).checkWarnings()
+      compileFilesInDir("tests/init-global/pos-tasty", defaultOptions.and("-Ysafe-init-global", "-Xfatal-warnings"), FileFilter.exclude(TestSources.posInitGlobalScala2LibraryTastyExcludelisted)).checkCompile()
+    end if
   }
 
   // initialization tests

tests/init-global/pos-tasty/simple.scala

@@ -0,0 +1,3 @@
+object O:
+  val a: Int = 5
+  val b = a.toDouble

tests/init-global/pos/arithmetic.scala

@@ -0,0 +1,3 @@
+object A:
+  val a = f(10)
+  def f(x: Int) = x * 2 + 5