Skip to content
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.

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

Improve performance of ToMethodDescriptor #379

Merged
Merged
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions Cpp2IL.Core/Utils/AsmResolver/ContextToMethodDescriptor.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using AsmResolver.DotNet;
using AsmResolver.DotNet.Signatures;
using Cpp2IL.Core.Model.Contexts;
Expand Down Expand Up @@ -26,27 +26,27 @@ private static MethodSignature ToMethodSignature(this MethodAnalysisContext cont

public static IMethodDescriptor ToMethodDescriptor(this MethodAnalysisContext context, ModuleDefinition parentModule)
{
if (context is ConcreteGenericMethodAnalysisContext concreteMethod)
return context is ConcreteGenericMethodAnalysisContext concreteMethod
? concreteMethod.ToMethodDescriptor(parentModule)
: parentModule.DefaultImporter.ImportMethod(context.GetMethodDefinition());
}

public static IMethodDescriptor ToMethodDescriptor(this ConcreteGenericMethodAnalysisContext context, ModuleDefinition parentModule)
{
var memberReference = new MemberReference(
context.DeclaringType?.ToTypeSignature(parentModule).ToTypeDefOrRef(),
context.Name,
context.BaseMethodContext.ToMethodSignature(parentModule));

var methodGenericParameters = context.ResolveMethodGenericParameters();
if (methodGenericParameters.Length == 0)
{
var memberReference = new MemberReference(
concreteMethod.DeclaringType?.ToTypeSignature(parentModule).ToTypeDefOrRef(),
concreteMethod.Name,
concreteMethod.BaseMethodContext.ToMethodSignature(parentModule));

var methodGenericParameters = concreteMethod.ResolveMethodGenericParameters();
if (methodGenericParameters.Length == 0)
{
return parentModule.DefaultImporter.ImportMethod(memberReference);
}
else
{
var typeSignatures = methodGenericParameters.Select(p => p.ToTypeSignature(parentModule)).ToArray();
return parentModule.DefaultImporter.ImportMethod(memberReference.MakeGenericInstanceMethod(typeSignatures));
}
return parentModule.DefaultImporter.ImportMethod(memberReference);
}
else
{
return parentModule.DefaultImporter.ImportMethod(context.GetMethodDefinition());
var typeSignatures = methodGenericParameters.Select(p => p.ToTypeSignature(parentModule)).ToArray();
return parentModule.DefaultImporter.ImportMethod(memberReference.MakeGenericInstanceMethod(typeSignatures));
}
}
}
Loading