Normalize for underlyingClassRef

Test scala#15827 with a classpath dependency
dotty-staging · Apr 14, 2024 · 4523dcb · 4523dcb
1 parent 17777db
commit 4523dcb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -1584,7 +1584,7 @@ object Types extends TypeUtils {
      *  a class, the class type ref, otherwise NoType.
      *  @param  refinementOK   If `true` we also skip refinements.
      */
-    def underlyingClassRef(refinementOK: Boolean)(using Context): Type = dealias match {
+    def underlyingClassRef(refinementOK: Boolean)(using Context): Type = dealiasNormalized match {
       case tp: TypeRef =>
         if (tp.symbol.isClass) tp
         else if (tp.symbol.isAliasType) tp.underlying.underlyingClassRef(refinementOK)

diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
@@ -60,7 +60,7 @@ i9999.scala
 i6505.scala
 i15158.scala
 i15155.scala
-i15827.scala
+i15827a.scala
 i17149.scala
 tuple-fold.scala
 mt-redux-norm.perspective.scala

diff --git a/tests/pos/i15827.scala → tests/pos/i15827a.scala b/tests/pos/i15827.scala → tests/pos/i15827a.scala
diff --git a/tests/pos/i15827b/A_1.scala b/tests/pos/i15827b/A_1.scala
@@ -0,0 +1,7 @@
+
+case class Foo()
+
+type T = Tuple.Elem[(Foo, Any), 0]
+
+val x = new T() // ok
+
diff --git a/tests/pos/i15827b/B_2.scala b/tests/pos/i15827b/B_2.scala
@@ -0,0 +1,2 @@
+
+val y = new T() // error before changes