Skip to content

Reduce isAppTy calls in TypeDefinitelyHasEquality #8286

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 1 commit into from
Jan 21, 2020
Merged

Reduce isAppTy calls in TypeDefinitelyHasEquality #8286

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
43 changes: 24 additions & 19 deletions src/fsharp/AugmentWithHashCompare.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,23 +1071,28 @@ let MakeBindingsForEqualsAugmentation (g: TcGlobals) (tycon: Tycon) =
elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkEquals mkRecdEquality
else []

let rec TypeDefinitelyHasEquality g ty =
if isAppTy g ty && HasFSharpAttribute g g.attrib_NoEqualityAttribute (tcrefOfAppTy g ty).Attribs then
let rec TypeDefinitelyHasEquality g ty =
let appTy = tryAppTy g ty
match appTy with
| ValueSome(tcref,_) when HasFSharpAttribute g g.attrib_NoEqualityAttribute tcref.Attribs ->
false
elif isTyparTy g ty &&
(destTyparTy g ty).Constraints |> List.exists (function TyparConstraint.SupportsEquality _ -> true | _ -> false) then
true
else
match ty with
| SpecialEquatableHeadType g tinst ->
tinst |> List.forall (TypeDefinitelyHasEquality g)
| SpecialNotEquatableHeadType g _ ->
false
| _ ->
// The type is equatable because it has Object.Equals(...)
isAppTy g ty &&
let tcref, tinst = destAppTy g ty
// Give a good error for structural types excluded from the equality relation because of their fields
not (TyconIsCandidateForAugmentationWithEquals g tcref.Deref && Option.isNone tcref.GeneratedHashAndEqualsWithComparerValues) &&
// Check the (possibly inferred) structural dependencies
(tinst, tcref.TyparsNoRange) ||> List.lengthsEqAndForall2 (fun ty tp -> not tp.EqualityConditionalOn || TypeDefinitelyHasEquality g ty)
| _ ->
if isTyparTy g ty &&
(destTyparTy g ty).Constraints |> List.exists (function TyparConstraint.SupportsEquality _ -> true | _ -> false) then
true
else
match ty with
| SpecialEquatableHeadType g tinst ->
tinst |> List.forall (TypeDefinitelyHasEquality g)
| SpecialNotEquatableHeadType g _ ->
false
| _ ->
// The type is equatable because it has Object.Equals(...)
match appTy with
| ValueSome(tcref,tinst) ->
// Give a good error for structural types excluded from the equality relation because of their fields
not (TyconIsCandidateForAugmentationWithEquals g tcref.Deref && Option.isNone tcref.GeneratedHashAndEqualsWithComparerValues) &&
// Check the (possibly inferred) structural dependencies
(tinst, tcref.TyparsNoRange)
||> List.lengthsEqAndForall2 (fun ty tp -> not tp.EqualityConditionalOn || TypeDefinitelyHasEquality g ty)
| _ -> false
Copy link
Contributor

@cartermp cartermp Jan 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: the _ case (as mentioned in another PR) feels less appropriate since ValueNone is the only other case here. The above usage is fine though since the ValueSome case prior also has a when clause.