Skip to content

[release/6.0] [mono] Fix regression introduced by PR 55726 #58255

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
akoeplinger merged 1 commit into from
Aug 27, 2021
Merged

[release/6.0] [mono] Fix regression introduced by PR 55726 #58255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
[mono] Fix regression introduced by PR 55726 
* Fix endless recursion in AssemblyBuilder.GetCustomAttributesData()
  and ModuleBuilder.GetCustomAttributesData()

* Re-enable test cases that now pass on Mono
  • Loading branch information
@uweigand
uweigand authored and github-actions committed Aug 27, 2021
commit 52909f9e14df5c09572e287ef4dbb08c75c53967
2 changes: 0 additions & 2 deletions src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public static IEnumerable<object[]> DefineDynamicAssembly_TestData()
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/2389", TestRuntimes.Mono)]
[MemberData(nameof(DefineDynamicAssembly_TestData))]
public void DefineDynamicAssembly_AssemblyName_AssemblyBuilderAccess(AssemblyName name, AssemblyBuilderAccess access)
{
Expand All @@ -57,7 +56,6 @@ public static IEnumerable<object[]> DefineDynamicAssembly_CustomAttributes_TestD
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/2389", TestRuntimes.Mono)]
[MemberData(nameof(DefineDynamicAssembly_CustomAttributes_TestData))]
public void DefineDynamicAssembly_AssemblyName_AssemblyBuilderAccess_CustomAttributeBuilder(AssemblyName name, AssemblyBuilderAccess access, IEnumerable<CustomAttributeBuilder> attributes)
{
Expand Down
2 changes: 1 addition & 1 deletion src/mono/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ public override bool IsDefined(Type attributeType, bool inherit) =>
public override object[] GetCustomAttributes(Type attributeType, bool inherit) =>
CustomAttribute.GetCustomAttributes(this, attributeType, inherit);

public override IList<CustomAttributeData> GetCustomAttributesData() => CustomAttributeData.GetCustomAttributes(this);
public override IList<CustomAttributeData> GetCustomAttributesData() => CustomAttribute.GetCustomAttributesData(this);
}
}
#endif
2 changes: 1 addition & 1 deletion src/mono/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)

public override IList<CustomAttributeData> GetCustomAttributesData()
{
return CustomAttributeData.GetCustomAttributes(this);
return CustomAttribute.GetCustomAttributesData(this);
}

[RequiresUnreferencedCode("Fields might be removed")]
Expand Down