Avoid over widening in SpaceEngine (#18252)

scala · Jul 20, 2023 · fd95c55 · fd95c55
2 parents 816bd5e + 6bea14b
commit fd95c55
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -578,7 +578,13 @@ object SpaceEngine {
           if (arity > 0)
             productSelectorTypes(resTp, unappSym.srcPos)
           else {
-            val getTp = resTp.select(nme.get).finalResultType.widenTermRefExpr
+            val getTp = resTp.select(nme.get).finalResultType match
+              case tp: TermRef if !tp.isOverloaded =>
+                // Like widenTermRefExpr, except not recursively.
+                // For example, in i17184 widen Option[foo.type]#get
+                // to Option[foo.type] instead of Option[Int].
+                tp.underlying.widenExpr
+              case tp => tp
             if (argLen == 1) getTp :: Nil
             else productSelectorTypes(getTp, unappSym.srcPos)
           }

diff --git a/tests/patmat/i17184.scala b/tests/patmat/i17184.scala
@@ -0,0 +1,9 @@
+class Foo
+trait Bar:
+  val foo : Int
+  val f : Option[foo.type] = Some(foo)
+
+  def g : Boolean =
+    f match
+      case None => false
+      case Some(_) => true