Skip to content

Commit 79931f3

Browse files
committed
Remove unnecessary logic in glb and lub
1 parent 644319d commit 79931f3

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2041,10 +2041,6 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
20412041
else if (!tp2.exists) tp1
20422042
else if tp1.isAny && !tp2.isLambdaSub || tp1.isAnyKind || isBottom(tp2) then tp2
20432043
else if tp2.isAny && !tp1.isLambdaSub || tp2.isAnyKind || isBottom(tp1) then tp1
2044-
else if tp1.containsFromJavaObject && !tp2.isLambdaSub then
2045-
tp2 // If tp1 is FromJavaObject or a union containing FromJavaObject, tp2 <:< tp1
2046-
else if tp2.containsFromJavaObject && !tp1.isLambdaSub then
2047-
tp1 // Similarly, tp1 <:< tp2
20482044
else tp2 match
20492045
case tp2: LazyRef =>
20502046
glb(tp1, tp2.ref)
@@ -2093,10 +2089,6 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
20932089
if (tp1 eq tp2) tp1
20942090
else if (!tp1.exists) tp1
20952091
else if (!tp2.exists) tp2
2096-
else if tp1.containsFromJavaObject && !tp2.isLambdaSub then
2097-
tp1 // If tp1 is FromJavaObject or a union containing FromJavaObject, tp2 <:< tp1
2098-
else if tp2.containsFromJavaObject && !tp1.isLambdaSub then
2099-
tp2 // Similarly, tp1 <:< tp2
21002092
else if tp1.isAny && !tp2.isLambdaSub || tp1.isAnyKind || isBottom(tp2) then tp1
21012093
else if tp2.isAny && !tp1.isLambdaSub || tp2.isAnyKind || isBottom(tp1) then tp2
21022094
else

0 commit comments

Comments
 (0)