fix generic attribute bug when generic attribute has parameters and the parameters...

* fix generic attribute bug

* add missing test cases

diff --git a/src/vm/customattribute.cpp b/src/vm/customattribute.cpp
index 6edda67..2c99785 100644 (file)
--- a/src/vm/customattribute.cpp
+++ b/src/vm/customattribute.cpp
@@ -768,7 +768,7 @@ FCIMPL6(LPVOID, COMCustomAttribute::CreateCaObject, ReflectModuleBaseObject* pAt
         memset((void*)argToProtect, 0, cArgs * sizeof(OBJECTREF));
 
         // load the this pointer
-        argToProtect[0] = pCtorMD->GetMethodTable()->Allocate(); // this is the value to return after the ctor invocation
+        argToProtect[0] = gc.refCaType->GetType().GetMethodTable()->Allocate(); // this is the value to return after the ctor invocation
 
         if (pBlob) 
         {

diff --git a/tests/src/reflection/GenericAttribute/GenericAttributeTests.cs b/tests/src/reflection/GenericAttribute/GenericAttributeTests.cs
index 762f011..f930570 100644 (file)
--- a/tests/src/reflection/GenericAttribute/GenericAttributeTests.cs
+++ b/tests/src/reflection/GenericAttribute/GenericAttributeTests.cs
@@ -133,6 +133,22 @@ class Program
         var b8 = ((ICustomAttributeProvider)programTypeInfo).GetCustomAttributes(typeof(MultiAttribute<bool?>), true);
         AssertAny(b8, a => (a as MultiAttribute<bool?>)?.Value == null);
 
+        var a9 = CustomAttributeExtensions.GetCustomAttributes<MultiAttribute<string>>(programTypeInfo, true);
+        AssertAny(a9, a => (a as MultiAttribute<string>)?.Value == "Ctor");
+        AssertAny(a9, a => (a as MultiAttribute<string>)?.Value == "Property");
+
+        var b9 = ((ICustomAttributeProvider)programTypeInfo).GetCustomAttributes(typeof(MultiAttribute<string>), true);
+        AssertAny(b9, a => (a as MultiAttribute<string>)?.Value == "Ctor");
+        AssertAny(b9, a => (a as MultiAttribute<string>)?.Value == "Property");
+
+        var a10 = CustomAttributeExtensions.GetCustomAttributes<MultiAttribute<Type>>(programTypeInfo, true);
+        AssertAny(a10, a => (a as MultiAttribute<Type>)?.Value == typeof(Class));
+        AssertAny(a10, a => (a as MultiAttribute<Type>)?.Value == typeof(Class.Derive));
+
+        var b10 = ((ICustomAttributeProvider)programTypeInfo).GetCustomAttributes(typeof(MultiAttribute<Type>), true);
+        AssertAny(b10, a => (a as MultiAttribute<Type>)?.Value == typeof(Class));
+        AssertAny(b10, a => (a as MultiAttribute<Type>)?.Value == typeof(Class.Derive));
+
         Assert(CustomAttributeExtensions.GetCustomAttributes(programTypeInfo, typeof(MultiAttribute<>), false) == null);
         Assert(CustomAttributeExtensions.GetCustomAttributes(programTypeInfo, typeof(MultiAttribute<>), true) == null);
         Assert(!((ICustomAttributeProvider)programTypeInfo).GetCustomAttributes(typeof(MultiAttribute<>), true).GetEnumerator().MoveNext());