Exclude some explicit nulls negs tests under tasty

Author: HarrisL2

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -914,6 +914,12 @@ class TreeUnpickler(reader: TastyReader,
 
       def ta = ctx.typeAssigner
 
+      // If explicit nulls is enabled, and the source file did not have explicit
+      // nulls enabled, nullify the member to allow for compatibility.
+      def nullify(sym: Symbol) =
+        if (ctx.explicitNulls && !explicitNulls) then
+          sym.info = ImplicitNullInterop.nullifyMember(sym, sym.info, sym.is(Enum))
+
       val name = readName()
       pickling.println(s"reading def of $name at $start")
       val tree: MemberDef = tag match {
@@ -930,10 +936,12 @@ class TreeUnpickler(reader: TastyReader,
             else
               tpt.tpe
           sym.info = methodType(paramss, resType)
+          nullify(sym)
           DefDef(paramDefss, tpt)
         case VALDEF =>
           val tpt = readTpt()(using localCtx)
           sym.info = tpt.tpe
+          nullify(sym)
           ValDef(tpt)
         case TYPEDEF | TYPEPARAM =>
           if (sym.isClass) {
@@ -971,6 +979,9 @@ class TreeUnpickler(reader: TastyReader,
               sym.typeRef.recomputeDenot() // make sure we see the new bounds from now on
             else
               sym.info = info
+              if (tag == TYPEPARAM) {
+                nullify(sym)
+              }
 
             sym.resetFlag(Provisional)
             TypeDef(rhs)
@@ -979,13 +990,10 @@ class TreeUnpickler(reader: TastyReader,
           val tpt = readTpt()(using localCtx)
           assert(nothingButMods(end))
           sym.info = tpt.tpe
+          nullify(sym)
           ValDef(tpt)
       }
 
-      // If explicit nulls is enabled, and the source file did not have explicit
-      // nulls enabled, nullify the member to allow for compatibility.
-      if (ctx.explicitNulls && !explicitNulls) then
-        sym.info = ImplicitNullInterop.nullifyMember(sym, sym.info, sym.is(Enum))
 
       goto(end)
       setSpan(start, tree)

compiler/test/dotc/neg-explicit-nulls-scala2-library-tasty.excludelist

@@ -0,0 +1,18 @@
+byname-nullables.scala                # identity() flexified
+varargs.scala                         # Array type flexified
+flow-conservative.scala               # .length flexified
+nn-basic.scala                        # .length flexified but trim rejected
+i21380c.scala                         # .length flexified but replaceAll rejected
+unsafe-scope.scala                    # .length flexified
+i17467.scala                          # Singleton type flexified
+i7883.scala                           # Unsure
+from-nullable.scala                   # Option argument flexified
+flow-in-block.scala                   # .length flexified
+array.scala                           # Type arugment of Array flexified
+flow-forward-ref.scala                # .length flexified, forward reference error
+flow-implicitly.scala                 # Singleton type flexified
+nn.scala                              # Flexified elided error [!]
+flow-basic.scala                      # .length flexified
+
+unsafe-cast.scala           # Array type flexified
+unsafe-extensions.scala     # Function arguments flexified

compiler/test/dotty/tools/TestSources.scala

@@ -48,13 +48,18 @@ object TestSources {
 
   def negScala2LibraryTastyExcludelistFile: String = "compiler/test/dotc/neg-scala2-library-tasty.excludelist"
   def negInitGlobalScala2LibraryTastyExcludelistFile: String = "compiler/test/dotc/neg-init-global-scala2-library-tasty.excludelist"
+  def negExplicitNullsScala2LibraryTastyExcludelistFile: String = "compiler/test/dotc/neg-explicit-nulls-scala2-library-tasty.excludelist"
 
   def negScala2LibraryTastyExcludelisted: List[String] =
     if Properties.usingScalaLibraryTasty then loadList(negScala2LibraryTastyExcludelistFile)
     else Nil
   def negInitGlobalScala2LibraryTastyExcludelisted: List[String] =
     if Properties.usingScalaLibraryTasty then loadList(negInitGlobalScala2LibraryTastyExcludelistFile)
     else Nil
+  def negExplicitNullsScala2LibraryTastyExcludelisted: List[String] =
+    if Properties.usingScalaLibraryTasty then loadList(negExplicitNullsScala2LibraryTastyExcludelistFile)
+    else Nil
+
 
   // patmat tests lists
 

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

@@ -201,9 +201,9 @@ class CompilationTests {
   @Test def explicitNullsNeg: Unit = {
     implicit val testGroup: TestGroup = TestGroup("explicitNullsNeg")
     aggregateTests(
-      compileFilesInDir("tests/explicit-nulls/neg", explicitNullsOptions),
+      compileFilesInDir("tests/explicit-nulls/neg", explicitNullsOptions, FileFilter.exclude(TestSources.negExplicitNullsScala2LibraryTastyExcludelisted)),
       compileFilesInDir("tests/explicit-nulls/flexible-types-common", explicitNullsOptions and "-Yno-flexible-types"),
-      compileFilesInDir("tests/explicit-nulls/unsafe-common", explicitNullsOptions and "-Yno-flexible-types"),
+      compileFilesInDir("tests/explicit-nulls/unsafe-common", explicitNullsOptions and "-Yno-flexible-types", FileFilter.exclude(TestSources.negExplicitNullsScala2LibraryTastyExcludelisted)),
     )
   }.checkExpectedErrors()