Skip to content

Merge main to release/dev17.12 #17491

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 2 commits into from
Aug 6, 2024
Merged

Merge main to release/dev17.12 #17491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
599bb69
prevent duplicate warnings coming from speculative method resolution …
T-Gro Aug 5, 2024
9ee9282
Merge branch 'release/dev17.12' into merges/main-to-release/dev17.12
vzarytovskii Aug 6, 2024
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
2 changes: 1 addition & 1 deletion src/Compiler/Checking/ConstraintSolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ and SolveNullnessSubsumesNullness (csenv: ConstraintSolverEnv) m2 (trace: Option
| NullnessInfo.WithNull, NullnessInfo.WithoutNull ->
CompleteD
| NullnessInfo.WithoutNull, NullnessInfo.WithNull ->
if csenv.g.checkNullness then
if csenv.g.checkNullness && not csenv.IsSpeculativeForMethodOverloading then
WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2))
else
CompleteD
Expand Down
12 changes: 12 additions & 0 deletions tests/FSharp.Compiler.ComponentTests/Language/Nullness/NullableReferenceTypesTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ let typeCheckWithStrictNullness cu =
cu
|> withNullnessOptions
|> typecheck

[<Fact>]
let ``Does not duplicate warnings`` () =
FSharp """
module MyLib
let getLength (x: string | null) = x.Length
"""
|> asLibrary
|> typeCheckWithStrictNullness
|> shouldFail
|> withDiagnostics [Error 3261, Line 3, Col 36, Line 3, Col 44, "Nullness warning: The types 'string' and 'string | null' do not have compatible nullability."]


[<Fact>]
let ``Cannot pass possibly null value to a strict function``() =
Expand Down