Skip to content

Ensure frameworkTcImportsCache mutations are threadsafe #17795

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
psfinaki merged 5 commits into from
Sep 26, 2024
Merged

Ensure frameworkTcImportsCache mutations are threadsafe #17795

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3fa2e6
ensure all frameworkTcImportsCache mutations are threadsafe
majocha Sep 26, 2024
0791739
rn
majocha Sep 26, 2024
6ef2adb
not needed
majocha Sep 26, 2024
a5cd008
Merge branch 'main' into frameworkTcImportsCache-concurrency
majocha Sep 26, 2024
1bd890a
Merge branch 'main' into frameworkTcImportsCache-concurrency
majocha Sep 26, 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
1 change: 1 addition & 0 deletions docs/release-notes/.FSharp.Compiler.Service/9.0.200.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
### Fixed

* Ensure `frameworkTcImportsCache` mutations are threadsafe. ([PR #17795](https://github.com/dotnet/fsharp/pull/17795))

### Added

Expand Down
8 changes: 5 additions & 3 deletions src/Compiler/Service/IncrementalBuild.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,10 +507,12 @@ type FrameworkImportsCache(size) =
let frameworkTcImportsCache = AgedLookup<AnyCallerThreadToken, FrameworkImportsCacheKey, GraphNode<TcGlobals * TcImports>>(size, areSimilar=(fun (x, y) -> x = y))

/// Reduce the size of the cache in low-memory scenarios
member _.Downsize() = frameworkTcImportsCache.Resize(AnyCallerThread, newKeepStrongly=0)
member _.Downsize() = lock gate <| fun () ->
frameworkTcImportsCache.Resize(AnyCallerThread, newKeepStrongly=0)

/// Clear the cache
member _.Clear() = frameworkTcImportsCache.Clear AnyCallerThread
member _.Clear() = lock gate <| fun () ->
frameworkTcImportsCache.Clear AnyCallerThread

/// This function strips the "System" assemblies from the tcConfig and returns a age-cached TcImports for them.
member _.GetNode(tcConfig: TcConfig, frameworkDLLs: AssemblyResolution list, nonFrameworkResolutions: AssemblyResolution list) =
Expand Down Expand Up @@ -541,7 +543,7 @@ type FrameworkImportsCache(size) =
let tcConfigP = TcConfigProvider.Constant tcConfig
return! TcImports.BuildFrameworkTcImports (tcConfigP, frameworkDLLs, nonFrameworkResolutions)
})
frameworkTcImportsCache.Put(AnyCallerThread, key, lazyWork)
lock gate <| fun () -> frameworkTcImportsCache.Put(AnyCallerThread, key, lazyWork)
lazyWork
)
node
Expand Down