Fix handling of top level Type.Underlying references

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

@@ -77,7 +77,6 @@ class ReifyQuotes extends MacroTransform {
       case tree: RefTree if !Inliner.inInlineMethod =>
         assert(!tree.symbol.isQuote)
         assert(!tree.symbol.isExprSplice)
-        assert(!tree.symbol.isTypeSplice)
       case _ : TypeDef =>
         assert(!tree.symbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot),
           s"${tree.symbol} should have been removed by PickledQuotes because it has a @quoteTypeTag")
@@ -210,16 +209,15 @@ class ReifyQuotes extends MacroTransform {
      *  are in the body of an inline method.
      */
      protected def transformSpliceType(body: Tree, splice: Select)(using Context): Tree =
-      if (level > 1) {
+      if level > 1 then
         val body1 = nested(isQuote = false).transform(body)(using spliceContext)
         cpy.Select(splice)(body1, splice.name)
-      }
-      else {
-        assert(level == 1, "unexpected top splice outside quote")
+      else if level == 1 then
         val (body1, quotes) = nested(isQuote = false).splitSplice(body)(using spliceContext)
         val tpe = outer.embedded.getHoleType(body, splice)
         makeHole(splice.isTerm, body1, quotes, tpe).withSpan(splice.span)
-      }
+      else
+        splice
 
     /** Transforms the contents of a nested splice
      *  Assuming

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

@@ -180,9 +180,8 @@ trait QuotesAndSplices {
     else
       val tree1 = typedSelect(untpd.Select(tree.expr, tpnme.Underlying), pt)(using spliceContext).withSpan(tree.span)
       val msg = em"Consider using canonical type reference ${tree1.tpe} instead"
-      // if sourceVersion.isAtLeast(`3.1-migration`) then
-      report.error(msg, tree.srcPos)
-      // else report.warning(msg, tree.srcPos)
+      if sourceVersion.isAtLeast(`3.1-migration`) then report.error(msg, tree.srcPos)
+      else report.warning(msg, tree.srcPos)
       tree1
   }
 

tests/neg-macros/i4774b.scala renamed to tests/pos-macros/i4774b.scala

@@ -4,7 +4,7 @@ import scala.quoted._
 object Test {
   def loop[T](x: Expr[T])(implicit t: Type[T], qctx: QuoteContext): Expr[T] = '{
     val y: t.Underlying = $x;
-    ${loop[t.Underlying]( // error
+    ${loop[t.Underlying](
       'y
     )}
   }