Skip to content

Prevent dotnet process spawn on compiler startup #13969

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
merged 9 commits into from
Oct 6, 2022
Merged

Prevent dotnet process spawn on compiler startup #13969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6719e51
don't start process to determine system assemblies
dsyme Sep 23, 2022
ff17983
Merge branch 'main' of https://github.com/dotnet/fsharp into proc
dsyme Sep 23, 2022
dd90122
code format
dsyme Sep 23, 2022
3c57b7e
Merge branch 'main' into proc
dsyme Sep 23, 2022
7cfa0c4
fix build break
dsyme Sep 23, 2022
d3daf00
Merge branch 'bb1' into proc
dsyme Sep 23, 2022
80fe0a9
Merge branch 'proc' of https://github.com/dsyme/fsharp into proc
dsyme Sep 23, 2022
d19cf89
Merge branch 'main' into proc
dsyme Sep 23, 2022
dc6b2b7
Merge branch 'main' into proc
dsyme Sep 27, 2022
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
13 changes: 6 additions & 7 deletions src/Compiler/Driver/CompilerConfig.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,14 +1405,13 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
/// 'framework' reference set that is potentially shared across multiple compilations.
member tcConfig.IsSystemAssembly(fileName: string) =
try
let dirName = Path.GetDirectoryName fileName
let baseName = FileSystemUtils.fileNameWithoutExtension fileName

FileSystem.FileExistsShim fileName
&& ((tcConfig.GetTargetFrameworkDirectories()
|> List.exists (fun clrRoot -> clrRoot = Path.GetDirectoryName fileName))
|| (tcConfig
.FxResolver
.GetSystemAssemblies()
.Contains(FileSystemUtils.fileNameWithoutExtension fileName))
|| tcConfig.FxResolver.IsInReferenceAssemblyPackDirectory fileName)
&& ((tcConfig.GetTargetFrameworkDirectories() |> List.contains dirName)
|| FxResolver.GetSystemAssemblies().Contains baseName
|| FxResolver.IsReferenceAssemblyPackDirectoryApprox dirName)
with _ ->
false

Expand Down
15 changes: 4 additions & 11 deletions src/Compiler/Driver/FxResolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ type internal FxResolver
// A set of assemblies to always consider to be system assemblies. A common set of these can be used a shared
// resources between projects in the compiler services. Also all assemblies where well-known system types exist
// referenced from TcGlobals must be listed here.
let systemAssemblies =
static let systemAssemblies =
HashSet
[
// NOTE: duplicates are ok in this list
Expand Down Expand Up @@ -789,17 +789,10 @@ type internal FxResolver
"WindowsBase"
]

member _.GetSystemAssemblies() = systemAssemblies
static member GetSystemAssemblies() = systemAssemblies

member _.IsInReferenceAssemblyPackDirectory fileName =
fxlock.AcquireLock(fun fxtok ->
RequireFxResolverLock(fxtok, "assuming all member require lock")

match tryGetNetCoreRefsPackDirectoryRoot () |> replayWarnings with
| _, Some root ->
let path = Path.GetDirectoryName(fileName)
path.StartsWith(root, StringComparison.OrdinalIgnoreCase)
| _ -> false)
static member IsReferenceAssemblyPackDirectoryApprox(dirName: string) =
dirName.Contains "Microsoft.NETCore.App.Ref"

member _.TryGetSdkDir() =
fxlock.AcquireLock(fun fxtok ->
Expand Down
6 changes: 4 additions & 2 deletions src/Compiler/Driver/FxResolver.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ type internal FxResolver =

member GetFrameworkRefsPackDirectory: unit -> string option

member GetSystemAssemblies: unit -> HashSet<string>
static member GetSystemAssemblies: unit -> HashSet<string>

/// Gets the selected target framework moniker, e.g netcore3.0, net472, and the running rid of the current machine
member GetTfmAndRid: unit -> string * string

member IsInReferenceAssemblyPackDirectory: fileName: string -> bool
/// Determines if an assembly is in the core set of assemblies with high likelihood of
/// being shared amongst a set of common scripting references
static member IsReferenceAssemblyPackDirectoryApprox: dirName: string -> bool

member TryGetDesiredDotNetSdkVersionForDirectory: unit -> Result<string, exn>

Expand Down