Merge pull request #10247 from lrytz/t12702-pending

Fixes scala/bug#12702
scala · Jan 11, 2023 · cef9844 · cef9844
2 parents 91f0f66 + 84bf5ca
commit cef9844
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala b/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala
@@ -68,11 +68,10 @@ trait MatchTranslation {
       def pos     = tree.pos
       def tpe     = binder.info.dealias // the type of the variable bound to the pattern
       def pt      = unbound match {
-        case Star(tpt)      => this glbWith seqType(tpt.tpe)
+        case Star(tpt)      => seqType(tpt.tpe)
         case TypeBound(tpe) => tpe
         case tree           => tree.tpe
       }
-      def glbWith(other: Type) = glb(tpe :: other :: Nil).normalize
 
       object SymbolAndTypeBound {
         def unapply(tree: Tree): Option[(Symbol, Type)] = tree match {
@@ -94,7 +93,7 @@ trait MatchTranslation {
 
       private def bindingStep(sub: Symbol, subpattern: Tree) = step(SubstOnlyTreeMaker(sub, binder))(rebindTo(subpattern))
       private def equalityTestStep()                         = step(EqualityTestTreeMaker(binder, tree, pos))()
-      private def typeTestStep(sub: Symbol, subPt: Type)     = step(TypeTestTreeMaker(sub, binder, subPt, glbWith(subPt))(pos))()
+      private def typeTestStep(sub: Symbol, subPt: Type)     = step(TypeTestTreeMaker(sub, binder, subPt, subPt)(pos))()
       private def alternativesStep(alts: List[Tree])         = step(AlternativesTreeMaker(binder, translatedAlts(alts), alts.head.pos))()
       private def translatedAlts(alts: List[Tree])           = alts map (alt => rebindTo(alt).translate())
       private def noStep()                                   = step()()

diff --git a/test/files/run/t12702.check b/test/files/run/t12702.check
@@ -0,0 +1,2 @@
+warning: 1 feature warning; re-run with -feature for details
+IOS
diff --git a/test/files/run/t12702.scala b/test/files/run/t12702.scala
@@ -0,0 +1,17 @@
+object Test {
+  trait MFSS[X <: MFSS[_]]
+  trait CS extends MFSS[CS]
+  trait MFI { type ST }
+  case class MFSD[S](mFI: MFI {type ST = S})
+  case object IOS extends MFI { type ST = CS }
+  type SD = MFSD[S] forSome {
+    type S <: MFSS[S]
+  }
+  def bad(sd: SD) = sd.mFI match {
+    case ios: IOS.type => println(ios)
+  }
+  def main(args: Array[String]): Unit = {
+    val x = MFSD(IOS)
+    bad(x)
+  }
+}
diff --git a/test/junit/scala/tools/nsc/symtab/SymbolTableTest.scala b/test/junit/scala/tools/nsc/symtab/SymbolTableTest.scala
@@ -49,4 +49,33 @@ class SymbolTableTest {
     import symbolTable._
     assertEquals(NoSymbol, NoSymbol.outerClass)
   }
+
+  @Test def t12702_glb(): Unit = {
+    import symbolTable._
+    import SymbolTableTest.t12702._
+    val t1 = typeOf[IOS.type]
+    val t2 = {
+      val sd = typeOf[SD]
+      sd.memberType(sd.member(TermName("mFI"))).finalResultType
+    }
+    // t1: Test.IOS.type
+    // t2: Test.MFI{type +ST = S}
+
+    // Ends up in `throw GlbFailure` in glb => Null
+    assertTrue(definitions.NullTpe =:= glb(t1 :: t2 :: Nil))
+  }
+}
+
+object SymbolTableTest {
+  object t12702 {
+    import scala.language.existentials
+    trait MFSS[X <: MFSS[_]]
+    trait CS extends MFSS[CS]
+    trait MFI { type ST }
+    case class MFSD[S](mFI: MFI {type ST = S})
+    case object IOS extends MFI { type ST = CS }
+    type SD = MFSD[S] forSome {
+      type S <: MFSS[S]
+    }
+  }
 }