Skip to content

Do less work when resolving members of types #79784

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

Merged
merged 1 commit into from
Dec 17, 2022
Merged

Do less work when resolving members of types #79784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions src/coreclr/tools/Common/TypeSystem/Ecma/EcmaModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
using System.Reflection.Metadata.Ecma335;
using System.Reflection.PortableExecutable;

using Debug = System.Diagnostics.Debug;

namespace Internal.TypeSystem.Ecma
{
public partial class EcmaModule : ModuleDesc
Expand Down Expand Up @@ -376,6 +378,26 @@ public FieldDesc GetField(EntityHandle handle)
return field;
}

internal EcmaField GetField(FieldDefinitionHandle handle, EcmaType owningType)
{
if (!_resolvedTokens.TryGetValue(handle, out IEntityHandleObject result))
{
Debug.Assert(_metadataReader.GetFieldDefinition(handle).GetDeclaringType() == owningType.Handle);
result = _resolvedTokens.AddOrGetExisting(new EcmaField(owningType, handle));
}
return (EcmaField)result;
}

internal EcmaMethod GetMethod(MethodDefinitionHandle handle, EcmaType owningType)
{
if (!_resolvedTokens.TryGetValue(handle, out IEntityHandleObject result))
{
Debug.Assert(_metadataReader.GetMethodDefinition(handle).GetDeclaringType() == owningType.Handle);
result = _resolvedTokens.AddOrGetExisting(new EcmaMethod(owningType, handle));
}
return (EcmaMethod)result;
}

public object GetObject(EntityHandle handle, NotFoundBehavior notFoundBehavior = NotFoundBehavior.Throw)
{
IEntityHandleObject obj = _resolvedTokens.GetOrCreateValue(handle);
Expand Down
18 changes: 9 additions & 9 deletions src/coreclr/tools/Common/TypeSystem/Ecma/EcmaType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public override IEnumerable<MethodDesc> GetMethods()
{
foreach (var handle in _typeDefinition.GetMethods())
{
yield return (EcmaMethod)_module.GetObject(handle);
yield return _module.GetMethod(handle, this);
}
}

Expand All @@ -316,7 +316,7 @@ public override IEnumerable<MethodDesc> GetVirtualMethods()
{
MethodDefinition methodDef = reader.GetMethodDefinition(handle);
if ((methodDef.Attributes & MethodAttributes.Virtual) != 0)
yield return (EcmaMethod)_module.GetObject(handle);
yield return _module.GetMethod(handle, this);
}
}

Expand All @@ -329,7 +329,7 @@ public override MethodDesc GetMethod(string name, MethodSignature signature, Ins
{
if (stringComparer.Equals(metadataReader.GetMethodDefinition(handle).Name, name))
{
var method = (EcmaMethod)_module.GetObject(handle);
var method = _module.GetMethod(handle, this);
if (signature == null || signature.Equals(method.Signature.ApplySubstitution(substitution)))
return method;
}
Expand All @@ -349,7 +349,7 @@ public override MethodDesc GetStaticConstructor()
if (methodDefinition.Attributes.IsRuntimeSpecialName() &&
stringComparer.Equals(methodDefinition.Name, ".cctor"))
{
var method = (EcmaMethod)_module.GetObject(handle);
var method = _module.GetMethod(handle, this);
return method;
}
}
Expand All @@ -372,7 +372,7 @@ public override MethodDesc GetDefaultConstructor()
if (attributes.IsRuntimeSpecialName() && attributes.IsPublic()
&& stringComparer.Equals(methodDefinition.Name, ".ctor"))
{
var method = (EcmaMethod)_module.GetObject(handle);
var method = _module.GetMethod(handle, this);
MethodSignature sig = method.Signature;

if (sig.Length != 0)
Expand Down Expand Up @@ -424,7 +424,7 @@ public override IEnumerable<FieldDesc> GetFields()
{
foreach (var handle in _typeDefinition.GetFields())
{
var field = (EcmaField)_module.GetObject(handle);
var field = _module.GetField(handle, this);
yield return field;
}
}
Expand All @@ -438,7 +438,7 @@ public override TypeDesc UnderlyingType

foreach (var handle in _typeDefinition.GetFields())
{
var field = (EcmaField)_module.GetObject(handle);
var field = _module.GetField(handle, this);
if (!field.IsStatic)
return field.FieldType;
}
Expand All @@ -456,7 +456,7 @@ public override FieldDesc GetField(string name)
{
if (stringComparer.Equals(metadataReader.GetFieldDefinition(handle).Name, name))
{
var field = (EcmaField)_module.GetObject(handle);
var field = _module.GetField(handle, this);
return field;
}
}
Expand Down Expand Up @@ -560,7 +560,7 @@ public override ClassLayoutMetadata GetClassLayout()
// Note: GetOffset() returns -1 when offset was not set in the metadata
int specifiedOffset = fieldDefinition.GetOffset();
result.Offsets[index] =
new FieldAndOffset((EcmaField)_module.GetObject(handle), specifiedOffset == -1 ? FieldAndOffset.InvalidOffset : new LayoutInt(specifiedOffset));
new FieldAndOffset(_module.GetField(handle, this), specifiedOffset == -1 ? FieldAndOffset.InvalidOffset : new LayoutInt(specifiedOffset));

index++;
}
Expand Down