Skip to content

Fix: Incorrect order of checks for TypeBuilder GetConstructor and GetField method #53645

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
eerhardt merged 16 commits into from
Nov 2, 2021
Merged

Fix: Incorrect order of checks for TypeBuilder GetConstructor and GetField method #53645

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d115433
Reorder checks for TypeBuilder.GetConstructor()
BartoszKlonowski May 31, 2021
22cf90a
Reorder checks for TypeBuilder.GetField()
BartoszKlonowski May 31, 2021
f2efe72
Adjust unit test to reordered TypeBuilder checks
BartoszKlonowski Jun 3, 2021
4940fc1
Use 'not' keyword for pattern matching
BartoszKlonowski Jun 14, 2021
3472615
Apply the same Type checks for Mono
BartoszKlonowski Jun 14, 2021
fd50ec9
Check whether a declaring type isn't type's generic definition
BartoszKlonowski Jul 13, 2021
6fcfbf5
Make generic type if contains generic parameters
BartoszKlonowski Jul 14, 2021
f039dc9
Suppres UnrecognizedReflectionPattern for GetField and GetConstructor
BartoszKlonowski Jul 14, 2021
863b984
Move GetMethodType validation method at original order
BartoszKlonowski Jul 26, 2021
f806283
Test GetConstructor against throwing an exception
BartoszKlonowski Jul 26, 2021
70f45eb
Fix: copy-paste error 'type' -> 'constructor'
BartoszKlonowski Jul 26, 2021
b2c2b4a
Align Mono and CoreCLR with nameof for GetConstructor
BartoszKlonowski Jul 27, 2021
98036aa
Use type for argument exception and test against type parameter
BartoszKlonowski Jul 27, 2021
474a10b
Merge remote-tracking branch 'upstream/main' into fix-typebuilder-che…
eerhardt Oct 4, 2021
23795a0
Get tests passing on both coreclr and mono.
eerhardt Oct 6, 2021
f7ed1ac
Fix mono exception messages to use SR resources.
eerhardt Nov 2, 2021
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
Prev Previous commit
Fix mono exception messages to use SR resources.
  • Loading branch information
@eerhardt
eerhardt committed Nov 2, 2021
commit f7ed1ac28a13162efe26baed9ef4006d6b93b904
20 changes: 10 additions & 10 deletions src/mono/System.Private.CoreLib/src/System/Reflection/Emit/TypeBuilder.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1850,16 +1850,16 @@ public GenericTypeParameterBuilder[] DefineGenericParameters(params string[] nam
public static ConstructorInfo GetConstructor(Type type, ConstructorInfo constructor)
{
if (!IsValidGetMethodType(type))
throw new ArgumentException("type must contain a TypeBuilder as a generic argument.", nameof(type));
throw new ArgumentException(SR.Argument_MustBeTypeBuilder, nameof(type));

if (type is TypeBuilder && type.ContainsGenericParameters)
type = type.MakeGenericType(type.GetGenericArguments());

if (!constructor.DeclaringType!.IsGenericTypeDefinition)
throw new ArgumentException("constructor declaring type is not a generic type definition", nameof(constructor));
throw new ArgumentException(SR.Argument_ConstructorNeedGenericDeclaringType, nameof(constructor));

if (constructor.DeclaringType != type.GetGenericTypeDefinition())
throw new ArgumentException("constructor declaring type is not the generic type definition of type", nameof(type));
throw new ArgumentException(SR.Argument_InvalidConstructorDeclaringType, nameof(type));

ConstructorInfo res = type.GetConstructor(constructor);
if (res == null)
Expand Down Expand Up @@ -1897,19 +1897,19 @@ private static bool IsValidGetMethodType(Type type)
public static MethodInfo GetMethod(Type type, MethodInfo method)
{
if (!IsValidGetMethodType(type))
throw new ArgumentException("type must contain a TypeBuilder as a generic argument.", nameof(type));
throw new ArgumentException(SR.Argument_MustBeTypeBuilder, nameof(type));

if (type is TypeBuilder && type.ContainsGenericParameters)
type = type.MakeGenericType(type.GetGenericArguments());

if (method.IsGenericMethod && !method.IsGenericMethodDefinition)
throw new ArgumentException("method must represent a generic method definition on a generic type definition.", nameof(method));
throw new ArgumentException(SR.Argument_NeedGenericMethodDefinition, nameof(method));

if (!method.DeclaringType!.IsGenericTypeDefinition)
throw new ArgumentException("method declaring type is not a generic type definition", nameof(method));
throw new ArgumentException(SR.Argument_MethodNeedGenericDeclaringType, nameof(method));

if (method.DeclaringType != type.GetGenericTypeDefinition())
throw new ArgumentException("method declaring type is not the generic type definition of type", nameof(type));
throw new ArgumentException(SR.Argument_InvalidMethodDeclaringType, nameof(type));

MethodInfo res = type.GetMethod(method);
if (res == null)
Expand All @@ -1923,16 +1923,16 @@ public static MethodInfo GetMethod(Type type, MethodInfo method)
public static FieldInfo GetField(Type type, FieldInfo field)
{
if (!IsValidGetMethodType(type))
throw new ArgumentException("type must contain a TypeBuilder as a generic argument.", nameof(type));
throw new ArgumentException(SR.Argument_MustBeTypeBuilder, nameof(type));

if (type is TypeBuilder && type.ContainsGenericParameters)
type = type.MakeGenericType(type.GetGenericArguments());

if (!field.DeclaringType!.IsGenericTypeDefinition)
throw new ArgumentException("field declaring type is not a generic type definition", nameof(field));
throw new ArgumentException(SR.Argument_FieldNeedGenericDeclaringType, nameof(field));

if (field.DeclaringType != type.GetGenericTypeDefinition())
throw new ArgumentException("field declaring type is not the generic type definition of type", nameof(type));
throw new ArgumentException(SR.Argument_InvalidFieldDeclaringType, nameof(type));

if (field is FieldOnTypeBuilderInst)
throw new ArgumentException("The specified field must be declared on a generic type definition.", nameof(field));
Expand Down