use hash instead?

dotnet · Nov 1, 2024 · fd7c2e6 · fd7c2e6
1 parent 17ed53d
commit fd7c2e6
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/src/Compiler/Driver/GraphChecking/Graph.fs b/src/Compiler/Driver/GraphChecking/Graph.fs
@@ -111,12 +111,12 @@ module internal Graph =
 
         graph |> serialiseToMermaid |> out.WriteAllText
 
-    let asString (graph: Graph<FileIndex * DateTime>) =
+    let asString (graph: Graph<FileIndex * string>) =
         let sb = StringBuilder()
         let appendLine (line: string) = sb.AppendLine(line) |> ignore
 
-        for KeyValue((idx, dateTime), _) in graph do
-            appendLine $"    %i{idx}[\"%A{dateTime}\"]"
+        for KeyValue((idx, hash), _) in graph do
+            appendLine $"    %i{idx}[\"{hash}\"]"
 
         for KeyValue((idx, _), deps) in graph do
             for depIdx, _ in deps do

diff --git a/src/Compiler/Driver/GraphChecking/Graph.fsi b/src/Compiler/Driver/GraphChecking/Graph.fsi
@@ -27,4 +27,4 @@ module internal Graph =
     /// Create a simple Mermaid graph and save it under the path specified.
     val writeMermaidToFile: path: string -> graph: Graph<FileIndex * string> -> unit
     /// Serialize the graph to a string
-    val asString: graph: Graph<FileIndex * DateTime> -> string
+    val asString: graph: Graph<FileIndex * string> -> string
diff --git a/src/Compiler/Driver/ParseAndCheckInputs.fs b/src/Compiler/Driver/ParseAndCheckInputs.fs
@@ -11,6 +11,7 @@ open System.Collections.Generic
 
 open FSharp.Compiler.Parser
 open Internal.Utilities.Collections
+open Internal.Utilities.Hashing
 open Internal.Utilities.Library
 open Internal.Utilities.Library.Extras
 open Internal.Utilities.Text.Lexing
@@ -1967,6 +1968,12 @@ let TryReuseTypecheckingResults (tcConfig: TcConfig) inputs =
     let tcDataFileName =
         FileSystem.GetFullFilePathInDirectoryShim outputDir FSharpTypecheckingDataResourceName
 
+    let getContentHash fileName =
+        use stream = FileSystem.OpenFileForReadShim fileName
+        let bytes = stream.ReadAllBytes()
+        let contentHash = Md5Hasher.computeHash bytes
+        contentHash |> BitConverter.ToString
+
     let getThisCompilationCmdLine () =
         tcConfig.cmdLineArgs |> String.concat " "
 
@@ -1985,9 +1992,7 @@ let TryReuseTypecheckingResults (tcConfig: TcConfig) inputs =
 
         DependencyResolution.mkGraph filePairs sourceFiles
         |> fst
-        |> Graph.map (fun idx ->
-            let lastModified = FileSystem.GetLastWriteTimeShim(sourceFiles[idx].FileName)
-            idx, lastModified)
+        |> Graph.map (fun idx -> idx, getContentHash sourceFiles[idx].FileName)
         |> Graph.asString
 
     let writeThisTcData (cmdLine: string) (graph: string) =

diff --git a/...piler.ComponentTests/TypeChecks/ReuseTypecheckingResults/ReuseTypecheckingResultsTests.fs b/...piler.ComponentTests/TypeChecks/ReuseTypecheckingResults/ReuseTypecheckingResultsTests.fs
@@ -12,10 +12,6 @@ type Activities() =
 
     let tempDir = DirectoryInfo (createTemporaryDirectory "temp")
     let tempName = getTemporaryFileName()
-    let cUnit =
-        Fsx "42"
-        |> withOutputDirectory (Some tempDir)
-        |> withName tempName
 
     let actualActivities = List<string>()
 
@@ -38,12 +34,22 @@ type Activities() =
             Activity.Events.reuseTcResultsCacheMissed
         ]
 
+        let cUnit =
+            Fsx "42"
+            |> withOutputDirectory (Some tempDir)
+            |> withName tempName
+
         cUnit
         |> withReuseTypecheckingResults
         |> compile
         |> shouldSucceed
         |> ignore
 
+        let cUnit =
+            Fsx "43"
+            |> withOutputDirectory (Some tempDir)
+            |> withName tempName
+
         cUnit
         |> withReuseTypecheckingResults
         |> compile
@@ -60,6 +66,11 @@ type Activities() =
             Activity.Events.reuseTcResultsCacheMissed
         ]
 
+        let cUnit =
+            Fsx "42"
+            |> withOutputDirectory (Some tempDir)
+            |> withName tempName
+
         cUnit
         |> withReuseTypecheckingResults
         |> compile
@@ -69,7 +80,7 @@ type Activities() =
         cUnit
         |> withReuseTypecheckingResults
         |> withNoOptimizationData // random option
-        |> recompile
+        |> compile
         |> shouldSucceed
         |> ignore
 
@@ -83,6 +94,11 @@ type Activities() =
             Activity.Events.reuseTcResultsCacheHit
         ]
 
+        let cUnit =
+            Fsx "42"
+            |> withOutputDirectory (Some tempDir)
+            |> withName tempName
+
         cUnit
         |> withReuseTypecheckingResults
         |> compile
@@ -91,7 +107,7 @@ type Activities() =
 
         cUnit
         |> withReuseTypecheckingResults
-        |> recompile
+        |> compile
         |> shouldSucceed
         |> ignore