Updates

Author: psfinaki

Diff for: src/Compiler/Driver/ParseAndCheckInputs.fs

@@ -31,7 +31,6 @@ open FSharp.Compiler.LexerStore
 open FSharp.Compiler.Lexhelp
 open FSharp.Compiler.NameResolution
 open FSharp.Compiler.ParseHelpers
-open FSharp.Compiler.ReuseTcResults
 open FSharp.Compiler.Syntax
 open FSharp.Compiler.SyntaxTrivia
 open FSharp.Compiler.Syntax.PrettyNaming
@@ -1962,9 +1961,6 @@ let CheckMultipleInputsUsingGraphMode
 
 let CheckClosedInputSet (ctok, checkForErrors, tcConfig: TcConfig, tcImports, tcGlobals, prefixPathOpt, tcState, eagerFormat, inputs) =
 
-    if tcConfig.reuseTcResults = ReuseTcResults.On then
-        CachingDriver(tcConfig).TryReuseTcResults(inputs)
-
     // tcEnvAtEndOfLastFile is the environment required by fsi.exe when incrementally adding definitions
     let results, tcState =
         match tcConfig.typeCheckingConfig.Mode with

Diff for: src/Compiler/Driver/ReuseTcResults/CachingDriver.fs

@@ -113,7 +113,7 @@ type CachingDriver(tcConfig: TcConfig) =
 
     let getThisCompilationReferences = Seq.map formatAssemblyReference >> Seq.toArray
 
-    member _.TryReuseTcResults inputs =
+    member _.CanReuseTcResults inputs =
         let prevTcDataOpt = readPrevTcData ()
 
         let thisTcData =
@@ -129,14 +129,11 @@ type CachingDriver(tcConfig: TcConfig) =
 
             if prevTcData = thisTcData then
                 use _ = Activity.start Activity.Events.reuseTcResultsCacheHit []
-
-                () // do nothing, yet
+                true
             else
                 use _ = Activity.start Activity.Events.reuseTcResultsCacheMissed []
-
-                writeThisTcData thisTcData
+                false
 
         | None ->
             use _ = Activity.start Activity.Events.reuseTcResultsCacheAbsent []
-
-            writeThisTcData thisTcData
+            false

Diff for: src/Compiler/Driver/ReuseTcResults/CachingDriver.fsi

@@ -54,6 +54,7 @@ open FSharp.Compiler.TypedTree
 open FSharp.Compiler.TypedTreeOps
 open FSharp.Compiler.XmlDocFileWriter
 open FSharp.Compiler.CheckExpressionsOps
+open ReuseTcResults
 
 //----------------------------------------------------------------------------
 // Reporting - warnings, errors
@@ -162,6 +163,11 @@ let TypeCheck
 
         let eagerFormat (diag: PhasedDiagnostic) = diag.EagerlyFormatCore true
 
+        let cachingDriver = CachingDriver(tcConfig)
+        if cachingDriver.CanReuseTcResults(inputs) then
+            // do nothing, yet
+            ()
+
         CheckClosedInputSet(
             ctok,
             diagnosticsLogger.CheckForErrors,
@@ -171,8 +177,7 @@ let TypeCheck
             None,
             tcInitialState,
             eagerFormat,
-            inputs
-        )
+            inputs)
     with exn ->
         errorRecovery exn rangeStartup
         exiter.Exit 1

Diff for: src/Compiler/Driver/fsc.fs

@@ -462,10 +462,9 @@
     <Compile Include="Driver\GraphChecking\GraphProcessing.fsi" />
     <Compile Include="Driver\GraphChecking\GraphProcessing.fs" />
     <Content Include="Driver\GraphChecking\Docs.md" />
-    <Compile Include="Driver\ReuseTcResults\CachingDriver.fsi" />
-    <Compile Include="Driver\ReuseTcResults\CachingDriver.fs" />
     <Compile Include="Driver\ParseAndCheckInputs.fsi" />
     <Compile Include="Driver\ParseAndCheckInputs.fs" />
+    <Compile Include="Driver\ReuseTcResults\CachingDriver.fs" />
     <Compile Include="Driver\ScriptClosure.fsi" />
     <Compile Include="Driver\ScriptClosure.fs" />
     <Compile Include="Driver\CompilerOptions.fsi" />

Diff for: src/Compiler/FSharp.Compiler.Service.fsproj

@@ -262,7 +262,7 @@
     <Compile Include="Interop\ParamArray.fs" />
     <Compile Include="Interop\Literals.fs" />
     <Compile Include="Scripting\Interactive.fs" />
-    <Compile Include="TypeChecks\ReuseTcResults\ReuseTcResultsTests.fs" />
+    <Compile Include="TypeChecks\ReuseTcResults\Activities.fs" />
     <Compile Include="TypeChecks\SeqTypeCheckTests.fs" />
     <Compile Include="TypeChecks\CheckDeclarationsTests.fs" />
     <Compile Include="TypeChecks\Graph\Utils.fs" />

Diff for: tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj

@@ -5,13 +5,15 @@ open System.Diagnostics
 open System.IO
 
 open FSharp.Compiler.Diagnostics
+open FSharp.Test
 open FSharp.Test.Compiler
 
 open Xunit
 
 open TestFramework
 
 
+[<Collection(nameof NotThreadSafeResourceCollection)>]
 type Activities() =
 
     let tempPath = $"{getTemporaryFileName()}.fsx"