Expose langVersion from ILGlobals

dotnet · Jun 22, 2021 · 6885b0b · 6885b0b
1 parent dfa3331
commit 6885b0b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/fsharp/CompilerImports.fs b/src/fsharp/CompilerImports.fs
@@ -1908,7 +1908,7 @@ and [<Sealed>] TcImports(tcConfigP: TcConfigProvider, initialResolutions: TcAsse
         let tryFindSysTypeCcu path typeName =
             sysCcus |> Array.tryFind (fun ccu -> ccuHasType ccu path typeName)
 
-        let ilGlobals = mkILGlobals (primaryScopeRef, assembliesThatForwardToPrimaryAssembly, fsharpCoreAssemblyScopeRef)
+        let ilGlobals = mkILGlobals (primaryScopeRef, assembliesThatForwardToPrimaryAssembly, fsharpCoreAssemblyScopeRef, tcConfig.langVersion)
 
         // OK, now we have both mscorlib.dll and FSharp.Core.dll we can create TcGlobals
         let tcGlobals = TcGlobals(tcConfig.compilingFslib, ilGlobals, fslibCcu,

diff --git a/src/fsharp/absil/il.fs b/src/fsharp/absil/il.fs
@@ -19,6 +19,7 @@ open System.Text
 open System.Threading
 
 open FSharp.Compiler.AbstractIL.Diagnostics
+open FSharp.Compiler.Features
 open Internal.Utilities.Library
 open Internal.Utilities
 
@@ -2631,7 +2632,7 @@ let tname_UIntPtr = "System.UIntPtr"
 let tname_TypedReference = "System.TypedReference"
 
 [<NoEquality; NoComparison; StructuredFormatDisplay("{DebugText}")>]
-type ILGlobals(primaryScopeRef: ILScopeRef, assembliesThatForwardToPrimaryAssembly: ILAssemblyRef list, fsharpCoreAssemblyScopeRef: ILScopeRef) =
+type ILGlobals(primaryScopeRef: ILScopeRef, assembliesThatForwardToPrimaryAssembly: ILAssemblyRef list, fsharpCoreAssemblyScopeRef: ILScopeRef, langVersion: LanguageVersion) =
 
     let assembliesThatForwardToPrimaryAssembly = Array.ofList assembliesThatForwardToPrimaryAssembly
 
@@ -2671,13 +2672,15 @@ type ILGlobals(primaryScopeRef: ILScopeRef, assembliesThatForwardToPrimaryAssemb
         assembliesThatForwardToPrimaryAssembly
         |> Array.exists aref.EqualsIgnoringVersion
 
+    member _.langVersion = langVersion
+
     /// For debugging
     [<DebuggerBrowsable(DebuggerBrowsableState.Never)>]
     member x.DebugText = x.ToString()
 
     override x.ToString() = "<ILGlobals>"
 
-let mkILGlobals (primaryScopeRef, assembliesThatForwardToPrimaryAssembly, fsharpCoreAssemblyScopeRef) = ILGlobals (primaryScopeRef, assembliesThatForwardToPrimaryAssembly, fsharpCoreAssemblyScopeRef)
+let mkILGlobals (primaryScopeRef, assembliesThatForwardToPrimaryAssembly, fsharpCoreAssemblyScopeRef, langVersion) = ILGlobals (primaryScopeRef, assembliesThatForwardToPrimaryAssembly, fsharpCoreAssemblyScopeRef, langVersion)
 
 let mkNormalCall mspec = I_call (Normalcall, mspec, None)
 
@@ -3707,7 +3710,7 @@ let DummyFSharpCoreScopeRef =
                 Some (parseILVersion "0.0.0.0"), None)
     ILScopeRef.Assembly asmRef
 
-let PrimaryAssemblyILGlobals = mkILGlobals (ILScopeRef.PrimaryAssembly, [], DummyFSharpCoreScopeRef)
+let PrimaryAssemblyILGlobals = mkILGlobals (ILScopeRef.PrimaryAssembly, [], DummyFSharpCoreScopeRef, LanguageVersion("default"))
 
 let rec decodeCustomAttrElemType bytes sigptr x =
     match x with

diff --git a/src/fsharp/absil/il.fsi b/src/fsharp/absil/il.fsi
@@ -5,6 +5,7 @@
 module rec FSharp.Compiler.AbstractIL.IL
 
 open FSharp.Compiler.IO
+open FSharp.Compiler.Features
 open Internal.Utilities
 open System.Collections.Generic
 open System.Reflection
@@ -1645,6 +1646,8 @@ type internal ILGlobals =
 
     member fsharpCoreAssemblyScopeRef: ILScopeRef
 
+    member langVersion: LanguageVersion
+
     /// Is the given assembly possibly a primary assembly?
     /// In practice, a primary assembly is an assembly that contains the System.Object type definition
     /// and has no referenced assemblies.
@@ -1656,7 +1659,7 @@ type internal ILGlobals =
     member IsPossiblePrimaryAssemblyRef: ILAssemblyRef -> bool
 
 /// Build the table of commonly used references given functions to find types in system assemblies
-val internal mkILGlobals: primaryScopeRef: ILScopeRef * assembliesThatForwardToPrimaryAssembly: ILAssemblyRef list * fsharpCoreAssemblyScopeRef: ILScopeRef -> ILGlobals
+val internal mkILGlobals: primaryScopeRef: ILScopeRef * assembliesThatForwardToPrimaryAssembly: ILAssemblyRef list * fsharpCoreAssemblyScopeRef: ILScopeRef * langVersion: LanguageVersion -> ILGlobals
 
 val internal PrimaryAssemblyILGlobals: ILGlobals
 

diff --git a/src/fsharp/ilx/EraseUnions.fs b/src/fsharp/ilx/EraseUnions.fs
@@ -5,7 +5,8 @@ module internal FSharp.Compiler.AbstractIL.ILX.EraseUnions
 
 open System.Collections.Generic
 open System.Reflection
-open Internal.Utilities.Library 
+open Internal.Utilities.Library
+open FSharp.Compiler.Features
 open FSharp.Compiler.AbstractIL.IL 
 open FSharp.Compiler.AbstractIL.ILX.Types
 
@@ -684,7 +685,7 @@ let convAlternativeDef (addMethodGeneratedAttrs, addPropertyGeneratedAttrs, addP
         | SpecialFSharpListHelpers  -> 
 
             let baseTesterMeths, baseTesterProps =
-                if cenv.g.langVersion.SupportsFeature LanguageFeature.UnionIsPropertiesVisible then [], []
+                if ilg.langVersion.SupportsFeature LanguageFeature.UnionIsPropertiesVisible then [], []
                 elif cud.cudAlternatives.Length <= 1 then [], []
                 elif repr.RepresentOneAlternativeAsNull info then [], []
                 else