File tree Expand file tree Collapse file tree 1 file changed +0
-8
lines changed
compiler/src/dotty/tools/dotc/core Expand file tree Collapse file tree 1 file changed +0
-8
lines changed Original file line number Diff line number Diff line change @@ -2041,10 +2041,6 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
2041
2041
else if (! tp2.exists) tp1
2042
2042
else if tp1.isAny && ! tp2.isLambdaSub || tp1.isAnyKind || isBottom(tp2) then tp2
2043
2043
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
2048
2044
else tp2 match
2049
2045
case tp2 : LazyRef =>
2050
2046
glb(tp1, tp2.ref)
@@ -2093,10 +2089,6 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
2093
2089
if (tp1 eq tp2) tp1
2094
2090
else if (! tp1.exists) tp1
2095
2091
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
2100
2092
else if tp1.isAny && ! tp2.isLambdaSub || tp1.isAnyKind || isBottom(tp2) then tp1
2101
2093
else if tp2.isAny && ! tp1.isLambdaSub || tp2.isAnyKind || isBottom(tp1) then tp2
2102
2094
else
You can’t perform that action at this time.
0 commit comments