Skip to content

修复 特性获取 与 绑定泛型参数错误 #630

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

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

修复 特性获取 与 绑定泛型参数错误 #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d3fc202
初始化 参数 null
aghci Dec 20, 2021
cce351d
方法特性 获取
aghci Dec 20, 2021
170a3ef
修复 绑定 参数 泛型 错误
aghci Dec 22, 2021
1775841
Merge branch 'Ourpalm:master' into master
aghci Dec 22, 2021
7360bc2
Merge branch 'Ourpalm:master' into master
aghci Dec 29, 2021
72f1bb7
调整语法
aghci Feb 18, 2022
f368792
Merge branch 'Ourpalm:master' into master
aghci Feb 18, 2022
fc60a3e
Merge branch 'master' of github.com:eclipghc/ILRuntime
aghci Feb 18, 2022
b87c12a
Merge branch 'Ourpalm:master' into master
aghci May 30, 2022
e34b59f
Merge branch 'Ourpalm:master' into master
aghci Apr 18, 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
2 changes: 1 addition & 1 deletion ILRuntime/CLR/Method/ILMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ public List<IType> Parameters
{
get
{
if (def.HasParameters && parameters == null)
if (def.HasParameters || parameters == null)
{
InitParameters();
}
Expand Down
13 changes: 12 additions & 1 deletion ILRuntime/Reflection/ILRuntimeMethodInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,22 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
List<Attribute> res = new List<Attribute>();
for (int i = 0; i < customAttributes.Length; i++)
{
if (attributeTypes[i].Equals(attributeType))
if (attributeTypes[i].Equals(attributeType)||(inherit&&(attributeType.IsAssignableFrom(attributeTypes[i])||attributeTypes[i].BaseType!=null&&attributeType.IsAssignableFrom(attributeTypes[i].BaseType))))
res.Add(customAttributes[i]);
}
return res.ToArray();
}
public Object GetCustomAttribute ( Type oType, Boolean inherit ) => this.GetCustomAttributes ( oType, inherit ).FirstOrDefault ();
public T GetCustomAttribute<T> ( Boolean inherit ) where T : System.Attribute => this.GetCustomAttributes<T> ( inherit ).FirstOrDefault ();
public T [] GetCustomAttributes<T> ( Boolean inherit ) where T : System.Attribute
{
IList<T> aDataList = new List<T> ();
foreach ( T attribute in this.GetCustomAttributes ( inherit ) )
{
aDataList.Add ( attribute );
}
return aDataList.ToArray ();
}

public override MethodImplAttributes GetMethodImplementationFlags()
{
Expand Down
2 changes: 1 addition & 1 deletion ILRuntime/Runtime/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public static bool MatchGenericParameters(this Type[] args, Type type, Type q, T
if (q.IsGenericType)
{
var t1 = type.GetGenericTypeDefinition();
var t2 = type.GetGenericTypeDefinition();
var t2 = q.GetGenericTypeDefinition();
if (t1 == t2)
{
var argA = type.GetGenericArguments();
Expand Down