Skip to content

Support NotNullIfNotNullAttribute #19977

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
T-Gro merged 16 commits into from
Jul 28, 2026
Merged

Support NotNullIfNotNullAttribute #19977

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
941d90a
Support NotNullIfNotNullAttribute
kerams Jun 21, 2026
8061f96
Stuff
kerams Jun 21, 2026
3acded4
Stuff
kerams Jun 21, 2026
8c7acea
Stuff
kerams Jun 22, 2026
6daa50a
Correctness, refactor
kerams Jun 22, 2026
b65a49b
Fix, add tests
kerams Jun 22, 2026
5e1d0ad
More tests
kerams Jun 23, 2026
2003712
Merge branch 'main' of https://github.com/dotnet/fsharp into nn
kerams Jun 23, 2026
49bf7f7
Merge branch 'main' of https://github.com/dotnet/fsharp into nn
kerams Jun 24, 2026
6f84303
Stuff
kerams Jun 24, 2026
ee6b9fa
Add unit test
kerams Jun 24, 2026
061c5f8
Refactor
kerams Jun 25, 2026
bc46a83
Merge branch 'main' of https://github.com/dotnet/fsharp into nn
kerams Jun 30, 2026
dfa1c53
Merge branch 'main' of https://github.com/dotnet/fsharp into nn
kerams Jul 24, 2026
7fd4646
Fix byref unsoundness
kerams Jul 24, 2026
e0c2cef
Merge branch 'main' into nn
kerams Jul 27, 2026
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
Correctness, refactor
  • Loading branch information
@kerams
kerams committed Jun 22, 2026
commit 6daa50ae57688ab771d572bcda7b967323a372e3
19 changes: 12 additions & 7 deletions src/Compiler/Checking/Expressions/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3356,14 +3356,19 @@ let NotNullIfNotNullParamNames g (minfo: MethInfo) =
| _ -> []
| _ -> []

// Resolve the caller argument bound to 'paramName' (named arguments first, then by position) and return the type of its type-checked expression.
// Resolve the caller argument bound to 'paramName' and return the type of its type-checked expression.
let TryGetCallerArgType g (minfo: MethInfo) (callerArgs: CallerArgs<_>) paramName =
match callerArgs.Named |> List.tryPick (List.tryPick (fun (CallerNamedArg(id, arg)) -> if id.idText = paramName then Some (tyOfExpr g arg.Expr) else None)) with
| None ->
match minfo.GetParamNames() |> List.tryPick (List.tryFindIndex (fun nm -> match nm with Some nm -> nm = paramName | _ -> false)) with
| Some idx -> callerArgs.Unnamed |> List.tryPick (List.tryItem idx) |> Option.map (fun arg -> tyOfExpr g arg.Expr)
| None -> None
| x -> x
// First try to find a named argument with the given name
callerArgs.Named
|> List.tryPick (List.tryPick (fun (CallerNamedArg(id, arg)) -> if id.idText = paramName then Some arg else None))
|> Option.orElseWith (fun () ->
// If there is no matching named argument, find the argument in the same position as the parameter with the given name
minfo.GetParamNames()
|> Seq.concat
|> Seq.tryFindIndex (fun nm -> match nm with Some nm -> nm = paramName | _ -> false)
|> Option.bind (fun idx -> Seq.concat callerArgs.Unnamed |> Seq.tryItem idx)
)
|> Option.map (fun arg -> tyOfExpr g arg.Expr)
Comment thread
T-Gro marked this conversation as resolved.
Resolved

//-------------------------------------------------------------------------
// Helpers dealing with sequence expressions
Expand Down
Loading