Skip to content

Remove ResolveXHandle indirections #45292

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
jkotas merged 8 commits into from
Dec 2, 2020
Merged

Remove ResolveXHandle indirections #45292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
715b566
Remove internal redirection for RuntimeTypeHandle
benaadams Nov 28, 2020
101d7b7
Remove internal redirection for RuntimeFieldHandle
benaadams Nov 28, 2020
7257ded
Remove internal redirection for RuntimeMethodHandle
benaadams Nov 28, 2020
8ecc156
Feedback
benaadams Nov 29, 2020
444f99c
Add null token tests
benaadams Nov 29, 2020
80e9656
Apply suggestions from code review
benaadams Nov 30, 2020
357f67a
Remove .ToPointer()
benaadams Nov 30, 2020
68da9b0
Feedback
benaadams Dec 1, 2020
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
2 changes: 1 addition & 1 deletion src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Associates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ internal static bool IncludeAccessor(MethodInfo? associate, bool nonPublic)
}
}

RuntimeMethodHandleInternal associateMethodHandle = ModuleHandle.ResolveMethodHandleInternalCore(RuntimeTypeHandle.GetModule(declaredType), tkMethod, genericArgumentHandles, genericArgumentCount, null, 0);
RuntimeMethodHandleInternal associateMethodHandle = ModuleHandle.ResolveMethodHandleInternal(RuntimeTypeHandle.GetModule(declaredType), tkMethod, genericArgumentHandles, genericArgumentCount, null, 0);
Debug.Assert(!associateMethodHandle.IsNullHandle(), "Failed to resolve associateRecord methodDef token");

if (isInherited)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/System.Private.CoreLib/src/System/Reflection/CustomAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ private static bool FilterCustomAttributeRecord(
}
else
{
ctorWithParameters = ModuleHandle.ResolveMethodHandleInternal(decoratedModule.GetNativeHandle(), caCtorToken);
ctorWithParameters = new ModuleHandle(decoratedModule).ResolveMethodHandle(caCtorToken).GetMethodInfo();
}
}

Expand Down
104 changes: 57 additions & 47 deletions src/coreclr/src/System.Private.CoreLib/src/System/Reflection/RuntimeModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,9 @@ public override byte[] ResolveSignature(int metadataToken)
[RequiresUnreferencedCode("Trimming changes metadata tokens")]
public override MethodBase? ResolveMethod(int metadataToken, Type[]? genericTypeArguments, Type[]? genericMethodArguments)
{
MetadataToken tk = new MetadataToken(metadataToken);

if (!MetadataImport.IsValidToken(tk))
throw new ArgumentOutOfRangeException(nameof(metadataToken),
SR.Format(SR.Argument_InvalidToken, tk, this));

RuntimeTypeHandle[]? typeArgs = ConvertToTypeHandleArray(genericTypeArguments);
RuntimeTypeHandle[]? methodArgs = ConvertToTypeHandleArray(genericMethodArguments);

try
{
MetadataToken tk = new MetadataToken(metadataToken);
if (!tk.IsMethodDef && !tk.IsMethodSpec)
{
if (!tk.IsMemberRef)
Expand All @@ -112,13 +104,26 @@ public override byte[] ResolveSignature(int metadataToken)
{
ConstArray sig = MetadataImport.GetMemberRefProps(tk);

if (*(MdSigCallingConvention*)sig.Signature.ToPointer() == MdSigCallingConvention.Field)
if (*(MdSigCallingConvention*)sig.Signature == MdSigCallingConvention.Field)
throw new ArgumentException(SR.Format(SR.Argument_ResolveMethod, tk, this),
nameof(metadataToken));
}
}

IRuntimeMethodInfo methodHandle = ModuleHandle.ResolveMethodHandleInternal(GetNativeHandle(), tk, typeArgs, methodArgs);
RuntimeTypeHandle[]? typeArgs = null;
RuntimeTypeHandle[]? methodArgs = null;
if (genericTypeArguments?.Length > 0)
{
typeArgs = ConvertToTypeHandleArray(genericTypeArguments);
}
if (genericMethodArguments?.Length > 0)
{
methodArgs = ConvertToTypeHandleArray(genericMethodArguments);
}

ModuleHandle moduleHandle = new ModuleHandle(GetNativeHandle());
IRuntimeMethodInfo methodHandle = moduleHandle.ResolveMethodHandle(tk, typeArgs, methodArgs).GetMethodInfo();

Type declaringType = RuntimeMethodHandle.GetDeclaringType(methodHandle);

if (declaringType.IsGenericType || declaringType.IsArray)
Expand All @@ -131,7 +136,7 @@ public override byte[] ResolveSignature(int metadataToken)
declaringType = ResolveType(tkDeclaringType, genericTypeArguments, genericMethodArguments);
}

return System.RuntimeType.GetMethodBase(declaringType as RuntimeType, methodHandle);
return RuntimeType.GetMethodBase(declaringType as RuntimeType, methodHandle);
}
catch (BadImageFormatException e)
{
Expand Down Expand Up @@ -171,19 +176,26 @@ public override byte[] ResolveSignature(int metadataToken)
[RequiresUnreferencedCode("Trimming changes metadata tokens")]
public override FieldInfo? ResolveField(int metadataToken, Type[]? genericTypeArguments, Type[]? genericMethodArguments)
{
MetadataToken tk = new MetadataToken(metadataToken);

if (!MetadataImport.IsValidToken(tk))
throw new ArgumentOutOfRangeException(nameof(metadataToken),
SR.Format(SR.Argument_InvalidToken, tk, this));

RuntimeTypeHandle[]? typeArgs = ConvertToTypeHandleArray(genericTypeArguments);
RuntimeTypeHandle[]? methodArgs = ConvertToTypeHandleArray(genericMethodArguments);

try
{
IRuntimeFieldInfo fieldHandle;
MetadataToken tk = new MetadataToken(metadataToken);

if (!MetadataImport.IsValidToken(tk))
throw new ArgumentOutOfRangeException(nameof(metadataToken),
SR.Format(SR.Argument_InvalidToken, tk, this));

RuntimeTypeHandle[]? typeArgs = null;
RuntimeTypeHandle[]? methodArgs = null;
if (genericTypeArguments?.Length > 0)
{
typeArgs = ConvertToTypeHandleArray(genericTypeArguments);
}
if (genericMethodArguments?.Length > 0)
{
methodArgs = ConvertToTypeHandleArray(genericMethodArguments);
}

ModuleHandle moduleHandle = new ModuleHandle(this);
if (!tk.IsFieldDef)
{
if (!tk.IsMemberRef)
Expand All @@ -194,15 +206,14 @@ public override byte[] ResolveSignature(int metadataToken)
{
ConstArray sig = MetadataImport.GetMemberRefProps(tk);

if (*(MdSigCallingConvention*)sig.Signature.ToPointer() != MdSigCallingConvention.Field)
if (*(MdSigCallingConvention*)sig.Signature != MdSigCallingConvention.Field)
throw new ArgumentException(SR.Format(SR.Argument_ResolveField, tk, this),
nameof(metadataToken));
}

fieldHandle = ModuleHandle.ResolveFieldHandleInternal(GetNativeHandle(), tk, typeArgs, methodArgs);
}

fieldHandle = ModuleHandle.ResolveFieldHandleInternal(GetNativeHandle(), metadataToken, typeArgs, methodArgs);
IRuntimeFieldInfo fieldHandle = moduleHandle.ResolveFieldHandle(metadataToken, typeArgs, methodArgs).GetRuntimeFieldInfo();

RuntimeType declaringType = RuntimeFieldHandle.GetApproxDeclaringType(fieldHandle.Value);

if (declaringType.IsGenericType || declaringType.IsArray)
Expand All @@ -211,11 +222,11 @@ public override byte[] ResolveSignature(int metadataToken)
declaringType = (RuntimeType)ResolveType(tkDeclaringType, genericTypeArguments, genericMethodArguments);
}

return System.RuntimeType.GetFieldInfo(declaringType, fieldHandle);
return RuntimeType.GetFieldInfo(declaringType, fieldHandle);
}
catch (MissingFieldException)
{
return ResolveLiteralField(tk, genericTypeArguments, genericMethodArguments);
return ResolveLiteralField(metadataToken, genericTypeArguments, genericMethodArguments);
}
catch (BadImageFormatException e)
{
Expand All @@ -226,29 +237,28 @@ public override byte[] ResolveSignature(int metadataToken)
[RequiresUnreferencedCode("Trimming changes metadata tokens")]
public override Type ResolveType(int metadataToken, Type[]? genericTypeArguments, Type[]? genericMethodArguments)
{
MetadataToken tk = new MetadataToken(metadataToken);

if (tk.IsGlobalTypeDefToken)
throw new ArgumentException(SR.Format(SR.Argument_ResolveModuleType, tk), nameof(metadataToken));

if (!MetadataImport.IsValidToken(tk))
throw new ArgumentOutOfRangeException(nameof(metadataToken),
SR.Format(SR.Argument_InvalidToken, tk, this));

if (!tk.IsTypeDef && !tk.IsTypeSpec && !tk.IsTypeRef)
throw new ArgumentException(SR.Format(SR.Argument_ResolveType, tk, this), nameof(metadataToken));

RuntimeTypeHandle[]? typeArgs = ConvertToTypeHandleArray(genericTypeArguments);
RuntimeTypeHandle[]? methodArgs = ConvertToTypeHandleArray(genericMethodArguments);

try
{
Type t = GetModuleHandleImpl().ResolveTypeHandle(metadataToken, typeArgs, methodArgs).GetRuntimeType();
MetadataToken tk = new MetadataToken(metadataToken);

if (tk.IsGlobalTypeDefToken)
throw new ArgumentException(SR.Format(SR.Argument_ResolveModuleType, tk), nameof(metadataToken));

if (t == null)
if (!tk.IsTypeDef && !tk.IsTypeSpec && !tk.IsTypeRef)
throw new ArgumentException(SR.Format(SR.Argument_ResolveType, tk, this), nameof(metadataToken));

return t;
RuntimeTypeHandle[]? typeArgs = null;
RuntimeTypeHandle[]? methodArgs = null;
if (genericTypeArguments?.Length > 0)
{
typeArgs = ConvertToTypeHandleArray(genericTypeArguments);
}
if (genericMethodArguments?.Length > 0)
{
methodArgs = ConvertToTypeHandleArray(genericMethodArguments);
}

return GetModuleHandleImpl().ResolveTypeHandle(metadataToken, typeArgs, methodArgs).GetRuntimeType();
}
catch (BadImageFormatException e)
{
Expand Down Expand Up @@ -286,7 +296,7 @@ public override Type ResolveType(int metadataToken, Type[]? genericTypeArguments

unsafe
{
if (*(MdSigCallingConvention*)sig.Signature.ToPointer() == MdSigCallingConvention.Field)
if (*(MdSigCallingConvention*)sig.Signature == MdSigCallingConvention.Field)
{
return ResolveField(tk, genericTypeArguments, genericMethodArguments);
}
Expand Down
Loading