Skip to content

Fix units-of-measure changes not invalidating incremental builds #19050

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

Fix units-of-measure changes not invalidating incremental builds #19050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92baf52
Initial plan
Copilot Nov 4, 2025
fc9430c
Fix units-of-measure signature hashing and add test
Copilot Nov 4, 2025
20f86b0
Apply suggestion from @T-Gro
T-Gro Nov 5, 2025
15bacad
Add release notes for units-of-measure fix
Copilot Nov 5, 2025
327b490
Apply patch from /run fantomas
actions-user Nov 5, 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
1 change: 1 addition & 0 deletions docs/release-notes/.FSharp.Compiler.Service/11.0.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Fix: warn FS0049 on upper union case label. ([PR #19003](https://github.com/dotnet/fsharp/pull/19003))
* Type relations cache: handle potentially "infinite" types ([PR #19010](https://github.com/dotnet/fsharp/pull/19010))
* Disallow recursive structs with lifted type parameters ([Issue #18993](https://github.com/dotnet/fsharp/issues/18993), [PR #19031](https://github.com/dotnet/fsharp/pull/19031))
* Fix units-of-measure changes not invalidating incremental builds. ([Issue #19049](https://github.com/dotnet/fsharp/issues/19049))

### Added

Expand Down
19 changes: 14 additions & 5 deletions src/Compiler/Utilities/TypeHashing.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,22 @@ module rec HashTypes =
|> pipeToHash memberHash

/// Hash a unit of measure expression
let private hashMeasure unt =
let measuresWithExponents =
let private hashMeasure g unt =
let measureVarsWithExponents =
ListMeasureVarOccsWithNonZeroExponents unt
|> List.sortBy (fun (tp: Typar, _) -> tp.DisplayName)

measuresWithExponents
|> hashListOrderIndependent (fun (typar, exp: Rational) -> hashTyparRef typar @@ hash exp)
let measureConsWithExponents = ListMeasureConOccsWithNonZeroExponents g false unt

let varHash =
measureVarsWithExponents
|> hashListOrderIndependent (fun (typar, exp: Rational) -> hashTyparRef typar @@ hash exp)

let conHash =
measureConsWithExponents
|> hashListOrderIndependent (fun (tcref, exp: Rational) -> hashTyconRef tcref @@ hash exp)

varHash @@ conHash

/// Hash a type, taking precedence into account to insert brackets where needed
let hashTType (g: TcGlobals) ty =
Expand All @@ -217,7 +226,7 @@ module rec HashTypes =
let argTys, retTy = stripFunTy g ty
argTys |> hashListOrderMatters (hashTType g) |> pipeToHash (hashTType g retTy)
| TType_var(r, _) -> hashTyparRefWithInfo r
| TType_measure unt -> hashMeasure unt
| TType_measure unt -> hashMeasure g unt

// Hash a single argument, including its name and type
let private hashArgInfo (g: TcGlobals) (ty, argInfo: ArgReprInfo) =
Expand Down
10 changes: 10 additions & 0 deletions tests/FSharp.Compiler.ComponentTests/Signatures/ImpliedSignatureHashTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,16 @@ type BAttribute() =

let a ([<B>] c: int) : int = 0 """)>]

[<InlineDataAttribute("UnitsOfMeasureChanged",
(*BEFORE*)"""module MyTest
[<Measure>] type kg
[<Measure>] type m
type MyRecord = { Mass: int<kg> }"""
(*AFTER*),"""module MyTest
[<Measure>] type kg
[<Measure>] type m
type MyRecord = { Mass: int<m> }""")>]

//TODO add a lot more negative tests - in which cases should hash in fact change

[<Theory>]
Expand Down
Loading