Skip to content

Fix race condition in System.Reflection.FieldAccessor #99329

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
Mar 5, 2024
Merged

Fix race condition in System.Reflection.FieldAccessor #99329

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
16 changes: 8 additions & 8 deletions src/libraries/System.Private.CoreLib/src/System/Reflection/FieldAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ internal sealed class FieldAccessor
private readonly RtFieldInfo _fieldInfo;
private IntPtr _addressOrOffset;
private unsafe MethodTable* _methodTable;
private FieldAccessorType _fieldAccessType;
private volatile FieldAccessorType _fieldAccessType;

internal FieldAccessor(FieldInfo fieldInfo)
{
Expand Down Expand Up @@ -52,19 +52,19 @@ private void Initialize()
{
if (fieldType.IsEnum)
{
_fieldAccessType = GetPrimitiveAccessorTypeForStatic(fieldType.GetEnumUnderlyingType());
_methodTable = (MethodTable*)fieldType.TypeHandle.Value;
_fieldAccessType = GetPrimitiveAccessorTypeForStatic(fieldType.GetEnumUnderlyingType());
}
else if (RuntimeTypeHandle.GetCorElementType(fieldType) == CorElementType.ELEMENT_TYPE_VALUETYPE)
{
// The runtime stores non-primitive value types as a boxed value.
_fieldAccessType = FieldAccessorType.StaticValueTypeBoxed;
_methodTable = (MethodTable*)fieldType.TypeHandle.Value;
_fieldAccessType = FieldAccessorType.StaticValueTypeBoxed;
}
else
{
_fieldAccessType = GetPrimitiveAccessorTypeForStatic(fieldType);
_methodTable = (MethodTable*)fieldType.TypeHandle.Value;
_fieldAccessType = GetPrimitiveAccessorTypeForStatic(fieldType);
}
}
else if (fieldType.IsPointer)
Expand All @@ -73,8 +73,8 @@ private void Initialize()
}
else if (fieldType.IsFunctionPointer)
{
_fieldAccessType = GetIntPtrAccessorTypeForStatic();
_methodTable = (MethodTable*)typeof(IntPtr).TypeHandle.Value;
_fieldAccessType = GetIntPtrAccessorTypeForStatic();
}
else
{
Expand All @@ -87,22 +87,22 @@ private void Initialize()

if (fieldType.IsEnum)
{
_fieldAccessType = GetPrimitiveAccessorTypeForInstance(fieldType.GetEnumUnderlyingType());
_methodTable = (MethodTable*)fieldType.TypeHandle.Value;
_fieldAccessType = GetPrimitiveAccessorTypeForInstance(fieldType.GetEnumUnderlyingType());
}
else if (fieldType.IsValueType)
{
_fieldAccessType = GetPrimitiveAccessorTypeForInstance(fieldType);
_methodTable = (MethodTable*)fieldType.TypeHandle.Value;
_fieldAccessType = GetPrimitiveAccessorTypeForInstance(fieldType);
}
else if (fieldType.IsPointer)
{
_fieldAccessType = FieldAccessorType.InstancePointerType;
}
else if (fieldType.IsFunctionPointer)
{
_fieldAccessType = GetIntPtrAccessorTypeForInstance();
_methodTable = (MethodTable*)typeof(IntPtr).TypeHandle.Value;
_fieldAccessType = GetIntPtrAccessorTypeForInstance();
}
else
{
Expand Down