GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect field reference for reference types

Browse Source
This commit is contained in:
Ari Vuollet
2022-12-21 20:47:40 +02:00
parent 94c5211ee6
commit b449353d2f
1 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Source/Engine/Engine/NativeInterop.cs
View File

@@ -1203,14 +1203,17 @@ namespace FlaxEngine
/// </summary> /// </summary>
private static ref TField GetFieldReference<TField>(FieldInfo field, ref T fieldOwner) private static ref TField GetFieldReference<TField>(FieldInfo field, ref T fieldOwner)
{ {
Assert.IsTrue(!field.IsInitOnly);
// Get the address of the field, source: https://stackoverflow.com/a/56512720 // Get the address of the field, source: https://stackoverflow.com/a/56512720
byte* fieldPtr = (byte*)Unsafe.AsPointer(ref fieldOwner) + (Marshal.ReadInt32(field.FieldHandle.Value + 4 + IntPtr.Size) & 0xFFFFFF);
if (typeof(T).IsValueType) if (typeof(T).IsValueType)
{
byte* fieldPtr = (byte*)Unsafe.AsPointer(ref fieldOwner) + (Marshal.ReadInt32(field.FieldHandle.Value + 4 + IntPtr.Size) & 0xFFFFFF);
return ref Unsafe.AsRef<TField>(fieldPtr); return ref Unsafe.AsRef<TField>(fieldPtr);
}
else else
return ref Unsafe.AsRef<TField>(fieldPtr + IntPtr.Size); {
byte* fieldPtr = (byte*)Unsafe.As<T, IntPtr>(ref fieldOwner) + IntPtr.Size + (Marshal.ReadInt32(field.FieldHandle.Value + 4 + IntPtr.Size) & 0xFFFFFF);
return ref Unsafe.AsRef<TField>(fieldPtr);
}
} }
private static IntPtr EnsureAlignment(IntPtr ptr, int alignment) private static IntPtr EnsureAlignment(IntPtr ptr, int alignment)
@@ -1278,18 +1281,8 @@ namespace FlaxEngine
fieldOffset += (fieldPtr - startPtr).ToInt32(); fieldOffset += (fieldPtr - startPtr).ToInt32();
} }
if (field.IsInitOnly) ref TField fieldValueRef = ref GetFieldReference<TField>(field, ref fieldOwner);
{ MarshalHelperValueType<TField>.ToNative(ref fieldValueRef, fieldPtr);
//TypedReference ownerRef = __makeref(fieldOwner);
//TField fieldValue = (TField)field.GetValueDirect(ownerRef);
TField fieldValue = (TField)field.GetValue(fieldOwner);
MarshalHelperValueType<TField>.ToNative(ref fieldValue, fieldPtr);
}
else
{
ref TField fieldValueRef = ref GetFieldReference<TField>(field, ref fieldOwner);
MarshalHelperValueType<TField>.ToNative(ref fieldValueRef, fieldPtr);
}
} }
} }
@@ -1304,18 +1297,8 @@ namespace FlaxEngine
internal static void ToNativeField(FieldInfo field, ref T fieldOwner, IntPtr fieldPtr, out int fieldOffset) internal static void ToNativeField(FieldInfo field, ref T fieldOwner, IntPtr fieldPtr, out int fieldOffset)
{ {
if (field.IsInitOnly) ref TField fieldValueRef = ref GetFieldReference<TField>(field, ref fieldOwner);
{ MarshalHelperReferenceType<TField>.ToNative(ref fieldValueRef, fieldPtr);
//TypedReference ownerRef = __makeref(fieldOwner);
//TField fieldValue = (TField)field.GetValueDirect(ownerRef);
TField fieldValue = (TField)field.GetValue(fieldOwner);
MarshalHelperReferenceType<TField>.ToNative(ref fieldValue, fieldPtr);
}
else
{
ref TField fieldValueRef = ref GetFieldReference<TField>(field, ref fieldOwner);
MarshalHelperReferenceType<TField>.ToNative(ref fieldValueRef, fieldPtr);
}
fieldOffset = IntPtr.Size; fieldOffset = IntPtr.Size;
} }
} }