Skip to content

Remove a setify + isSingleton combo #4980

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
KevinRansom merged 2 commits into from
May 24, 2018
Merged

Remove a setify + isSingleton combo #4980

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56e45e1
remove a setify
forki May 23, 2018
cb51fb4
Remove intermediate collection
forki May 23, 2018
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
12 changes: 7 additions & 5 deletions src/fsharp/TypeChecker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10012,11 +10012,13 @@ and TcMethodArg cenv env (lambdaPropagationInfo, tpenv) (lambdaPropagationInfo
// The loop variable callerLambdaTyOpt becomes None if something failed.
let rec loop callerLambdaTy lambdaVarNum =
if lambdaVarNum < numLambdaVars then
let col = [ for row in prefixOfLambdaArgsForEachOverload -> row.[lambdaVarNum] ]
// Check if all the rows give the same argument type
if col |> ListSet.setify (typeEquiv cenv.g) |> isSingleton then
let calledLambdaArgTy = col.[0]
// Force the caller to be a function type.
let calledLambdaArgTy = prefixOfLambdaArgsForEachOverload.[0].[lambdaVarNum]
let allRowsGiveSameArgumentType =
prefixOfLambdaArgsForEachOverload
|> Array.forall (fun row -> typeEquiv cenv.g calledLambdaArgTy row.[lambdaVarNum])

if allRowsGiveSameArgumentType then
// Force the caller to be a function type.
match UnifyFunctionTypeUndoIfFailed cenv env.DisplayEnv mArg callerLambdaTy with
| Some (callerLambdaDomainTy, callerLambdaRangeTy) ->
if AddCxTypeEqualsTypeUndoIfFailed env.DisplayEnv cenv.css mArg calledLambdaArgTy callerLambdaDomainTy then
Expand Down