From a657d12f2e9fc47dad81f2609a72ff3bbcf1c28f Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 26 Aug 2021 19:40:31 +0200 Subject: [PATCH] [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 --- .../System.Reflection.Emit/tests/AssemblyBuilderTests.cs | 2 -- .../src/System/Reflection/Emit/AssemblyBuilder.Mono.cs | 2 +- .../src/System/Reflection/Emit/ModuleBuilder.Mono.cs | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs b/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs index a2a65d245993d4..cead567b67edd2 100644 --- a/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs +++ b/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs @@ -35,7 +35,6 @@ public static IEnumerable 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) { @@ -56,7 +55,6 @@ public static IEnumerable 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 attributes) { diff --git a/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.Mono.cs index 0c1d75229cf95f..9e9d0d90cbb977 100644 --- a/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.Mono.cs @@ -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 GetCustomAttributesData() => CustomAttributeData.GetCustomAttributes(this); + public override IList GetCustomAttributesData() => CustomAttribute.GetCustomAttributesData(this); } } #endif diff --git a/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.Mono.cs index 2c8a240f79b595..1e471e8b26805b 100644 --- a/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/ModuleBuilder.Mono.cs @@ -952,7 +952,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit) public override IList GetCustomAttributesData() { - return CustomAttributeData.GetCustomAttributes(this); + return CustomAttribute.GetCustomAttributesData(this); } [RequiresUnreferencedCode("Fields might be removed")]