Skip to content

Remove special overriding logic for explicit nulls #22243

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 5 commits into from
Jan 21, 2025
Merged

Remove special overriding logic for explicit nulls #22243

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
090dbf4
Remove special overriding logic for explicit nulls
HarrisL2 Dec 19, 2024
e8fbff1
Fix explicit null matching issue
HarrisL2 Dec 20, 2024
ce9739d
Change bootstrap compiler to use flexible types
HarrisL2 Dec 21, 2024
52829cc
Also enable flexible types on presentation compiler
HarrisL2 Dec 21, 2024
9ac0663
Merge branch 'main' into 22071
HarrisL2 Jan 14, 2025
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
Prev Previous commit
Next Next commit
Fix explicit null matching issue
  • Loading branch information
@HarrisL2
HarrisL2 committed Dec 20, 2024
commit e8fbff18c648514bf919f16e1a2647657496bc47
1 change: 0 additions & 1 deletion compiler/src/dotty/tools/dotc/core/TypeComparer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,6 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling
def isNullable(tp: Type): Boolean = tp.dealias match
case tp: TypeRef =>
val tpSym = tp.symbol
!tpSym.isPrimitiveValueClass ||
tpSym.isNullableClass
case tp: TermRef =>
// https://scala-lang.org/files/archive/spec/2.13/03-types.html#singleton-types
Expand Down
3 changes: 2 additions & 1 deletion compiler/src/dotty/tools/dotc/core/Types.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,8 @@ object Types extends TypeUtils {
*/
def matches(that: Type)(using Context): Boolean = {
record("matches")
TypeComparer.matchesType(this, that, relaxed = !ctx.phase.erasedTypes)
withoutMode(Mode.SafeNulls)(
TypeComparer.matchesType(this, that, relaxed = !ctx.phase.erasedTypes))
}

/** This is the same as `matches` except that it also matches => T with T and
Expand Down
Loading