Compare commits

...

2 Commits

4 changed files with 24 additions and 14 deletions
+2 -2
View File
@@ -8,12 +8,12 @@
{
"unity_version":"2021",
"hybridclr" : { "branch":"v3.3.1"},
"il2cpp_plus": { "branch":"v2021-3.3.1"}
"il2cpp_plus": { "branch":"v2021-3.3.2"}
},
{
"unity_version":"2022",
"hybridclr" : { "branch":"v3.3.1"},
"il2cpp_plus": { "branch":"v2022-3.3.1"}
"il2cpp_plus": { "branch":"v2022-3.3.2"}
}
]
}
+7 -11
View File
@@ -58,15 +58,15 @@ namespace HybridCLR.Editor.AOT
return;
}
gc = gc.ToGenericShare();
if (_genericTypes.Add(gc) && NeedWalk(gc.Type))
if (_genericTypes.Add(gc) && NeedWalk(null, gc.Type))
{
WalkType(gc);
}
}
private bool NeedWalk(TypeDef type)
private bool NeedWalk(MethodDef callFrom, TypeDef type)
{
return _hotUpdateAssemblyFiles.Contains(type.Module.Name);
return _hotUpdateAssemblyFiles.Contains(type.Module.Name) || callFrom == null || callFrom.HasGenericParameters;
}
private bool IsAotType(TypeDef type)
@@ -85,7 +85,7 @@ namespace HybridCLR.Editor.AOT
{
return;
}
if (_genericMethods.Add(method) && NeedWalk(method.Method.DeclaringType))
if (NeedWalk(methodDef, method.Method.DeclaringType) && _genericMethods.Add(method))
{
_newMethods.Add(method);
}
@@ -101,7 +101,7 @@ namespace HybridCLR.Editor.AOT
{
return;
}
if (_genericMethods.Add(method) && NeedWalk(method.Method.DeclaringType))
if (NeedWalk(null, method.Method.DeclaringType) && _genericMethods.Add(method))
{
_newMethods.Add(method);
}
@@ -157,9 +157,9 @@ namespace HybridCLR.Editor.AOT
for (uint rid = 1, n = ass.Metadata.TablesStream.TypeSpecTable.Rows; rid <= n; rid++)
{
var ts = ass.ResolveTypeSpec(rid);
if (!ts.ContainsGenericParameter)
var cs = GenericClass.ResolveClass(ts, null)?.ToGenericShare();
if (cs != null)
{
var cs = GenericClass.ResolveClass(ts, null)?.ToGenericShare();
TryAddAndWalkGenericType(cs);
}
}
@@ -167,10 +167,6 @@ namespace HybridCLR.Editor.AOT
for (uint rid = 1, n = ass.Metadata.TablesStream.MethodSpecTable.Rows; rid <= n; rid++)
{
var ms = ass.ResolveMethodSpec(rid);
if (ms.DeclaringType.ContainsGenericParameter || ms.GenericInstMethodSig.ContainsGenericParameter)
{
continue;
}
var gm = GenericMethod.ResolveMethod(ms, null)?.ToGenericShare();
TryAddMethodNotWalkType(gm);
}
+14
View File
@@ -1,5 +1,19 @@
# 发布日志
## 3.4.2
发布日期 2023.08.14。
### Runtime
- [fix] 修复RawImage::LoadTables读取_4byteGUIDIndex的bug
- [version] 支持2022.3.7版本
- [version] 支持2021.3.29版本
### Editor
- [fix] 修复计算AOTGenericReference未考虑到泛型调用泛型的情况,导致少计算了泛型及补充元数据
## 3.4.1
发布日期 2023.07.31。
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "com.code-philosophy.hybridclr",
"version": "3.4.1",
"version": "3.4.2",
"displayName": "HybridCLR",
"description": "HybridCLR is a fully featured, zero-cost, high-performance, low-memory solution for Unity's all-platform native c# hotupdate.",
"category": "Runtime",