Skip to content

Commit cf3fdfb

Browse files
committed
Address next round of comments
1 parent 3f96efe commit cf3fdfb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

compiler/src/dotty/tools/dotc/core/Denotations.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ object Denotations {
622622
tp1.derivedLambdaType(
623623
mergeParamNames(tp1, tp2),
624624
tp1.paramInfos.zipWithConserve(tp2.paramInfos) { (p1, p2) =>
625-
infoMeet(p1, p2.subst(tp2, tp1), sym1, sym2, safeIntersection).bounds
625+
infoMeet(p1, p2.subst(tp2, tp1), sym1, sym2, safeIntersection).bounds
626626
},
627627
infoMeet(tp1.resultType, tp2.resultType.subst(tp2, tp1), sym1, sym2, safeIntersection))
628628
case _ =>
@@ -674,7 +674,7 @@ object Denotations {
674674
tp1.derivedLambdaType(
675675
mergeParamNames(tp1, tp2),
676676
tp1.paramInfos.zipWithConserve(tp2.paramInfos) { (p1, p2) =>
677-
(p1 | p2.subst(tp2, tp1)).bounds
677+
infoJoin(p1, p2.subst(tp2, tp1), sym1, sym2).bounds
678678
},
679679
infoJoin(tp1.resultType, tp2.resultType.subst(tp2, tp1), sym1, sym2))
680680
case _ =>

compiler/src/dotty/tools/dotc/core/TypeComparer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1648,7 +1648,7 @@ class TypeComparer(initctx: Context) extends ConstraintHandling {
16481648
tp1.derivedRefinedType(tp1.parent & tp2.parent, tp1.refinedName, jointInfo)
16491649
}
16501650
catch {
1651-
case ex: MergeError => tp1.parent & tp2.parent
1651+
case ex: MergeError => NoType
16521652
}
16531653
case _ =>
16541654
NoType

0 commit comments

Comments
 (0)