Skip to content

Make trimmed printf "%A" for F# records work when trimmed #14941

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

Merged
merged 5 commits into from
Apr 6, 2023
Merged

Make trimmed printf "%A" for F# records work when trimmed #14941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f74041
Add tests
KevinRansom Mar 20, 2023
488ef8e
Embed types
KevinRansom Mar 31, 2023
2c551a0
baselines + fsx
KevinRansom Apr 3, 2023
723b97e
Merge branch 'main' into percenta.records
KevinRansom Apr 4, 2023
5b56726
Merge branch 'main' into percenta.records
KevinRansom Apr 5, 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
13 changes: 13 additions & 0 deletions src/Compiler/AbstractIL/il.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3292,6 +3292,12 @@ let destILArrTy ty =
[<Literal>]
let tname_Attribute = "System.Attribute"

[<Literal>]
let tname_Enum = "System.Enum"

[<Literal>]
let tname_SealedAttribute = "System.SealedAttribute"

[<Literal>]
let tname_Object = "System.Object"

Expand Down Expand Up @@ -3367,6 +3373,10 @@ type ILGlobals(primaryScopeRef: ILScopeRef, equivPrimaryAssemblyRefs: ILAssembly

member val typ_Attribute = mkILBoxedType (mkILNonGenericTySpec (mkSysILTypeRef tname_Attribute))

member val typ_Enum = mkILBoxedType (mkILNonGenericTySpec (mkSysILTypeRef tname_Enum))

member val typ_SealedAttribute = mkILBoxedType (mkILNonGenericTySpec (mkSysILTypeRef tname_SealedAttribute))

member val typ_Object = mkILBoxedType (mkILNonGenericTySpec (mkSysILTypeRef tname_Object))

member val typ_String = mkILBoxedType (mkILNonGenericTySpec (mkSysILTypeRef tname_String))
Expand Down Expand Up @@ -3985,6 +3995,9 @@ let mkILInstanceField (nm, ty, init, access) =
let mkILStaticField (nm, ty, init, at, access) =
mkILField (true, nm, ty, init, at, access, false)

let mkILStaticLiteralField (nm, ty, init, at, access) =
mkILField (true, nm, ty, Some init, at, access, true)

let mkILLiteralField (nm, ty, init, at, access) =
mkILField (true, nm, ty, Some init, at, access, true)

Expand Down
7 changes: 5 additions & 2 deletions src/Compiler/AbstractIL/il.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,10 @@ type internal ILGlobals =
member primaryAssemblyScopeRef: ILScopeRef
member primaryAssemblyRef: ILAssemblyRef
member primaryAssemblyName: string
member fsharpCoreAssemblyScopeRef: ILScopeRef

member typ_Attribute: ILType
member typ_Enum: ILType
member typ_Object: ILType
member typ_String: ILType
member typ_Type: ILType
Expand All @@ -1834,10 +1837,9 @@ type internal ILGlobals =
member typ_Double: ILType
member typ_Bool: ILType
member typ_Char: ILType
member typ_SealedAttribute: ILType
member typ_TypedReference: ILType

member fsharpCoreAssemblyScopeRef: ILScopeRef

/// 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.
Expand Down Expand Up @@ -2051,6 +2053,7 @@ val internal mkILNonGenericInstanceMethod:
/// Make field definitions.
val internal mkILInstanceField: string * ILType * ILFieldInit option * ILMemberAccess -> ILFieldDef
val internal mkILStaticField: string * ILType * ILFieldInit option * byte[] option * ILMemberAccess -> ILFieldDef
val internal mkILStaticLiteralField: string * ILType * ILFieldInit * byte[] option * ILMemberAccess -> ILFieldDef
val internal mkILLiteralField: string * ILType * ILFieldInit * byte[] option * ILMemberAccess -> ILFieldDef

/// Make a type definition.
Expand Down
Loading