Skip to content

Commit bb29e20

Browse files
authored
Merge pull request #15186 from dotty-staging/remove-special-eq-in-unsafe-nulls
Remove special eq/ne in unsafeNulls
2 parents be65db4 + 0cf96cc commit bb29e20

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

compiler/src/dotty/tools/dotc/typer/Typer.scala

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -643,19 +643,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
643643

644644
def typeSelectOnTerm(using Context): Tree =
645645
val qual = typedExpr(tree.qualifier, shallowSelectionProto(tree.name, pt, this))
646-
val qual1 = if Nullables.unsafeNullsEnabled then
647-
qual.tpe match {
648-
case OrNull(tpe1) if tpe1 <:< defn.ObjectType =>
649-
qual.cast(AndType(qual.tpe, tpe1))
650-
case tp =>
651-
if tp.isNullType
652-
&& (tree.name == nme.eq || tree.name == nme.ne) then
653-
// Allow selecting `eq` and `ne` on `Null` specially
654-
qual.cast(defn.ObjectType)
655-
else qual
656-
}
657-
else qual
658-
typedSelect(tree, pt, qual1).withSpan(tree.span).computeNullable()
646+
typedSelect(tree, pt, qual).withSpan(tree.span).computeNullable()
659647

660648
def javaSelectOnType(qual: Tree)(using Context) =
661649
// semantic name conversion for `O$` in java code

0 commit comments

Comments
 (0)