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

Checker: fix options equality for il module reader references #16161

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Checker: fix options equality for il module reader references #16161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d55b265
Checker: fix options equality for il module reader references
auduchinok Oct 23, 2023
fad2e6b
Fantomas
auduchinok Oct 23, 2023
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
12 changes: 3 additions & 9 deletions src/Compiler/Service/FSharpCheckerResults.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ type FSharpReferencedProject =
| :? FSharpReferencedProject as o ->
match this, o with
| FSharpReference (projectOutputFile1, options1), FSharpReference (projectOutputFile2, options2) ->
projectOutputFile1 = projectOutputFile2 && options1 = options2
projectOutputFile1 = projectOutputFile2
&& FSharpProjectOptions.AreSameForChecking(options1, options2)
| PEReference (getStamp1, reader1), PEReference (getStamp2, reader2) ->
reader1.OutputFile = reader2.OutputFile && (getStamp1 ()) = (getStamp2 ())
| ILModuleReference (projectOutputFile1, getStamp1, _), ILModuleReference (projectOutputFile2, getStamp2, _) ->
Expand Down Expand Up @@ -174,14 +175,7 @@ and FSharpProjectOptions =
&& options1.UnresolvedReferences = options2.UnresolvedReferences
&& options1.OriginalLoadReferences = options2.OriginalLoadReferences
&& options1.ReferencedProjects.Length = options2.ReferencedProjects.Length
&& (options1.ReferencedProjects, options2.ReferencedProjects)
||> Array.forall2 (fun r1 r2 ->
match r1, r2 with
| FSharpReferencedProject.FSharpReference (n1, a), FSharpReferencedProject.FSharpReference (n2, b) ->
n1 = n2 && FSharpProjectOptions.AreSameForChecking(a, b)
| FSharpReferencedProject.PEReference (getStamp1, reader1), FSharpReferencedProject.PEReference (getStamp2, reader2) ->
reader1.OutputFile = reader2.OutputFile && (getStamp1 ()) = (getStamp2 ())
| _ -> false)
&& options1.ReferencedProjects = options2.ReferencedProjects
&& options1.LoadTime = options2.LoadTime

member po.ProjectDirectory = Path.GetDirectoryName(po.ProjectFileName)
Expand Down