[refactor] 重构 AssemblyCache和 AssemblyReferenceDeepCollector,消除冗余代码
[fix] 修复裁剪aot dll中出现netstandard时,生成桥接函数异常的bugmain
parent
d90faed922
commit
3cea936aa4
|
@ -9,89 +9,12 @@ using UnityEngine;
|
||||||
|
|
||||||
namespace HybridCLR.Editor.Meta
|
namespace HybridCLR.Editor.Meta
|
||||||
{
|
{
|
||||||
public class AssemblyCache : IDisposable
|
public class AssemblyCache : AssemblyCacheBase
|
||||||
{
|
{
|
||||||
private readonly IAssemblyResolver _assemblyPathResolver;
|
|
||||||
private readonly ModuleContext _modCtx;
|
|
||||||
private readonly AssemblyResolver _asmResolver;
|
|
||||||
private bool disposedValue;
|
|
||||||
private bool _loadedNetstandard;
|
|
||||||
|
|
||||||
public Dictionary<string, ModuleDefMD> LoadedModules { get; } = new Dictionary<string, ModuleDefMD>();
|
public AssemblyCache(IAssemblyResolver assemblyResolver) : base(assemblyResolver)
|
||||||
|
{
|
||||||
|
|
||||||
public AssemblyCache(IAssemblyResolver assemblyResolver)
|
|
||||||
{
|
|
||||||
_assemblyPathResolver = assemblyResolver;
|
|
||||||
_modCtx = ModuleDef.CreateModuleContext();
|
|
||||||
_asmResolver = (AssemblyResolver)_modCtx.AssemblyResolver;
|
|
||||||
_asmResolver.EnableTypeDefCache = true;
|
|
||||||
_asmResolver.UseGAC = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModuleDefMD LoadModule(string moduleName, bool loadReferenceAssemblies = true)
|
|
||||||
{
|
|
||||||
// Debug.Log($"load module:{moduleName}");
|
|
||||||
if (LoadedModules.TryGetValue(moduleName, out var mod))
|
|
||||||
{
|
|
||||||
return mod;
|
|
||||||
}
|
|
||||||
if (moduleName == "netstandard")
|
|
||||||
{
|
|
||||||
if (!_loadedNetstandard)
|
|
||||||
{
|
|
||||||
LoadNetStandard();
|
|
||||||
_loadedNetstandard = true;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
mod = DoLoadModule(_assemblyPathResolver.ResolveAssembly(moduleName, true));
|
|
||||||
LoadedModules.Add(moduleName, mod);
|
|
||||||
|
|
||||||
if (loadReferenceAssemblies)
|
|
||||||
{
|
|
||||||
foreach (var refAsm in mod.GetAssemblyRefs())
|
|
||||||
{
|
|
||||||
LoadModule(refAsm.Name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return mod;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LoadNetStandard()
|
|
||||||
{
|
|
||||||
LoadModule("netstandard2.0", false);
|
|
||||||
LoadModule("netstandard2.1", false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ModuleDefMD DoLoadModule(string dllPath)
|
|
||||||
{
|
|
||||||
//Debug.Log($"do load module:{dllPath}");
|
|
||||||
ModuleDefMD mod = ModuleDefMD.Load(dllPath, _modCtx);
|
|
||||||
_asmResolver.AddToCache(mod);
|
|
||||||
return mod;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (!disposedValue)
|
|
||||||
{
|
|
||||||
if (disposing)
|
|
||||||
{
|
|
||||||
foreach(var mod in LoadedModules.Values)
|
|
||||||
{
|
|
||||||
mod.Dispose();
|
|
||||||
}
|
|
||||||
LoadedModules.Clear();
|
|
||||||
}
|
|
||||||
disposedValue = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
Dispose(disposing: true);
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,107 @@
|
||||||
|
using dnlib.DotNet;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace HybridCLR.Editor.Meta
|
||||||
|
{
|
||||||
|
public abstract class AssemblyCacheBase : IDisposable
|
||||||
|
{
|
||||||
|
private readonly IAssemblyResolver _assemblyPathResolver;
|
||||||
|
private readonly ModuleContext _modCtx;
|
||||||
|
private readonly AssemblyResolver _asmResolver;
|
||||||
|
private bool disposedValue;
|
||||||
|
private bool _loadedNetstandard;
|
||||||
|
|
||||||
|
public Dictionary<string, ModuleDefMD> LoadedModules { get; } = new Dictionary<string, ModuleDefMD>();
|
||||||
|
|
||||||
|
private readonly List<ModuleDefMD> _loadedModulesIncludeNetstandard = new List<ModuleDefMD>();
|
||||||
|
|
||||||
|
protected AssemblyCacheBase(IAssemblyResolver assemblyResolver)
|
||||||
|
{
|
||||||
|
_assemblyPathResolver = assemblyResolver;
|
||||||
|
_modCtx = ModuleDef.CreateModuleContext();
|
||||||
|
_asmResolver = (AssemblyResolver)_modCtx.AssemblyResolver;
|
||||||
|
_asmResolver.EnableTypeDefCache = true;
|
||||||
|
_asmResolver.UseGAC = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModuleDefMD LoadModule(string moduleName, bool loadReferenceAssemblies = true)
|
||||||
|
{
|
||||||
|
// Debug.Log($"load module:{moduleName}");
|
||||||
|
if (LoadedModules.TryGetValue(moduleName, out var mod))
|
||||||
|
{
|
||||||
|
return mod;
|
||||||
|
}
|
||||||
|
if (moduleName == "netstandard")
|
||||||
|
{
|
||||||
|
if (!_loadedNetstandard)
|
||||||
|
{
|
||||||
|
LoadNetStandard();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
mod = DoLoadModule(_assemblyPathResolver.ResolveAssembly(moduleName, true));
|
||||||
|
LoadedModules.Add(moduleName, mod);
|
||||||
|
|
||||||
|
if (loadReferenceAssemblies)
|
||||||
|
{
|
||||||
|
foreach (var refAsm in mod.GetAssemblyRefs())
|
||||||
|
{
|
||||||
|
LoadModule(refAsm.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return mod;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LoadNetStandard()
|
||||||
|
{
|
||||||
|
string netstandardDllPath = _assemblyPathResolver.ResolveAssembly("netstandard", false);
|
||||||
|
if (!string.IsNullOrEmpty(netstandardDllPath))
|
||||||
|
{
|
||||||
|
DoLoadModule(netstandardDllPath);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DoLoadModule(MetaUtil.ResolveNetStandardAssemblyPath("netstandard2.0"));
|
||||||
|
DoLoadModule(MetaUtil.ResolveNetStandardAssemblyPath("netstandard2.1"));
|
||||||
|
}
|
||||||
|
_loadedNetstandard = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ModuleDefMD DoLoadModule(string dllPath)
|
||||||
|
{
|
||||||
|
//Debug.Log($"do load module:{dllPath}");
|
||||||
|
ModuleDefMD mod = ModuleDefMD.Load(dllPath, _modCtx);
|
||||||
|
_asmResolver.AddToCache(mod);
|
||||||
|
_loadedModulesIncludeNetstandard.Add(mod);
|
||||||
|
return mod;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (!disposedValue)
|
||||||
|
{
|
||||||
|
if (disposing)
|
||||||
|
{
|
||||||
|
foreach (var mod in _loadedModulesIncludeNetstandard)
|
||||||
|
{
|
||||||
|
mod.Dispose();
|
||||||
|
}
|
||||||
|
_loadedModulesIncludeNetstandard.Clear();
|
||||||
|
LoadedModules.Clear();
|
||||||
|
}
|
||||||
|
disposedValue = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
Dispose(disposing: true);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3b01fa99119e72141bfee5628c0ffce1
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -9,18 +9,10 @@ using UnityEngine;
|
||||||
|
|
||||||
namespace HybridCLR.Editor.Meta
|
namespace HybridCLR.Editor.Meta
|
||||||
{
|
{
|
||||||
public class AssemblyReferenceDeepCollector : IDisposable
|
public class AssemblyReferenceDeepCollector : AssemblyCacheBase
|
||||||
{
|
{
|
||||||
private readonly IAssemblyResolver _assemblyPathResolver;
|
|
||||||
private readonly List<string> _rootAssemblies;
|
private readonly List<string> _rootAssemblies;
|
||||||
|
|
||||||
private readonly ModuleContext _modCtx;
|
|
||||||
private readonly AssemblyResolver _asmResolver;
|
|
||||||
private bool disposedValue;
|
|
||||||
private bool _loadedNetstandard;
|
|
||||||
|
|
||||||
public Dictionary<string, ModuleDefMD> LoadedModules { get; } = new Dictionary<string, ModuleDefMD>();
|
|
||||||
|
|
||||||
public IReadOnlyList<string> GetRootAssemblyNames()
|
public IReadOnlyList<string> GetRootAssemblyNames()
|
||||||
{
|
{
|
||||||
return _rootAssemblies;
|
return _rootAssemblies;
|
||||||
|
@ -41,14 +33,9 @@ namespace HybridCLR.Editor.Meta
|
||||||
return _rootAssemblies.Select(ass => LoadedModules[ass]).ToList();
|
return _rootAssemblies.Select(ass => LoadedModules[ass]).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public AssemblyReferenceDeepCollector(IAssemblyResolver assemblyResolver, List<string> rootAssemblies)
|
public AssemblyReferenceDeepCollector(IAssemblyResolver assemblyResolver, List<string> rootAssemblies) : base(assemblyResolver)
|
||||||
{
|
{
|
||||||
_assemblyPathResolver = assemblyResolver;
|
|
||||||
_rootAssemblies = rootAssemblies;
|
_rootAssemblies = rootAssemblies;
|
||||||
_modCtx = ModuleDef.CreateModuleContext();
|
|
||||||
_asmResolver = (AssemblyResolver)_modCtx.AssemblyResolver;
|
|
||||||
_asmResolver.EnableTypeDefCache = true;
|
|
||||||
_asmResolver.UseGAC = false;
|
|
||||||
LoadAllAssembiles();
|
LoadAllAssembiles();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,67 +46,5 @@ namespace HybridCLR.Editor.Meta
|
||||||
LoadModule(asm);
|
LoadModule(asm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModuleDefMD LoadModule(string moduleName)
|
|
||||||
{
|
|
||||||
// Debug.Log($"load module:{moduleName}");
|
|
||||||
if (LoadedModules.TryGetValue(moduleName, out var mod))
|
|
||||||
{
|
|
||||||
return mod;
|
|
||||||
}
|
|
||||||
if (moduleName == "netstandard")
|
|
||||||
{
|
|
||||||
if (!_loadedNetstandard)
|
|
||||||
{
|
|
||||||
LoadNetStandard();
|
|
||||||
_loadedNetstandard = true;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
mod = DoLoadModule(_assemblyPathResolver.ResolveAssembly(moduleName, true));
|
|
||||||
LoadedModules.Add(moduleName, mod);
|
|
||||||
|
|
||||||
foreach (var refAsm in mod.GetAssemblyRefs())
|
|
||||||
{
|
|
||||||
LoadModule(refAsm.Name);
|
|
||||||
}
|
|
||||||
return mod;
|
|
||||||
}
|
|
||||||
|
|
||||||
private ModuleDefMD DoLoadModule(string dllPath)
|
|
||||||
{
|
|
||||||
//Debug.Log($"do load module:{dllPath}");
|
|
||||||
ModuleDefMD mod = ModuleDefMD.Load(dllPath, _modCtx);
|
|
||||||
_asmResolver.AddToCache(mod);
|
|
||||||
return mod;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LoadNetStandard()
|
|
||||||
{
|
|
||||||
DoLoadModule(_assemblyPathResolver.ResolveAssembly("netstandard2.0", true));
|
|
||||||
DoLoadModule(_assemblyPathResolver.ResolveAssembly("netstandard2.1", true));
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (!disposedValue)
|
|
||||||
{
|
|
||||||
if (disposing)
|
|
||||||
{
|
|
||||||
foreach(var mod in LoadedModules.Values)
|
|
||||||
{
|
|
||||||
mod.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
LoadedModules.Clear();
|
|
||||||
disposedValue = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
Dispose(disposing: true);
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -170,11 +170,14 @@ namespace HybridCLR.Editor.Meta
|
||||||
{
|
{
|
||||||
return new CombinedAssemblyResolver(
|
return new CombinedAssemblyResolver(
|
||||||
CreateHotUpdateAssemblyResolver(target, hotUpdateDlls),
|
CreateHotUpdateAssemblyResolver(target, hotUpdateDlls),
|
||||||
CreateAOTAssemblyResolver(target),
|
CreateAOTAssemblyResolver(target)
|
||||||
new PathAssemblyResolver($"{SettingsUtil.HybridCLRDataPathInPackage}/NetStandard")
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string ResolveNetStandardAssemblyPath(string assemblyName)
|
||||||
|
{
|
||||||
|
return $"{SettingsUtil.HybridCLRDataPathInPackage}/NetStandard/{assemblyName}.dll";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static List<TypeSig> CreateDefaultGenericParams(ModuleDef module, int genericParamCount)
|
public static List<TypeSig> CreateDefaultGenericParams(ModuleDef module, int genericParamCount)
|
||||||
|
|
Loading…
Reference in New Issue