[WIP] [Prototype] Compilation Model

VisualFSharp.sln

@@ -154,6 +154,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TutorialProject", "vsintegr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSharp.Core.nuget", "src\fsharp\FSharp.Core.nuget\FSharp.Core.nuget.csproj", "{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Compilation", "src\fsharp\FSharp.Compiler.Compilation\FSharp.Compiler.Compilation.fsproj", "{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Compilation.Tests", "tests\FSharp.Compiler.Compilation.Tests\FSharp.Compiler.Compilation.Tests.fsproj", "{0661AF4D-5655-4038-A254-0AC57DEFBD2A}"
+EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer", "src\fsharp\FSharp.Compiler.LanguageServer\FSharp.Compiler.LanguageServer.fsproj", "{60BAFFA5-6631-4328-B044-2E012AB76DCA}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer.UnitTests", "tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj", "{AAF2D233-1C38-4090-8FFA-F7C545625E06}"
@@ -888,6 +892,30 @@ Global
 		{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC}.Release|x86.ActiveCfg = Release|Any CPU
 		{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC}.Release|x86.Build.0 = Release|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Debug|x86.Build.0 = Debug|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Proto|Any CPU.Build.0 = Debug|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Proto|x86.ActiveCfg = Debug|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Proto|x86.Build.0 = Debug|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Release|x86.ActiveCfg = Release|Any CPU
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0}.Release|x86.Build.0 = Release|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Debug|x86.Build.0 = Debug|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Proto|Any CPU.Build.0 = Debug|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Proto|x86.ActiveCfg = Debug|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Proto|x86.Build.0 = Debug|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Release|x86.ActiveCfg = Release|Any CPU
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A}.Release|x86.Build.0 = Release|Any CPU
 		{60BAFFA5-6631-4328-B044-2E012AB76DCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60BAFFA5-6631-4328-B044-2E012AB76DCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{60BAFFA5-6631-4328-B044-2E012AB76DCA}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -984,6 +1012,8 @@ Global
 		{C32806E0-71C2-40E4-AEC4-517F73F6A18A} = {BED74F9E-A0D2-48E2-9EE7-449832100487}
 		{7B345E51-F2C0-4D4B-B0E0-05432EC9D5E1} = {BED74F9E-A0D2-48E2-9EE7-449832100487}
 		{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC} = {647810D0-5307-448F-99A2-E83917010DAE}
+		{6C05C603-43BB-4A6F-8485-3ED1F685F4A0} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
+		{0661AF4D-5655-4038-A254-0AC57DEFBD2A} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 		{60BAFFA5-6631-4328-B044-2E012AB76DCA} = {B8DDA694-7939-42E3-95E5-265C2217C142}
 		{AAF2D233-1C38-4090-8FFA-F7C545625E06} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 	EndGlobalSection

benchmarks/Benchmarks.sln

@@ -9,6 +9,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core", "..\src\fshar
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private", "..\src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Compilation", "..\src\fsharp\FSharp.Compiler.Compilation\FSharp.Compiler.Compilation.fsproj", "{B13184B7-7B95-4D66-AEAF-487F09B35A9C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,6 +36,12 @@ Global
 		{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|Any CPU.Build.0 = Debug|Any CPU
 		{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B13184B7-7B95-4D66-AEAF-487F09B35A9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B13184B7-7B95-4D66-AEAF-487F09B35A9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B13184B7-7B95-4D66-AEAF-487F09B35A9C}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
+		{B13184B7-7B95-4D66-AEAF-487F09B35A9C}.Proto|Any CPU.Build.0 = Debug|Any CPU
+		{B13184B7-7B95-4D66-AEAF-487F09B35A9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B13184B7-7B95-4D66-AEAF-487F09B35A9C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

benchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fsproj

@@ -22,12 +22,15 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
-    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="2.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
+    <ProjectReference Include="..\..\src\fsharp\FSharp.Compiler.Compilation\FSharp.Compiler.Compilation.fsproj" />
   </ItemGroup>
 
 </Project>

eng/Versions.props

@@ -100,6 +100,7 @@
     <MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
     <MicrosoftCodeAnalysisWorkspacesCommonVersion>$(RoslynVersion)</MicrosoftCodeAnalysisWorkspacesCommonVersion>
     <MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(RoslynVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
     <!-- Microsoft Build packages -->
     <MicrosoftBuildOverallPackagesVersion>16.0.461</MicrosoftBuildOverallPackagesVersion>
     <MicrosoftBuildVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildVersion>

src/absil/ilread.fs

@@ -894,45 +894,52 @@ let mkCacheInt32 lowMem _inbase _nm _sz =
     if lowMem then (fun f x -> f x) else
     let cache = ref null 
     let count = ref 0
+    let gate = obj ()
 #if STATISTICS
     addReport (fun oc -> if !count <> 0 then oc.WriteLine ((_inbase + string !count + " "+ _nm + " cache hits"): string))
 #endif
     fun f (idx: int32) ->
-        let cache = 
-            match !cache with
-            | null -> cache := new Dictionary<int32, _>(11)
-            | _ -> ()
-            !cache
-        match cache.TryGetValue idx with
-        | true, res ->
-            incr count 
-            res
-        | _ ->
-            let res = f idx 
-            cache.[idx] <- res 
-            res 
+        lock gate (fun () ->
+            let cache = 
+                match !cache with
+                | null -> cache := new Dictionary<int32, _>(11)
+                | _ -> ()
+                !cache
+            let mutable res = Unchecked.defaultof<_>
+            let ok = cache.TryGetValue(idx, &res)
+            if ok then 
+                incr count 
+                res
+            else 
+                let res = f idx 
+                cache.[idx] <- res 
+                res
+        )
 
 let mkCacheGeneric lowMem _inbase _nm _sz =
     if lowMem then (fun f x -> f x) else
     let cache = ref null 
     let count = ref 0
+    let gate = obj ()
 #if STATISTICS
     addReport (fun oc -> if !count <> 0 then oc.WriteLine ((_inbase + string !count + " " + _nm + " cache hits"): string))
 #endif
     fun f (idx :'T) ->
-        let cache = 
-            match !cache with
-            | null -> cache := new Dictionary<_, _>(11 (* sz: int *) ) 
-            | _ -> ()
-            !cache
-        match cache.TryGetValue idx with
-        | true, v ->
-            incr count
-            v
-        | _ ->
-            let res = f idx
-            cache.[idx] <- res
-            res
+        lock gate (fun () ->
+            let cache = 
+                match !cache with
+                | null -> cache := new Dictionary<_, _>(11 (* sz: int *) ) 
+                | _ -> ()
+                !cache
+            match cache.TryGetValue idx with
+            | true, v ->
+                incr count
+                v
+            | _ ->
+                let res = f idx
+                cache.[idx] <- res
+                res
+        )
 
 //-----------------------------------------------------------------------
 // Polymorphic general helpers for searching for particular rows.

src/fsharp/CompileOps.fs

@@ -5580,6 +5580,29 @@ let TypeCheckClosedInputSet (ctok, checkForErrors, tcConfig, tcImports, tcGlobal
     let tcState, declaredImpls = TypeCheckClosedInputSetFinish (implFiles, tcState)
     tcState, topAttrs, declaredImpls, tcEnvAtEndOfLastFile
 
+let TryTypeCheckOneInputSynExpr (ctok, tcConfig: TcConfig, tcImports: TcImports, tcGlobals, tcSink, tcState: TcState, inp: ParsedInput, synExpr: SynExpr) =
+
+          RequireCompilationThread ctok // Everything here requires the compilation thread since it works on the TAST
+
+          CheckSimulateException tcConfig
+
+          let amap = tcImports.GetImportMap()
+          match inp with 
+          | ParsedInput.ImplFile (ParsedImplFileInput (_, isScript, qualNameOfFile, _, _, _, _)) ->
+
+              // Check if we've got an interface for this fragment 
+              let rootSigOpt = tcState.tcsRootSigs.TryFind qualNameOfFile
+
+              let tcImplEnv = tcState.tcsTcImplEnv
+
+              let conditionalDefines =
+                  if tcConfig.noConditionalErasure then None else Some (tcConfig.conditionalCompilationDefines)
+
+              let ty = TypeCheckOneSynExpr (tcGlobals, tcState.tcsNiceNameGen, amap, tcState.tcsCcu, conditionalDefines, tcSink, tcConfig.internalTestSpanStackReferring) tcImplEnv rootSigOpt isScript synExpr
+              Some ty
+          | _ ->
+              None
+
 // Existing public APIs delegate to newer implementations
 let GetFSharpCoreLibraryName () = getFSharpCoreLibraryName
 let DefaultReferencesForScriptsAndOutOfProjectSources assumeDotNetFramework = defaultReferencesForScriptsAndOutOfProjectSources assumeDotNetFramework false

src/fsharp/CompileOps.fsi

@@ -762,6 +762,8 @@ val TypeCheckOneInputAndFinishEventually :
     checkForErrors: (unit -> bool) * TcConfig * TcImports * TcGlobals * Ast.LongIdent option * NameResolution.TcResultsSink * TcState * Ast.ParsedInput 
         -> Eventually<(TcEnv * TopAttribs * TypedImplFile list * ModuleOrNamespaceType list) * TcState>
 
+val TryTypeCheckOneInputSynExpr: CompilationThreadToken * TcConfig * TcImports * TcGlobals * NameResolution.TcResultsSink * TcState * Ast.ParsedInput * Ast.SynExpr -> TType option
+
 /// Indicates if we should report a warning
 val ReportWarning: FSharpErrorSeverityOptions -> PhasedDiagnostic -> bool
 

src/fsharp/FSharp.Compiler.Compilation/Abbreviations.fs

@@ -0,0 +1,14 @@
+namespace FSharp.Compiler.Compilation
+
+open FSharp.Compiler.Ast
+open FSharp.Compiler.ErrorLogger
+
+type internal FSharpErrorSeverity = FSharp.Compiler.SourceCodeServices.FSharpErrorSeverity
+type internal CompilationErrorLogger = FSharp.Compiler.SourceCodeServices.CompilationErrorLogger
+type internal CompilationGlobalsScope = FSharp.Compiler.SourceCodeServices.CompilationGlobalsScope
+type internal ParseResult = ParsedInput option * (PhasedDiagnostic * FSharpErrorSeverity) []
+type internal SymbolEnv = FSharp.Compiler.SourceCodeServices.SymbolEnv
+type internal InternalFSharpSymbol = FSharp.Compiler.SourceCodeServices.FSharpSymbol
+type internal InternalFSharpSymbolUse = FSharp.Compiler.SourceCodeServices.FSharpSymbolUse
+type internal FSharpSourceTokenizer = FSharp.Compiler.SourceCodeServices.FSharpSourceTokenizer
+type internal FSharpTokenizerLexState = FSharp.Compiler.SourceCodeServices.FSharpTokenizerLexState