Skip to content
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

Incremental build comment cleanup and minor fix for logical file timestamps #10677

Merged
merged 2 commits into from
Dec 11, 2020
Merged

Incremental build comment cleanup and minor fix for logical file timestamps #10677

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85db2b8
Incremental build comment cleanup and minor fix for logical file time…
TIHan Dec 11, 2020
2776e79
Update IncrementalBuild.fs
TIHan Dec 11, 2020
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
40 changes: 15 additions & 25 deletions src/fsharp/service/IncrementalBuild.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,16 +575,6 @@ type FrameworkImportsCache(size) =
return tcGlobals, frameworkTcImports, nonFrameworkResolutions, unresolved
}


//------------------------------------------------------------------------------------
// Rules for reactive building.
//
// This phrases the compile as a series of vector functions and vector manipulations.
// Rules written in this language are then transformed into a plan to execute the
// various steps of the process.
//-----------------------------------------------------------------------------------


/// Represents the interim state of checking an assembly
[<Sealed>]
type PartialCheckResults private (semanticModel: SemanticModel, timeStamp: DateTime) =
Expand Down Expand Up @@ -712,28 +702,19 @@ type IncrementalBuilder(tcGlobals, frameworkTcImports, nonFrameworkAssemblyInput
//----------------------------------------------------
// START OF BUILD TASK FUNCTIONS

/// This is a build task function that gets placed into the build rules as the computation for a VectorStamp
///
/// Get the timestamp of the given file name.
let StampFileNameTask (cache: TimeStampCache) _ctok (_m: range, filename: string, _isLastCompiland) =
cache.GetFileTimeStamp filename

/// This is a build task function that gets placed into the build rules as the computation for a VectorMap
///
/// Parse the given file and return the given input.
let ParseTask ctok (sourceRange: range, filename: string, isLastCompiland) =
DoesNotRequireCompilerThreadTokenAndCouldPossiblyBeMadeConcurrent ctok
SyntaxTree(tcConfig, fileParsed, lexResourceManager, sourceRange, filename, isLastCompiland)

/// This is a build task function that gets placed into the build rules as the computation for a Vector.Stamp
///
/// Timestamps of referenced assemblies are taken from the file's timestamp.
let StampReferencedAssemblyTask (cache: TimeStampCache) ctok (_ref, timeStamper) =
timeStamper cache ctok


/// This is a build task function that gets placed into the build rules as the computation for a Vector.Demultiplex
///
// Link all the assemblies together and produce the input typecheck accumulator
let CombineImportedAssembliesTask ctok : Cancellable<SemanticModel> =
cancellable {
Expand Down Expand Up @@ -819,8 +800,6 @@ type IncrementalBuilder(tcGlobals, frameworkTcImports, nonFrameworkAssemblyInput
defaultPartialTypeChecking,
beforeFileChecked, fileChecked, tcInfo, Eventually.Done (Some tcInfoOptional), None) }

/// This is a build task function that gets placed into the build rules as the computation for a Vector.ScanLeft
///
/// Type check all files.
let TypeCheckTask ctok (prevSemanticModel: SemanticModel) syntaxTree: Eventually<SemanticModel> =
eventually {
Expand All @@ -832,8 +811,6 @@ type IncrementalBuilder(tcGlobals, frameworkTcImports, nonFrameworkAssemblyInput
return semanticModel
}

/// This is a build task function that gets placed into the build rules as the computation for a Vector.Demultiplex
///
/// Finish up the typechecking to produce outputs for the rest of the compilation process
let FinalizeTypeCheckTask ctok (semanticModels: SemanticModel[]) =
cancellable {
Expand Down Expand Up @@ -932,7 +909,16 @@ type IncrementalBuilder(tcGlobals, frameworkTcImports, nonFrameworkAssemblyInput
let fileNames = sourceFiles |> Array.ofList // TODO: This should be an immutable array.
let referencedAssemblies = nonFrameworkAssemblyInputs |> Array.ofList // TODO: This should be an immutable array.

(*
The data below represents a dependency graph.

ReferencedAssembliesStamps => FileStamps => SemanticModels => FinalizedSemanticModel
*)

// stampedFileNames represent the real stamps of the files.
// logicalStampedFileNames represent the stamps of the files that are used to calculate the project's logical timestamp.
let stampedFileNames = Array.init fileNames.Length (fun _ -> DateTime.MinValue)
let logicalStampedFileNames = Array.init fileNames.Length (fun _ -> DateTime.MinValue)
let stampedReferencedAssemblies = Array.init referencedAssemblies.Length (fun _ -> DateTime.MinValue)
let mutable initialSemanticModel = None
let semanticModels = Array.zeroCreate<SemanticModel option> fileNames.Length
Expand All @@ -946,6 +932,7 @@ type IncrementalBuilder(tcGlobals, frameworkTcImports, nonFrameworkAssemblyInput
match semanticModels.[slot] with
// This prevents an implementation file that has a backing signature file from invalidating the rest of the build.
| Some(semanticModel) when enablePartialTypeChecking && semanticModel.BackingSignature.IsSome ->
stampedFileNames.[slot] <- StampFileNameTask cache ctok fileInfo
semanticModel.Invalidate()
| _ ->
// Something changed, the finalized view of the project must be invalidated.
Expand All @@ -954,7 +941,9 @@ type IncrementalBuilder(tcGlobals, frameworkTcImports, nonFrameworkAssemblyInput
// Invalidate the file and all files below it.
stampedFileNames.[slot..]
|> Array.iteri (fun j _ ->
stampedFileNames.[slot + j] <- StampFileNameTask cache ctok fileNames.[slot + j]
let stamp = StampFileNameTask cache ctok fileNames.[slot + j]
stampedFileNames.[slot + j] <- stamp
logicalStampedFileNames.[slot + j] <- stamp
semanticModels.[slot + j] <- None
)

Expand Down Expand Up @@ -987,11 +976,12 @@ type IncrementalBuilder(tcGlobals, frameworkTcImports, nonFrameworkAssemblyInput

for i = 0 to stampedFileNames.Length - 1 do
stampedFileNames.[i] <- DateTime.MinValue
logicalStampedFileNames.[i] <- DateTime.MinValue
semanticModels.[i] <- None

let getStampedFileNames cache ctok =
computeStampedFileNames cache ctok
stampedFileNames
logicalStampedFileNames

let getStampedReferencedAssemblies cache ctok =
computeStampedReferencedAssemblies cache ctok
Expand Down