Skip to content

Remove special eq/ne in unsafeNulls #15186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2022
Merged

Remove special eq/ne in unsafeNulls #15186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions compiler/src/dotty/tools/dotc/typer/Typer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,19 +643,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer

def typeSelectOnTerm(using Context): Tree =
val qual = typedExpr(tree.qualifier, shallowSelectionProto(tree.name, pt, this))
val qual1 = if Nullables.unsafeNullsEnabled then
qual.tpe match {
case OrNull(tpe1) if tpe1 <:< defn.ObjectType =>
qual.cast(AndType(qual.tpe, tpe1))
case tp =>
if tp.isNullType
&& (tree.name == nme.eq || tree.name == nme.ne) then
// Allow selecting `eq` and `ne` on `Null` specially
qual.cast(defn.ObjectType)
else qual
}
else qual
typedSelect(tree, pt, qual1).withSpan(tree.span).computeNullable()
typedSelect(tree, pt, qual).withSpan(tree.span).computeNullable()

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