Fix handling of baseType of (A & Double) | Null

scala · Oct 24, 2022 · 754b68e · 754b68e
1 parent d9301e0
commit 754b68e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
@@ -369,7 +369,7 @@ object TypeOps:
       }
 
       // Step 3: Intersect base classes of both sides
-      val commonBaseClasses = tp.mapReduceOr(_.baseClasses)(intersect)
+      val commonBaseClasses = tp.mapReduceAndOr(_.baseClasses)(intersect)
       val doms = dominators(commonBaseClasses, Nil)
       def baseTp(cls: ClassSymbol): Type =
         tp.baseType(cls).mapReduceOr(identity)(mergeRefinedOrApplied)

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -478,6 +478,11 @@ object Types {
       case _ => f(this)
     }
 
+    final def mapReduceAndOr[T](f: Type => T)(g: (T, T) => T)(using Context): T = stripTypeVar match {
+      case tp: AndOrType => g(tp.tp1.mapReduceAndOr(f)(g), tp.tp2.mapReduceAndOr(f)(g))
+      case _ => f(this)
+    }
+
 // ----- Associated symbols ----------------------------------------------
 
     /** The type symbol associated with the type */

diff --git a/tests/pos/i16236.scala b/tests/pos/i16236.scala
@@ -0,0 +1,9 @@
+trait A
+
+def consume[T](t: T): Unit = ()
+
+def fails(p: (Double & A) | Null): Unit = consume(p) // was: assertion failed: <notype> & A
+
+def switchedOrder(p: (A & Double) | Null): Unit = consume(p) // ok
+def nonPrimitive(p: (String & A) | Null): Unit = consume(p) // ok
+def notNull(p: (Double & A)): Unit = consume(p) // ok