Merge pull request #9443 from dotty-staging/fix-#9321

Fix #9321: Make not-null detection more robust

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

@@ -907,7 +907,11 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
     def unapply(tree: tpd.TypeApply)(using Context): Option[tpd.Tree] = tree match
       case TypeApply(Select(qual: RefTree, nme.asInstanceOfPM), arg :: Nil) =>
         arg.tpe match
-          case AndType(ref, _) if qual.tpe eq ref => Some(qual)
+          case AndType(ref, nn1) if qual.tpe eq ref =>
+            qual.tpe.widen match
+              case OrNull(nn2) if nn1 eq nn2 =>
+              	Some(qual)
+              case _ => None
           case _ => None
       case _ => None
   end AssertNotNull

compiler/src/dotty/tools/dotc/typer/Nullables.scala

@@ -480,10 +480,12 @@ object Nullables:
       if mt.paramInfos.exists(_.isInstanceOf[ExprType]) && !fn.symbol.is(Inline) =>
         app match
           case Apply(fn, args) =>
-            val dropNotNull = new TreeMap:
+            object dropNotNull extends TreeMap:
+              var dropped: Boolean = false
               override def transform(t: Tree)(using Context) = t match
                 case AssertNotNull(t0) if t0.symbol.is(Mutable) =>
                   nullables.println(i"dropping $t")
+                  dropped = true
                   transform(t0)
                 case t: ValDef if !t.symbol.is(Lazy) => super.transform(t)
                 case t: MemberDef =>
@@ -502,7 +504,7 @@ object Nullables:
             def postProcess(formal: Type, arg: Tree): Tree =
               val nestedCtx = ctx.fresh.setNewTyperState()
               val arg1 = dropNotNull.transform(arg)(using nestedCtx)
-              if arg1 eq arg then arg
+              if !dropNotNull.dropped then arg
               else
                 val arg2 = retyper.typed(arg1, formal)(using nestedCtx)
                 if nestedCtx.reporter.hasErrors || !(arg2.tpe <:< formal) then

tests/pos-macros/i9321/macros.scala

@@ -0,0 +1,16 @@
+import scala.quoted._
+
+type Foo
+type F[X]
+def varargsFunc(funcs0: Foo*) = ???
+
+inline def mcr1: F[String] = ${ mcr1Impl }
+def mcr1Impl(using QuoteContext): Expr[F[String]] = '{???}
+
+inline def mcr2: Unit = ${mcr2Impl}
+def mcr2Impl(using ctx: QuoteContext): Expr[Unit] =
+  val func: Expr[Seq[Foo] => Unit] =
+    '{ (esx: Seq[Foo]) => varargsFunc(esx: _*) }
+  val trees: Expr[Seq[Foo]] =
+    '{Nil}
+  Expr.betaReduce('{$func($trees)})

tests/pos-macros/i9321/test.scala

@@ -0,0 +1,5 @@
+def f(x: => Any) = ???
+def g = f {
+  mcr1
+  mcr2
+}