From 42adf2f9e60dd0b6d42655ba0f155438610cf492 Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Tue, 30 May 2023 10:00:08 +0200
Subject: [PATCH] Dealias types in New before matching quotes

Fixes #17606
---
 .../scala/quoted/runtime/impl/QuoteMatcher.scala   |  2 +-
 tests/pos-macros/i17606/Macros_1.scala             | 14 ++++++++++++++
 tests/pos-macros/i17606/Test_2.scala               |  8 ++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tests/pos-macros/i17606/Macros_1.scala
 create mode 100644 tests/pos-macros/i17606/Test_2.scala

diff --git a/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala b/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala
index 5477628a30a3..bfa4c1c6d1f2 100644
--- a/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala
+++ b/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala
@@ -301,7 +301,7 @@ object QuoteMatcher {
             /* Match new */
             case New(tpt1) =>
               pattern match
-                case New(tpt2) if tpt1.tpe.typeSymbol == tpt2.tpe.typeSymbol => matched
+                case New(tpt2) if tpt1.tpe.dealias.typeSymbol == tpt2.tpe.dealias.typeSymbol => matched
                 case _ => notMatched
 
             /* Match this */
diff --git a/tests/pos-macros/i17606/Macros_1.scala b/tests/pos-macros/i17606/Macros_1.scala
new file mode 100644
index 000000000000..245f2df66e7b
--- /dev/null
+++ b/tests/pos-macros/i17606/Macros_1.scala
@@ -0,0 +1,14 @@
+package example
+
+import scala.quoted.*
+
+object A {
+  inline def f(inline a: Any): Boolean = ${ impl('a) }
+
+  def impl(a: Expr[Any])(using Quotes): Expr[Boolean] = {
+    a match {
+      case '{ new String($x: Array[Byte]) } => Expr(true)
+      case _ => quotes.reflect.report.errorAndAbort("Expected match", a)
+    }
+  }
+}
diff --git a/tests/pos-macros/i17606/Test_2.scala b/tests/pos-macros/i17606/Test_2.scala
new file mode 100644
index 000000000000..ebf535bc2ae9
--- /dev/null
+++ b/tests/pos-macros/i17606/Test_2.scala
@@ -0,0 +1,8 @@
+package example
+
+object Main {
+  def main(args: Array[String]): Unit = {
+    val x = A.f(new String(Array.empty[Byte]))
+    println(x)
+  }
+}