Skip to content

Fix Attribute Serialization #15152

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 6 commits into from
May 2, 2023
Merged

Fix Attribute Serialization #15152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68372c6
Fix 15140
KevinRansom Apr 29, 2023
b6a9152
fantomas
KevinRansom Apr 29, 2023
611f8f8
testcase
KevinRansom Apr 29, 2023
e5cb68e
Merge branch 'main' into fixattributeserialization
KevinRansom Apr 29, 2023
ea4a2cb
Merge branch 'main' into fixattributeserialization
KevinRansom May 2, 2023
ba8adbf
Update FSharp.Compiler.ComponentTests.fsproj
KevinRansom May 2, 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
9 changes: 7 additions & 2 deletions src/Compiler/CodeGen/IlxGenSupport.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ let GetDynamicallyAccessedMemberTypes (g: TcGlobals) =

ILType.Value(mkILNonGenericTySpec (tref))

let GetDynamicDependencyAttribute (g: TcGlobals) memberTypes ilType =
let GetDynamicDependencyAttribute (g: TcGlobals) memberTypes (ilType: ILType) =
let tref = g.attrib_DynamicDependencyAttribute.TypeRef

g.TryEmbedILType(
Expand All @@ -214,7 +214,12 @@ let GetDynamicDependencyAttribute (g: TcGlobals) memberTypes ilType =
let typIlMemberTypes =
ILType.Value(mkILNonGenericTySpec (g.enum_DynamicallyAccessedMemberTypes.TypeRef))

mkILCustomAttribute (tref, [ typIlMemberTypes; g.ilg.typ_Type ], [ ILAttribElem.Int32 memberTypes; ILAttribElem.Type(Some ilType) ], [])
mkILCustomAttribute (
tref,
[ typIlMemberTypes; g.ilg.typ_Type ],
[ ILAttribElem.Int32 memberTypes; ILAttribElem.TypeRef(Some ilType.TypeRef) ],
[]
)

/// Generate "modreq([mscorlib]System.Runtime.InteropServices.InAttribute)" on inref types.
let GenReadOnlyModReqIfNecessary (g: TcGlobals) ty ilTy =
Expand Down
6 changes: 5 additions & 1 deletion ...p.Compiler.ComponentTests/Conformance/DeclarationElements/CustomAttributes/Basic/Basic.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,4 +339,8 @@ module Basic =
|> verifyCompile
|> shouldSucceed


[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"EnsureValidCustomAttributeBlob.fs"|])>]
let ``EnsureValidCustomAttributeBlob_fs`` compilation =
compilation
|> verifyCompileAndRun
|> shouldSucceed
6 changes: 6 additions & 0 deletions .../Conformance/DeclarationElements/CustomAttributes/Basic/EnsureValidCustomAttributeBlob.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
open System
open System.Reflection
open FSharp.Collections

let attributes = typeof<List<int>>.GetConstructor(BindingFlags.NonPublic ||| BindingFlags.Instance, Unchecked.defaultof<Binder>, Type.EmptyTypes, [||]).GetCustomAttributes()
for a in attributes do Console.WriteLine(a.ToString())
4 changes: 2 additions & 2 deletions tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/Compare07.fsx.il.net472.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
!a item2) cil managed
{
.custom instance void System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute::.ctor(valuetype System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes,
class [runtime]System.Type) = ( 01 00 60 06 00 00 43 43 6F 6D 70 61 72 65 30 37
class [runtime]System.Type) = ( 01 00 60 06 00 00 3D 43 6F 6D 70 61 72 65 30 37
2B 43 6F 6D 70 61 72 65 4D 69 63 72 6F 50 65 72
66 41 6E 64 43 6F 64 65 47 65 6E 65 72 61 74 69
6F 6E 54 65 73 74 73 2B 47 65 6E 65 72 69 63 4B
65 79 60 31 5B 5B 21 30 5D 5D 00 00 )
65 79 60 31 00 00 )
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )

Expand Down
4 changes: 2 additions & 2 deletions ...s/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/Compare07.fsx.il.netcore.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
!a item2) cil managed
{
.custom instance void [runtime]System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute::.ctor(valuetype [runtime]System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes,
class [runtime]System.Type) = ( 01 00 60 06 00 00 43 43 6F 6D 70 61 72 65 30 37
class [runtime]System.Type) = ( 01 00 60 06 00 00 3D 43 6F 6D 70 61 72 65 30 37
2B 43 6F 6D 70 61 72 65 4D 69 63 72 6F 50 65 72
66 41 6E 64 43 6F 64 65 47 65 6E 65 72 61 74 69
6F 6E 54 65 73 74 73 2B 47 65 6E 65 72 69 63 4B
65 79 60 31 5B 5B 21 30 5D 5D 00 00 )
65 79 60 31 00 00 )
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )

Expand Down
4 changes: 2 additions & 2 deletions tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/Equals06.fsx.il.net472.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
!a item2) cil managed
{
.custom instance void System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute::.ctor(valuetype System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes,
class [runtime]System.Type) = ( 01 00 60 06 00 00 41 45 71 75 61 6C 73 30 36 2B
class [runtime]System.Type) = ( 01 00 60 06 00 00 3B 45 71 75 61 6C 73 30 36 2B
45 71 75 61 6C 73 4D 69 63 72 6F 50 65 72 66 41
6E 64 43 6F 64 65 47 65 6E 65 72 61 74 69 6F 6E
54 65 73 74 73 2B 47 65 6E 65 72 69 63 4B 65 79
60 31 5B 5B 21 30 5D 5D 00 00 )
60 31 00 00 )
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )

Expand Down
4 changes: 2 additions & 2 deletions tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/Equals06.fsx.il.netcore.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
!a item2) cil managed
{
.custom instance void [runtime]System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute::.ctor(valuetype [runtime]System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes,
class [runtime]System.Type) = ( 01 00 60 06 00 00 41 45 71 75 61 6C 73 30 36 2B
class [runtime]System.Type) = ( 01 00 60 06 00 00 3B 45 71 75 61 6C 73 30 36 2B
45 71 75 61 6C 73 4D 69 63 72 6F 50 65 72 66 41
6E 64 43 6F 64 65 47 65 6E 65 72 61 74 69 6F 6E
54 65 73 74 73 2B 47 65 6E 65 72 69 63 4B 65 79
60 31 5B 5B 21 30 5D 5D 00 00 )
60 31 00 00 )
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )

Expand Down
5 changes: 2 additions & 3 deletions tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/Hash09.fsx.il.net472.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,10 @@
!a item2) cil managed
{
.custom instance void System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute::.ctor(valuetype System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes,
class [runtime]System.Type) = ( 01 00 60 06 00 00 3D 48 61 73 68 30 39 2B 48 61
class [runtime]System.Type) = ( 01 00 60 06 00 00 37 48 61 73 68 30 39 2B 48 61
73 68 4D 69 63 72 6F 50 65 72 66 41 6E 64 43 6F
64 65 47 65 6E 65 72 61 74 69 6F 6E 54 65 73 74
73 2B 47 65 6E 65 72 69 63 4B 65 79 60 31 5B 5B
21 30 5D 5D 00 00 )
73 2B 47 65 6E 65 72 69 63 4B 65 79 60 31 00 00 )
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )

Expand Down
Loading