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

Merge feature/auto-widen to feature/erased-unions #11823

Merged
merged 14 commits into from
Jul 13, 2021
Merged

Merge feature/auto-widen to feature/erased-unions #11823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5152b79
update baseline and improve errors
Jul 6, 2021
d48369f
Use RunImmediate for better debug stacks (#11788)
dsyme Jul 6, 2021
a940bd5
Fix 11771 - cross-project references for projects using generative ty…
dsyme Jul 7, 2021
8c6df9c
Revert "Improve debugging of retail and inline code by not erasing lo…
dsyme Jul 7, 2021
5148e8d
Remove call to SetLength (#11796)
TIHan Jul 8, 2021
78ca728
Add RequireQualifiedAccess to ParsedHashDirectiveArgument type. (#11795)
nojaf Jul 8, 2021
33f7e88
Fix 11797 (#11799)
dsyme Jul 8, 2021
3bc3870
RunImmediate should use RunSynchronously if called on UI thread (#11805)
dsyme Jul 8, 2021
43f27c6
Correct body SynExpr of parsedData of Lambda when wildcards are invol…
nojaf Jul 9, 2021
8cce324
Cleanup and document async.fs (#11806)
dsyme Jul 9, 2021
07f156e
update System.Net.Security package from 4.3.0 to 4.3.1 (#11810)
brettfo Jul 9, 2021
5af4584
Warn unsupported attributes (#11812)
Happypig375 Jul 12, 2021
91925a4
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Jul 12, 2021
a541448
Merge branch 'main' into feature/auto-widen
vzarytovskii Jul 12, 2021
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
22 changes: 20 additions & 2 deletions FSharp.Compiler.Service.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ VisualStudioVersion = 16.0.30503.244
MinimumVisualStudioVersion = 10.0.40219.1
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service", "src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{A59DB8AE-8044-41A5-848A-800A7FF31C93}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.Tests", "tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj", "{8D9C9683-5041-48AB-8FA9-0939D2D27D33}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service.Tests", "tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj", "{8D9C9683-5041-48AB-8FA9-0939D2D27D33}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.DependencyManager.Nuget", "src\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj", "{98E7659D-8E0C-489F-B4F5-E12AFC0D1BFA}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager.Nuget", "src\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj", "{98E7659D-8E0C-489F-B4F5-E12AFC0D1BFA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp.Compiler.Service.Tests support", "FSharp.Compiler.Service.Tests support", "{875D91AC-BA4C-4191-AB11-AE461DB9B8DB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharp_Analysis", "tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj", "{BFE6E6F1-1B73-404F-A3A5-30B57E5E0731}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TestTP", "tests\service\data\TestTP\TestTP.fsproj", "{2EF674B9-8B56-4796-9933-42B2629E52C3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -27,10 +33,22 @@ Global
{98E7659D-8E0C-489F-B4F5-E12AFC0D1BFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{98E7659D-8E0C-489F-B4F5-E12AFC0D1BFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{98E7659D-8E0C-489F-B4F5-E12AFC0D1BFA}.Release|Any CPU.Build.0 = Release|Any CPU
{BFE6E6F1-1B73-404F-A3A5-30B57E5E0731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFE6E6F1-1B73-404F-A3A5-30B57E5E0731}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFE6E6F1-1B73-404F-A3A5-30B57E5E0731}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFE6E6F1-1B73-404F-A3A5-30B57E5E0731}.Release|Any CPU.Build.0 = Release|Any CPU
{2EF674B9-8B56-4796-9933-42B2629E52C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EF674B9-8B56-4796-9933-42B2629E52C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EF674B9-8B56-4796-9933-42B2629E52C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2EF674B9-8B56-4796-9933-42B2629E52C3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BFE6E6F1-1B73-404F-A3A5-30B57E5E0731} = {875D91AC-BA4C-4191-AB11-AE461DB9B8DB}
{2EF674B9-8B56-4796-9933-42B2629E52C3} = {875D91AC-BA4C-4191-AB11-AE461DB9B8DB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F9A60F3B-D894-4C8E-BA0F-C51115B25A5A}
EndGlobalSection
Expand Down
65 changes: 65 additions & 0 deletions FSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service.Tes
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service", "src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp.Compiler.Service.Tests support", "FSharp.Compiler.Service.Tests support", "{452EED3C-AA87-471F-B9AC-0F4479C5820C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharp_Analysis", "tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj", "{F8743670-C8D4-41B3-86BE-BBB1226C352F}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TestTP", "tests\service\data\TestTP\TestTP.fsproj", "{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{E02ADBCA-D6C0-4898-A8AA-86DE6EBE2DC2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroPerfCSharp", "tests\benchmarks\MicroPerf\CS\MicroPerfCSharp.csproj", "{2904313F-7782-4522-894C-DC946DFFE22D}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MicroPerf", "tests\benchmarks\MicroPerf\MicroPerf.fsproj", "{C888A81D-2372-4B4A-8BA1-525AEE3918D6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -298,6 +310,54 @@ Global
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|Any CPU.Build.0 = Release|Any CPU
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|x86.ActiveCfg = Release|Any CPU
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|x86.Build.0 = Release|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Debug|x86.ActiveCfg = Debug|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Debug|x86.Build.0 = Debug|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Proto|Any CPU.Build.0 = Debug|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Proto|x86.ActiveCfg = Debug|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Proto|x86.Build.0 = Debug|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Release|Any CPU.Build.0 = Release|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Release|x86.ActiveCfg = Release|Any CPU
{F8743670-C8D4-41B3-86BE-BBB1226C352F}.Release|x86.Build.0 = Release|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Debug|x86.ActiveCfg = Debug|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Debug|x86.Build.0 = Debug|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Proto|Any CPU.Build.0 = Debug|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Proto|x86.ActiveCfg = Debug|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Proto|x86.Build.0 = Debug|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|Any CPU.Build.0 = Release|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|x86.ActiveCfg = Release|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|x86.Build.0 = Release|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Debug|x86.ActiveCfg = Debug|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Debug|x86.Build.0 = Debug|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Proto|Any CPU.Build.0 = Debug|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Proto|x86.ActiveCfg = Debug|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Proto|x86.Build.0 = Debug|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Release|Any CPU.Build.0 = Release|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Release|x86.ActiveCfg = Release|Any CPU
{2904313F-7782-4522-894C-DC946DFFE22D}.Release|x86.Build.0 = Release|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Debug|x86.ActiveCfg = Debug|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Debug|x86.Build.0 = Debug|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Proto|Any CPU.Build.0 = Debug|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Proto|x86.ActiveCfg = Debug|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Proto|x86.Build.0 = Debug|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Release|Any CPU.Build.0 = Release|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Release|x86.ActiveCfg = Release|Any CPU
{C888A81D-2372-4B4A-8BA1-525AEE3918D6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -324,6 +384,11 @@ Global
{25568CD2-E654-4C8F-BE5B-59BABFC5BD20} = {07482B5E-4980-4285-B732-820F15870284}
{DDFD06DC-D7F2-417F-9177-107764EEBCD8} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{452EED3C-AA87-471F-B9AC-0F4479C5820C} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{F8743670-C8D4-41B3-86BE-BBB1226C352F} = {452EED3C-AA87-471F-B9AC-0F4479C5820C}
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F} = {452EED3C-AA87-471F-B9AC-0F4479C5820C}
{2904313F-7782-4522-894C-DC946DFFE22D} = {E02ADBCA-D6C0-4898-A8AA-86DE6EBE2DC2}
{C888A81D-2372-4B4A-8BA1-525AEE3918D6} = {E02ADBCA-D6C0-4898-A8AA-86DE6EBE2DC2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}
Expand Down
4 changes: 4 additions & 0 deletions VisualFSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service", "src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{B5A9BBD9-2F45-4722-A6CA-BAE3C64CD4E2}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service.Tests", "tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj", "{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA}"
ProjectSection(ProjectDependencies) = postProject
{FF76BD3C-5E0A-4752-B6C3-044F6E15719B} = {FF76BD3C-5E0A-4752-B6C3-044F6E15719B}
{887630A3-4B1D-40EA-B8B3-2D842E9C40DB} = {887630A3-4B1D-40EA-B8B3-2D842E9C40DB}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualFSharpDebug", "vsintegration\Vsix\VisualFSharpFull\VisualFSharpDebug.csproj", "{A422D673-8E3B-4924-821B-DD3174173426}"
EndProject
Expand Down
3 changes: 1 addition & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,14 @@
<SystemLinqQueryableVersion>4.3.0</SystemLinqQueryableVersion>
<SystemMemoryVersion>4.5.4</SystemMemoryVersion>
<SystemNetRequestsVersion>4.3.0</SystemNetRequestsVersion>
<SystemNetSecurityVersion>4.3.0</SystemNetSecurityVersion>
<SystemNetSecurityVersion>4.3.1</SystemNetSecurityVersion>
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<SystemReflectionTypeExtensionsVersion>4.3.0</SystemReflectionTypeExtensionsVersion>
<SystemRuntimeCachingVersion>1.5.0</SystemRuntimeCachingVersion>
<SystemRuntimeVersion>4.3.0</SystemRuntimeVersion>
<SystemRuntimeInteropServicesVersion>4.3.0</SystemRuntimeInteropServicesVersion>
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
<SystemNetSecurityVersion>4.3.0</SystemNetSecurityVersion>
<SystemSecurityClaimsVersion>4.3.0</SystemSecurityClaimsVersion>
<SystemSecurityCryptographyAlgorithmsVersion>4.3.0</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityPrincipalVersion>4.3.0</SystemSecurityPrincipalVersion>
Expand Down
7 changes: 1 addition & 6 deletions src/fsharp/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10158,12 +10158,7 @@ and ApplyAbstractSlotInference (cenv: cenv) (envinner: TcEnv) (bindingTy, m, syn
match dispatchSlotsArityMatch with
| meths when methInfosEquivByNameAndSig meths -> meths
| [] ->
let details =
slots
|> Seq.map (NicePrint.stringOfMethInfo cenv.infoReader m envinner.DisplayEnv)
|> Seq.map (sprintf "%s %s" System.Environment.NewLine)
|> String.concat ""

let details = NicePrint.multiLineStringOfMethInfos cenv.infoReader m envinner.DisplayEnv slots
errorR(Error(FSComp.SR.tcOverrideArityMismatch details, memberId.idRange))
[]
| _ -> [] // check that method to override is sealed is located at CheckOverridesAreAllUsedOnce (typrelns.fs)
Expand Down
7 changes: 6 additions & 1 deletion src/fsharp/CompilerConfig.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,17 @@ type TimeStampCache(defaultTimeStamp: DateTime) =
projects.[pr] <- v
v

and [<RequireQualifiedAccess>]
ProjectAssemblyDataResult =
| Available of IRawFSharpAssemblyData
| Unavailable of useOnDiskInstead: bool

and IProjectReference =
/// The name of the assembly file generated by the project
abstract FileName: string

/// Evaluate raw contents of the assembly file generated by the project
abstract EvaluateRawContents: unit -> NodeCode<IRawFSharpAssemblyData option>
abstract EvaluateRawContents: unit -> NodeCode<ProjectAssemblyDataResult>

/// Get the logical timestamp that would be the timestamp of the assembly file generated by the project
///
Expand Down
11 changes: 9 additions & 2 deletions src/fsharp/CompilerConfig.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,20 @@ type TimeStampCache =
member GetFileTimeStamp: string -> DateTime
member GetProjectReferenceTimeStamp: IProjectReference -> DateTime

and [<RequireQualifiedAccess>]
ProjectAssemblyDataResult =
| Available of IRawFSharpAssemblyData
| Unavailable of useOnDiskInstead: bool

and IProjectReference =

/// The name of the assembly file generated by the project
abstract FileName: string

/// Evaluate raw contents of the assembly file generated by the project
abstract EvaluateRawContents: unit -> NodeCode<IRawFSharpAssemblyData option>
/// Evaluate raw contents of the assembly file generated by the project.
/// 'None' may be returned if an in-memory view of the contents is, for some reason,
/// not available. In this case the on-disk view of the contents will be preferred.
abstract EvaluateRawContents: unit -> NodeCode<ProjectAssemblyDataResult>

/// Get the logical timestamp that would be the timestamp of the assembly file generated by the project.
///
Expand Down
11 changes: 6 additions & 5 deletions src/fsharp/CompilerImports.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,19 +1635,20 @@ and [<Sealed>] TcImports(tcConfigP: TcConfigProvider, initialResolutions: TcAsse
| Some ilb ->
return! ilb.EvaluateRawContents()
| None ->
return None
return ProjectAssemblyDataResult.Unavailable true
}

// If we have a project reference but did not get any valid contents,
// just return None and do not attempt to read elsewhere.
if contentsOpt.IsNone && r.ProjectReference.IsSome then
match contentsOpt with
| ProjectAssemblyDataResult.Unavailable false ->
return None
else
| _ ->

let assemblyData =
match contentsOpt with
| Some ilb -> ilb
| None ->
| ProjectAssemblyDataResult.Available ilb -> ilb
| ProjectAssemblyDataResult.Unavailable _ ->
let ilModule, ilAssemblyRefs = tcImports.OpenILBinaryModule(ctok, filename, m)
RawFSharpAssemblyDataBackedByFileOnDisk (ilModule, ilAssemblyRefs) :> IRawFSharpAssemblyData

Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/DetupleArgs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,15 +715,15 @@ let fixupApp (penv: penv) (fx, fty, tys, args, m) =

// Is it a val app, where the val has a transform?
match fx with
| Expr.Val (vref, _, vm) ->
| Expr.Val (vref, _, m) ->
let f = vref.Deref
match hasTransfrom penv f with
| Some trans ->
// fix it
let callPattern = trans.transformCallPattern
let transformedVal = trans.transformedVal
let fCty = transformedVal.Type
let fCx = exprForVal vm transformedVal
let fCx = exprForVal m transformedVal
(* [[f tps args ]] -> transformedVal tps [[COLLAPSED: args]] *)
let env = {prefix = "arg";m = m;eg=penv.g}
let bindings = []
Expand Down
4 changes: 3 additions & 1 deletion src/fsharp/FSComp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ buildUnexpectedTypeArgs,"The non-generic type '%s' does not expect any type argu
returnUsedInsteadOfReturnBang,"Consider using 'return!' instead of 'return'."
yieldUsedInsteadOfYieldBang,"Consider using 'yield!' instead of 'yield'."
tupleRequiredInAbstractMethod,"\nA tuple type is required for one or more arguments. Consider wrapping the given arguments in additional parentheses or review the definition of the interface."
202,unsupportedAttribute,"This attribute is currently unsupported by the F# compiler. Applying it will not achieve its intended effect."
203,buildInvalidWarningNumber,"Invalid warning number '%s'"
204,buildInvalidVersionString,"Invalid version string '%s'"
205,buildInvalidVersionFile,"Invalid version file '%s'"
Expand Down Expand Up @@ -1556,7 +1557,8 @@ forFormatInvalidForInterpolated4,"Interpolated strings used as type IFormattable
3384,scriptSdkNotDeterminedNoHost,"The .NET SDK for this script could not be determined. dotnet.exe could not be found ensure a .NET SDK is installed."
3385,tcInvalidStructReturn,"The use of '[<Struct>]' on values, functions and methods is only allowed on partial active pattern definitions"
3386,tcImplicitConversionUsed,"This expression uses an implicit conversion to convert type '%s' to type '%s'. Warnings are enabled for implicit conversions. Consider using an explicit conversion or disabling this warning."
3387,tcAmbiguousImplicitConversion,"This expression has type '%s' and is only made compatible with type '%s' through an ambiguous implicit conversion. Consider using an explicit call to 'op_Implicit'."
3386,tcImplicitConversionUsed2,"This expression uses the implicit conversion '%s' to convert type '%s' to type '%s'. Warnings are enabled for implicit conversions. Consider using an explicit conversion or disabling this warning."
3387,tcAmbiguousImplicitConversion,"This expression has type '%s' and is only made compatible with type '%s' through an ambiguous implicit conversion. Consider using an explicit call to 'op_Implicit'. The applicable implicit conversions are:%s"
#3501 "This construct is not supported by your version of the F# compiler" CompilerMessage(ExperimentalAttributeMessages.NotSupportedYet, 3501, IsError=true)
3390,xmlDocBadlyFormed,"This XML comment is invalid: '%s'"
3390,xmlDocMissingParameterName,"This XML comment is invalid: missing 'name' attribute for parameter or parameter reference"
Expand Down
Loading