Merge branch 'main' into copilot/fix-24b59ebb-af21-49f7-96cf-02e1313f6ac1

T-Gro · web-flow · commit 03fa74b8fd40 · 2025-09-22T14:33:42.000+02:00
diff --git a/docs/release-notes/.FSharp.Compiler.Service/10.0.100.md b/docs/release-notes/.FSharp.Compiler.Service/10.0.100.md
@@ -32,6 +32,7 @@
 * Parser: fix range for computed binding expressions ([PR #18903](https://github.com/dotnet/fsharp/pull/18903))
 * Tests: set test source for range debug printing ([PR #18879](https://github.com/dotnet/fsharp/pull/18879))
 * Checker: fix declaring type for abbreviated types extensions ([PR #18909](https://github.com/dotnet/fsharp/pull/18909))
+* Caches: type subsumption cache key perf regression ([Issue #18925](https://github.com/dotnet/fsharp/issues/18925) [PR #18926](https://github.com/dotnet/fsharp/pull/18926))
 
 ### Changed
 * Use `errorR` instead of `error` in `CheckDeclarations.fs` when possible. ([PR #18645](https://github.com/dotnet/fsharp/pull/18645))
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
@@ -6,10 +6,10 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet/msbuild dependencies -->
-    <MicrosoftBuildPackageVersion>18.0.0-preview-25465-08</MicrosoftBuildPackageVersion>
-    <MicrosoftBuildFrameworkPackageVersion>18.0.0-preview-25465-08</MicrosoftBuildFrameworkPackageVersion>
-    <MicrosoftBuildTasksCorePackageVersion>18.0.0-preview-25465-08</MicrosoftBuildTasksCorePackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>18.0.0-preview-25465-08</MicrosoftBuildUtilitiesCorePackageVersion>
+    <MicrosoftBuildPackageVersion>18.0.0-preview-25469-01</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>18.0.0-preview-25469-01</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildTasksCorePackageVersion>18.0.0-preview-25469-01</MicrosoftBuildTasksCorePackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>18.0.0-preview-25469-01</MicrosoftBuildUtilitiesCorePackageVersion>
     <!-- dotnet/runtime dependencies -->
     <SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="e533cfad385ba4f0ec96e35ad3d485dc13581906" BarId="283666" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="2dea164f01d307c409cfe0d0ee5cb8a0691e3c94" BarId="283828" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Build" Version="18.0.0-preview-25465-08">
+    <Dependency Name="Microsoft.Build" Version="18.0.0-preview-25469-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>36b870ef0e3bc607c96e23f1f2d20125947be598</Sha>
+      <Sha>c4727aaf51e93045250f638db9cdfbbb462a45c8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Framework" Version="18.0.0-preview-25465-08">
+    <Dependency Name="Microsoft.Build.Framework" Version="18.0.0-preview-25469-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>36b870ef0e3bc607c96e23f1f2d20125947be598</Sha>
+      <Sha>c4727aaf51e93045250f638db9cdfbbb462a45c8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Core" Version="18.0.0-preview-25465-08">
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="18.0.0-preview-25469-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>36b870ef0e3bc607c96e23f1f2d20125947be598</Sha>
+      <Sha>c4727aaf51e93045250f638db9cdfbbb462a45c8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.0-preview-25465-08">
+    <Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.0-preview-25469-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>36b870ef0e3bc607c96e23f1f2d20125947be598</Sha>
+      <Sha>c4727aaf51e93045250f638db9cdfbbb462a45c8</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.Metadata" Version="9.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/src/Compiler/Utilities/TypeHashing.fs b/src/Compiler/Utilities/TypeHashing.fs
@@ -1,6 +1,7 @@
 module internal Internal.Utilities.TypeHashing
 
 open Internal.Utilities.Rational
+open Internal.Utilities.Library
 open FSharp.Compiler.AbstractIL.IL
 open FSharp.Compiler.Syntax
 open FSharp.Compiler.TcGlobals
@@ -397,72 +398,72 @@ module StructuralUtilities =
         | Nullness of nullness: NullnessInfo
         | TupInfo of b: bool
         | MeasureOne
-        | MeasureRational of rational: Rational
+        | MeasureRational of int * int
         | NeverEqual of never: NeverEqual
 
-    type TypeStructure = TypeToken[]
-
-    [<Literal>]
-    let private initialTokenCapacity = 4
+    type TypeStructure = TypeStructure of ImmutableArray<TypeToken>
 
     let inline toNullnessToken (n: Nullness) =
         match n.TryEvaluate() with
         | ValueSome k -> TypeToken.Nullness k
         | _ -> TypeToken.NeverEqual NeverEqual.Singleton
 
-    let rec private accumulateMeasure (tokens: ResizeArray<TypeToken>) (m: Measure) =
-        match m with
-        | Measure.Var mv -> tokens.Add(TypeToken.Stamp mv.Stamp)
-        | Measure.Const(tcref, _) -> tokens.Add(TypeToken.Stamp tcref.Stamp)
-        | Measure.Prod(m1, m2, _) ->
-            accumulateMeasure tokens m1
-            accumulateMeasure tokens m2
-        | Measure.Inv m1 -> accumulateMeasure tokens m1
-        | Measure.One _ -> tokens.Add(TypeToken.MeasureOne)
-        | Measure.RationalPower(m1, r) ->
-            accumulateMeasure tokens m1
-            tokens.Add(TypeToken.MeasureRational r)
-
-    let rec private accumulateTType (tokens: ResizeArray<TypeToken>) (ty: TType) =
-        match ty with
-        | TType_ucase(u, tinst) ->
-            tokens.Add(TypeToken.Stamp u.TyconRef.Stamp)
-            tokens.Add(TypeToken.UCase u.CaseName)
-
-            for arg in tinst do
-                accumulateTType tokens arg
-        | TType_app(tcref, tinst, n) ->
-            tokens.Add(TypeToken.Stamp tcref.Stamp)
-            tokens.Add(toNullnessToken n)
-
-            for arg in tinst do
-                accumulateTType tokens arg
-        | TType_anon(info, tys) ->
-            tokens.Add(TypeToken.Stamp info.Stamp)
-
-            for arg in tys do
-                accumulateTType tokens arg
-        | TType_tuple(tupInfo, tys) ->
-            tokens.Add(TypeToken.TupInfo(evalTupInfoIsStruct tupInfo))
-
-            for arg in tys do
-                accumulateTType tokens arg
-        | TType_forall(tps, tau) ->
-            for tp in tps do
-                tokens.Add(TypeToken.Stamp tp.Stamp)
-
-            accumulateTType tokens tau
-        | TType_fun(d, r, n) ->
-            accumulateTType tokens d
-            accumulateTType tokens r
-            tokens.Add(toNullnessToken n)
-        | TType_var(r, n) ->
-            tokens.Add(TypeToken.Stamp r.Stamp)
-            tokens.Add(toNullnessToken n)
-        | TType_measure m -> accumulateMeasure tokens m
+    let rec private accumulateMeasure (m: Measure) =
+        seq {
+            match m with
+            | Measure.Var mv -> TypeToken.Stamp mv.Stamp
+            | Measure.Const(tcref, _) -> TypeToken.Stamp tcref.Stamp
+            | Measure.Prod(m1, m2, _) ->
+                yield! accumulateMeasure m1
+                yield! accumulateMeasure m2
+            | Measure.Inv m1 -> yield! accumulateMeasure m1
+            | Measure.One _ -> TypeToken.MeasureOne
+            | Measure.RationalPower(m1, r) ->
+                yield! accumulateMeasure m1
+                TypeToken.MeasureRational(GetNumerator r, GetDenominator r)
+        }
+
+    let rec private accumulateTType (ty: TType) =
+        seq {
+            match ty with
+            | TType_ucase(u, tinst) ->
+                TypeToken.Stamp u.TyconRef.Stamp
+                TypeToken.UCase u.CaseName
+
+                for arg in tinst do
+                    yield! accumulateTType arg
+
+            | TType_app(tcref, tinst, n) ->
+                TypeToken.Stamp tcref.Stamp
+                toNullnessToken n
+
+                for arg in tinst do
+                    yield! accumulateTType arg
+            | TType_anon(info, tys) ->
+                TypeToken.Stamp info.Stamp
+
+                for arg in tys do
+                    yield! accumulateTType arg
+            | TType_tuple(tupInfo, tys) ->
+                TypeToken.TupInfo(evalTupInfoIsStruct tupInfo)
+
+                for arg in tys do
+                    yield! accumulateTType arg
+            | TType_forall(tps, tau) ->
+                for tp in tps do
+                    TypeToken.Stamp tp.Stamp
+
+                yield! accumulateTType tau
+            | TType_fun(d, r, n) ->
+                yield! accumulateTType d
+                yield! accumulateTType r
+                toNullnessToken n
+            | TType_var(r, n) ->
+                TypeToken.Stamp r.Stamp
+                toNullnessToken n
+            | TType_measure m -> yield! accumulateMeasure m
+        }
 
     /// Get the full structure of a type as a sequence of tokens, suitable for equality
-    let getTypeStructure ty =
-        let tokens = ResizeArray<TypeToken>(initialTokenCapacity)
-        accumulateTType tokens ty
-        tokens.ToArray()
+    let getTypeStructure =
+        Extras.WeakMap.getOrCreate (fun ty -> accumulateTType ty |> ImmutableArray.ofSeq |> TypeStructure)
diff --git a/tests/FSharp.Test.Utilities/CompilerAssert.fs b/tests/FSharp.Test.Utilities/CompilerAssert.fs
@@ -627,8 +627,6 @@ module CompilerAssertHelpers =
         File.WriteAllText(runtimeconfigPath, runtimeconfig)
 #endif
         let rc, output, errors = Commands.executeProcess fileName arguments (Path.GetDirectoryName(outputFilePath))
-        let output = String.Join(Environment.NewLine, output)
-        let errors = String.Join(Environment.NewLine, errors)
         ExitCode rc, output, errors
 
 open CompilerAssertHelpers
diff --git a/tests/FSharp.Test.Utilities/ILChecker.fs b/tests/FSharp.Test.Utilities/ILChecker.fs
@@ -15,9 +15,7 @@ module ILChecker =
 
     let private exec exe args =
         let arguments = args |> String.concat " "
-        let exitCode, _output, errors = Commands.executeProcess exe arguments ""
-        let errors = errors |> String.concat Environment.NewLine
-        errors, exitCode
+        Commands.executeProcess exe arguments ""
 
     /// Filters i.e ['The system type \'System.ReadOnlySpan`1\' was required but no referenced system DLL contained this type']
     let private filterSpecialComment (text: string) =
@@ -101,7 +99,7 @@ module ILChecker =
 
         let ildasmFullArgs = [ dllFilePath; $"-out=%s{ilFilePath}"; yield! ildasmArgs  ]
 
-        let stdErr, exitCode =
+        let exitCode, _, stdErr =
             let ildasmCommandPath = Path.ChangeExtension(dllFilePath, ".ildasmCommandPath")
             File.WriteAllLines(ildasmCommandPath, [| $"{ildasmPath} {ildasmFullArgs}" |] )
             exec ildasmPath ildasmFullArgs
@@ -212,5 +210,5 @@ module ILChecker =
 
     let reassembleIL ilFilePath dllFilePath =
         let ilasmPath = config.ILASM
-        let errors, _ = exec ilasmPath [ $"%s{ilFilePath} /output=%s{dllFilePath} /dll" ]
+        let _, _, errors = exec ilasmPath [ $"%s{ilFilePath} /output=%s{dllFilePath} /dll" ]
         errors
diff --git a/tests/FSharp.Test.Utilities/ILVerifierModule.fs b/tests/FSharp.Test.Utilities/ILVerifierModule.fs
@@ -23,9 +23,7 @@ module ILVerifierModule =
 
     let private exec (dotnetExe: string) args workingDirectory =
         let arguments = args |> String.concat " "
-        let exitCode, _output, errors = Commands.executeProcess dotnetExe arguments workingDirectory
-        let errors = errors |> String.concat Environment.NewLine
-        errors, exitCode
+        Commands.executeProcess dotnetExe arguments workingDirectory
 
     let private verifyPEFileCore peverifierArgs (dllFilePath: string) =
         let nuget_packages =
@@ -36,17 +34,13 @@ module ILVerifierModule =
             | path -> path
         let peverifyFullArgs = [ yield "exec"; yield $"""{nuget_packages}/dotnet-ilverify/9.0.0/tools/net9.0/any/ILVerify.dll"""; yield "--verbose"; yield dllFilePath; yield! peverifierArgs ]
         let workingDirectory = Path.GetDirectoryName dllFilePath
-        let _, exitCode =
+        let exitCode, outputText, errorText =
             let peverifierCommandPath = Path.ChangeExtension(dllFilePath, ".peverifierCommandPath.cmd")
             let args = peverifyFullArgs |> Seq.fold(fun a acc -> $"{a} " + acc) ""
             File.WriteAllLines(peverifierCommandPath, [| $"{args}" |] )
             File.Copy(typeof<RequireQualifiedAccessAttribute>.Assembly.Location, Path.GetDirectoryName(dllFilePath) ++ "FSharp.Core.dll", true)
             exec config.DotNetExe peverifyFullArgs workingDirectory
 
-        // Grab output
-        let outputText = File.ReadAllText(Path.Combine(workingDirectory, "StandardOutput.txt"))
-        let errorText = File.ReadAllText(Path.Combine(workingDirectory, "StandardError.txt"))
-
         match exitCode with
         | 0 -> {Outcome = NoExitCode; StdOut = outputText; StdErr = errorText } 
         | _ -> {Outcome = ExitCode exitCode; StdOut = outputText; StdErr = errorText } 
diff --git a/tests/FSharp.Test.Utilities/TestFramework.fs b/tests/FSharp.Test.Utilities/TestFramework.fs
@@ -65,21 +65,6 @@ module Commands =
     // returns exit code, stdio and stderr as string arrays
     let executeProcess pathToExe arguments workingDir =
         let commandLine = ResizeArray()
-        let errorsList = ResizeArray()
-        let outputList = ResizeArray()
-        let errorslock = obj()
-        let outputlock = obj()
-        let outputDataReceived (message: string) =
-            if not (isNull message) then
-                lock outputlock (fun () -> 
-                    printfn "%s" message
-                    outputList.Add(message))
-
-        let errorDataReceived (message: string) =
-            if not (isNull message) then
-                lock errorslock (fun () ->
-                    eprintfn "%s" message
-                    errorsList.Add(message))
 
         commandLine.Add $"cd {workingDir}"
         commandLine.Add $"{pathToExe} {arguments} /bl"
@@ -103,29 +88,14 @@ module Commands =
         use p = new Process()
         p.StartInfo <- psi
 
-        p.OutputDataReceived.Add(fun a -> outputDataReceived a.Data)
-        p.ErrorDataReceived.Add(fun a ->  errorDataReceived a.Data)
-
-        if p.Start() then
-            p.BeginOutputReadLine()
-            p.BeginErrorReadLine()
-            p.WaitForExit()
-
-        let workingDir' =
-            if workingDir = ""
-            then
-                // Assign working dir to prevent default to C:\Windows\System32
-                let executionLocation = Assembly.GetExecutingAssembly().Location
-                Path.GetDirectoryName executionLocation
-            else
-                workingDir
-
-        lock gate (fun () ->
-            File.WriteAllLines(Path.Combine(workingDir', "commandline.txt"), commandLine)
-            File.WriteAllLines(Path.Combine(workingDir', "StandardOutput.txt"), outputList)
-            File.WriteAllLines(Path.Combine(workingDir', "StandardError.txt"), errorsList)
-        )
-        p.ExitCode, outputList.ToArray(), errorsList.ToArray()
+        if not (p.Start()) then failwith "new process did not start"
+
+        let readOutput = backgroundTask { return! p.StandardOutput.ReadToEndAsync() }
+        let readErrors = backgroundTask { return! p.StandardError.ReadToEndAsync() }
+
+        p.WaitForExit()
+
+        p.ExitCode, readOutput.Result, readErrors.Result
 
     let getfullpath workDir (path:string) =
         let rooted =
diff --git a/tests/FSharp.Test.Utilities/Utilities.fs b/tests/FSharp.Test.Utilities/Utilities.fs
@@ -165,8 +165,8 @@ open System
 let main argv = 0"""
 
         let private getNetCoreAppReferences =
-            let mutable output = [||]
-            let mutable errors = [||]
+            let mutable output = ""
+            let mutable errors = ""
             let mutable cleanUp = true
             let pathToArtifacts = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "../../../.."))
             if Path.GetFileName(pathToArtifacts) <> "artifacts" then failwith "CompilerAssert did not find artifacts directory --- has the location changed????"
@@ -196,17 +196,15 @@ let main argv = 0"""
                         errors <- dotneterrors
                         output <- dotnetoutput
                         printfn "Output:\n=======\n"
-                        output |> Seq.iter(fun line -> printfn "STDOUT:%s\n" line)
+                        printfn "%s" dotnetoutput
                         printfn "Errors:\n=======\n"
-                        errors  |> Seq.iter(fun line -> printfn "STDERR:%s\n" line)
+                        printfn "%s" dotneterrors
                         Assert.True(false, "Errors produced generating References")
 
                     File.ReadLines(frameworkReferencesFileName) |> Seq.toArray
                 with | e ->
                     cleanUp <- false
                     let message =
-                        let output = output |> String.concat "\nSTDOUT: "
-                        let errors = errors |> String.concat "\nSTDERR: "
                         File.WriteAllText(Path.Combine(projectDirectory, "project.stdout"), output)
                         File.WriteAllText(Path.Combine(projectDirectory, "project.stderror"), errors)
                         $"""                        
