Merge pull request #13421 from dotty-staging/fix-#13405

Revert "Remove unnecessary type from UnApply"

Author: nicolasstucki

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

@@ -197,9 +197,9 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   def Alternative(trees: List[Tree])(using Context): Alternative =
     ta.assignType(untpd.Alternative(trees), trees)
 
-  def UnApply(fun: Tree, implicits: List[Tree], patterns: List[Tree])(using Context): UnApply = {
+  def UnApply(fun: Tree, implicits: List[Tree], patterns: List[Tree], proto: Type)(using Context): UnApply = {
     assert(fun.isInstanceOf[RefTree] || fun.isInstanceOf[GenericApply])
-    ta.assignType(untpd.UnApply(fun, implicits, patterns), defn.NothingType)
+    ta.assignType(untpd.UnApply(fun, implicits, patterns), proto)
   }
 
   def ValDef(sym: TermSymbol, rhs: LazyTree = EmptyTree)(using Context): ValDef =

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

@@ -538,8 +538,7 @@ class TreePickler(pickler: TastyPickler) {
               writeByte(IMPLICITarg)
               pickleTree(implicitArg)
             }
-            // TODO write a dummy type that takes less space?
-            pickleType(tree.tpe) // IGNORED // TODO remove when we can break TASTy compat.
+            pickleType(tree.tpe)
             patterns.foreach(pickleTree)
           }
         case tree: ValDef =>

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

@@ -1246,9 +1246,9 @@ class TreeUnpickler(reader: TastyReader,
                   readByte()
                   readTerm()
                 }
-              val patType = readType() // IGNORED // TODO remove when we can break TASTy compat.
+              val patType = readType()
               val argPats = until(end)(readTerm())
-              UnApply(fn, implicitArgs, argPats)
+              UnApply(fn, implicitArgs, argPats, patType)
             case REFINEDtpt =>
               val refineCls = symAtAddr.getOrElse(start,
                 newRefinedClassSymbol(coordAt(start))).asClass

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

@@ -1175,7 +1175,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
       case UNAPPLYtree =>
         val fun = readTreeRef()
         val args = until(end, () => readTreeRef())
-        UnApply(fun, Nil, args)
+        UnApply(fun, Nil, args, defn.AnyType) // !!! this is wrong in general
 
       case ARRAYVALUEtree =>
         val elemtpt = readTreeRef()

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

@@ -400,11 +400,8 @@ trait QuotesAndSplices {
    *          },
    *          true, // If there is at least one type splice. Used to instantiate the context with or without GADT constraints
    *          x$2 // tasty.Reflection instance
-   *        ): Expr[S & List[t] @unchecked] => ...
+   *        ) => ...
    *  ```
-   *
-   *  For a scrutinee of type `S`, the `: Expr[S & List[t] @unchecked]` tells the pattern that if the pattern matched the bound
-   *  scrutinee `x @ '{..}` is of type `Expr[S & List[t] @unchecked]`.
    */
   private def typedQuotePattern(tree: untpd.Quote, pt: Type, qctx: Tree)(using Context): Tree = {
     if tree.quoted.isTerm && !pt.derivesFrom(defn.QuotedExprClass) then
@@ -472,12 +469,10 @@ trait QuotesAndSplices {
     val matchModule = if tree.quoted.isTerm then defn.QuoteMatching_ExprMatch else defn.QuoteMatching_TypeMatch
     val unapplyFun = qctx.asInstance(defn.QuoteMatchingClass.typeRef).select(matchModule).select(nme.unapply)
 
-    Typed(
-      UnApply(
-        fun = unapplyFun.appliedToTypeTrees(typeBindingsTuple :: TypeTree(patType) :: Nil),
-        implicits = quotedPattern :: Nil,
-        patterns = splicePat :: Nil),
-      TypeTree(quoteClass.typeRef.appliedTo(replaceBindings(quoted1.tpe) & quotedPt))
-    ).annotated(New(defn.UncheckedAnnot.typeRef, Nil))
+    UnApply(
+      fun = unapplyFun.appliedToTypeTrees(typeBindingsTuple :: TypeTree(patType) :: Nil),
+      implicits = quotedPattern :: Nil,
+      patterns = splicePat :: Nil,
+      proto = quoteClass.typeRef.appliedTo(replaceBindings(quoted1.tpe) & quotedPt))
   }
 }

compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

@@ -1484,7 +1484,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object Unapply extends UnapplyModule:
       def apply(fun: Term, implicits: List[Term], patterns: List[Tree]): Unapply =
-        withDefaultPos(tpd.UnApply(fun, implicits, patterns))
+        withDefaultPos(tpd.UnApply(fun, implicits, patterns, dotc.core.Symbols.defn.NothingType))
       def copy(original: Tree)(fun: Term, implicits: List[Term], patterns: List[Tree]): Unapply =
         withDefaultPos(tpd.cpy.UnApply(original)(fun, implicits, patterns))
       def unapply(x: Unapply): (Term, List[Term], List[Tree]) =

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

@@ -29,6 +29,7 @@ class BootstrappedOnlyCompilationTests {
       compileFilesInDir("tests/pos-custom-args/semanticdb", defaultOptions.and("-Xsemanticdb")),
       compileDir("tests/pos-special/i7592", defaultOptions.and("-Yretain-trees")),
       compileDir("tests/pos-special/i11331.1", defaultOptions),
+      compileDir("tests/pos-custom-args/i13405", defaultOptions.and("-Xfatal-warnings")),
     ).checkCompile()
   }
 

tests/pos-custom-args/i13405/Macro.scala

@@ -0,0 +1,12 @@
+import scala.quoted.*
+
+sealed class Foo()
+inline def hh(): Unit = ${ interpMacro() }
+
+private def interpMacro()(using Quotes): Expr[Unit] =
+  import quotes.reflect.*
+  '{
+    val res: Either[String, (Foo, Foo)] =
+      Right((new Foo, new Foo))
+    val (a, b) = res.toOption.get
+  }

tests/pos-custom-args/i13405/Test.scala

@@ -0,0 +1 @@
+@main def main: Unit = hh()