Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 14:24:10 +02:00
Code Activity

Fixed FieldInfo.SetValue for objects

Browse source
This commit is contained in:
Brian Fiete 2020-05-13 15:07:03 -07:00
parent 767ced3563
commit 21e2269d43
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BeefLibs/corlib/src/Reflection/FieldInfo.bf
View file

@ -76,7 +76,10 @@ namespace System.Reflection
if (valueType == fieldType) if (valueType == fieldType)
{ {
Internal.MemCpy(fieldDataAddr, valueDataAddr, fieldType.[Friend]mSize); if (valueType.IsObject)
*((void**)fieldDataAddr) = Internal.UnsafeCastToPtr(value);
else
Internal.MemCpy(fieldDataAddr, valueDataAddr, fieldType.[Friend]mSize);
} }
else else
{ {

10
IDEHelper/Tests/src/Reflection.bf
View file

@ -84,6 +84,7 @@ namespace Tests
[AttrB(44, 55)] [AttrB(44, 55)]
public int mB = 2; public int mB = 2;
public int mC = 3; public int mC = 3;
public String mStr = "ABC";
} }
[Reflect(.Type)] [Reflect(.Type)]
@ -171,7 +172,7 @@ namespace Tests
fieldIdx++; fieldIdx++;
} }
let fieldInfo = cb.GetType().GetField("mC").Value; var fieldInfo = cb.GetType().GetField("mC").Value;
int cVal = 0; int cVal = 0;
fieldInfo.GetValue(cb, out cVal); fieldInfo.GetValue(cb, out cVal);
fieldInfo.SetValue(cb, cVal + 1000); fieldInfo.SetValue(cb, cVal + 1000);
@ -180,6 +181,13 @@ namespace Tests
Variant variantVal = Variant.Create(123); Variant variantVal = Variant.Create(123);
fieldInfo.SetValue(cb, variantVal); fieldInfo.SetValue(cb, variantVal);
Test.Assert(cb.mC == 123); Test.Assert(cb.mC == 123);
fieldInfo = cb.GetType().GetField("mStr").Value;
String str = null;
fieldInfo.GetValue(cb, out str);
Test.Assert(str == "ABC");
fieldInfo.SetValue(cb, "DEF");
Test.Assert(cb.mStr == "DEF");
} }
} }
} }