-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
Support generic fields in PersistedAssemblyBuilder #110372
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copilot reviewed 2 out of 2 changed files in this pull request and generated no suggestions.
Comments skipped due to low confidence (1)
src/libraries/System.Reflection.Emit/tests/PersistedAssemblyBuilder/AssemblySaveTypeBuilderTests.cs:244
- The constructor call should use Type.EmptyTypes for clarity and to avoid potential issues with different runtime environments.
il.Emit(OpCodes.Newobj, declaringType.GetConstructor([]));
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2075:UnrecognizedReflectionPattern", Justification = "Internal reflection implementation")] | ||
static Type GetFieldType(FieldInfo fieldInfo) | ||
{ | ||
if (fieldInfo.DeclaringType!.IsGenericType) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (fieldInfo.DeclaringType!.IsGenericType) | |
if (fieldInfo.DeclaringType!.IsConstructedGenericType) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
memberHandle = AddMemberReference(field.Name, GetTypeHandle(declaringType), | ||
MetadataSignatureHelper.GetFieldSignature(field.FieldType, field.GetRequiredCustomModifiers(), field.GetOptionalCustomModifiers(), this)); | ||
MetadataSignatureHelper.GetFieldSignature(GetFieldType(field), field.GetRequiredCustomModifiers(), field.GetOptionalCustomModifiers(), this)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this use GetOriginalMemberIfConstructedType
like the method cases? GetOriginalMemberIfConstructedType
seems to be doing the same thing as the newly added method.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixes #110247
cc @jgh07
We will likely port to v9.x once verified in v10 since this was new functionality in v9.