Browse Source

#2594: Add AnalyzerHelpers.IsPossibleReferenceTo for methods to speed MethodUsedByAnalyzer

pull/2643/head
Siegfried Pammer 3 years ago
parent
commit
4f6f7effd9
  1. 52
      ILSpy/Analyzers/AnalyzerHelpers.cs
  2. 12
      ILSpy/Analyzers/Builtin/MethodUsedByAnalyzer.cs

52
ILSpy/Analyzers/AnalyzerHelpers.cs

@ -0,0 +1,52 @@
// Copyright (c) 2018 Siegfried Pammer
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System.Reflection.Metadata;
using ICSharpCode.Decompiler.Metadata;
namespace ICSharpCode.ILSpy.Analyzers
{
using ICSharpCode.Decompiler.TypeSystem;
internal static class AnalyzerHelpers
{
public static bool IsPossibleReferenceTo(EntityHandle member, PEFile module, IMethod analyzedMethod)
{
if (member.IsNil)
return false;
MetadataReader metadata = module.Metadata;
switch (member.Kind)
{
case HandleKind.MethodDefinition:
return member == analyzedMethod.MetadataToken
&& module == analyzedMethod.ParentModule.PEFile;
case HandleKind.MemberReference:
var mr = metadata.GetMemberReference((MemberReferenceHandle)member);
if (mr.GetKind() != MemberReferenceKind.Method)
return false;
return metadata.StringComparer.Equals(mr.Name, analyzedMethod.Name);
case HandleKind.MethodSpecification:
var ms = metadata.GetMethodSpecification((MethodSpecificationHandle)member);
return IsPossibleReferenceTo(ms.Method, module, analyzedMethod);
default:
return false;
}
}
}
}

12
ILSpy/Analyzers/Builtin/MethodUsedByAnalyzer.cs

@ -117,7 +117,7 @@ namespace ICSharpCode.ILSpy.Analyzers.Builtin
var mainModule = (MetadataModule)method.ParentModule; var mainModule = (MetadataModule)method.ParentModule;
var blob = methodBody.GetILReader(); var blob = methodBody.GetILReader();
var baseMethod = InheritanceHelper.GetBaseMember(analyzedMethod); var baseMethod = (IMethod)InheritanceHelper.GetBaseMember(analyzedMethod);
var genericContext = new Decompiler.TypeSystem.GenericContext(); // type parameters don't matter for this analyzer var genericContext = new Decompiler.TypeSystem.GenericContext(); // type parameters don't matter for this analyzer
while (blob.RemainingBytes > 0) while (blob.RemainingBytes > 0)
@ -137,8 +137,13 @@ namespace ICSharpCode.ILSpy.Analyzers.Builtin
return false; // unexpected end of blob return false; // unexpected end of blob
} }
var member = MetadataTokenHelpers.EntityHandleOrNil(blob.ReadInt32()); var member = MetadataTokenHelpers.EntityHandleOrNil(blob.ReadInt32());
if (member.IsNil || !member.Kind.IsMemberKind()) if (!AnalyzerHelpers.IsPossibleReferenceTo(member, mainModule.PEFile, analyzedMethod))
{
if (baseMethod == null || !AnalyzerHelpers.IsPossibleReferenceTo(member, mainModule.PEFile, baseMethod))
{
continue; continue;
}
}
IMember m; IMember m;
try try
@ -159,14 +164,11 @@ namespace ICSharpCode.ILSpy.Analyzers.Builtin
return true; return true;
} }
} }
else
{
if (IsSameMember(analyzedMethod, m)) if (IsSameMember(analyzedMethod, m))
{ {
return true; return true;
} }
} }
}
return false; return false;
} }

Loading…
Cancel
Save