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

Merge branch 'object_array_marshalling' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-object_array_marshalling

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-10 09:22:22 +02:00
parent 32bab1e7bf 66de1e744a
commit c73897ce7f
9 changed files with 108 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Engine/NativeInterop.Invoker.cs
View File

@@ -18,6 +18,8 @@ namespace FlaxEngine.Interop
/// </summary> /// </summary>
internal static class Invoker internal static class Invoker
{ {
// TODO: Use .NET8 Unsafe.BitCast<TRet, ValueType>(returnValue) for more efficient casting of value types over boxing cast
internal static IntPtr MarshalReturnValue<TRet>(ref TRet returnValue) internal static IntPtr MarshalReturnValue<TRet>(ref TRet returnValue)
{ {
if (returnValue == null) if (returnValue == null)

2
Source/Engine/Engine/NativeInterop.Marshallers.cs
View File

@@ -141,7 +141,7 @@ namespace FlaxEngine.Interop
public static class ManagedToNative public static class ManagedToNative
{ {
public static IntPtr ConvertToUnmanaged(FlaxEngine.Object managed) => (object)managed != null ? ManagedHandle.ToIntPtr(managed) : IntPtr.Zero; public static IntPtr ConvertToUnmanaged(FlaxEngine.Object managed) => Unsafe.As<object>(managed) != null ? ManagedHandle.ToIntPtr(managed) : IntPtr.Zero;
} }
} }

10
Source/Engine/Engine/NativeInterop.Unmanaged.cs
View File

@@ -770,12 +770,20 @@ namespace FlaxEngine.Interop
} }
[UnmanagedCallersOnly] [UnmanagedCallersOnly]
internal static void SetArrayValueReference(ManagedHandle arrayHandle, IntPtr valueHandle, int index) internal static void WriteArrayReference(ManagedHandle arrayHandle, IntPtr valueHandle, int index)
{ {
ManagedArray managedArray = Unsafe.As<ManagedArray>(arrayHandle.Target); ManagedArray managedArray = Unsafe.As<ManagedArray>(arrayHandle.Target);
managedArray.ToSpan<IntPtr>()[index] = valueHandle; managedArray.ToSpan<IntPtr>()[index] = valueHandle;
} }
[UnmanagedCallersOnly]
internal static void WriteArrayReferences(ManagedHandle arrayHandle, IntPtr spanPtr, int spanLength)
{
ManagedArray managedArray = Unsafe.As<ManagedArray>(arrayHandle.Target);
var unmanagedSpan = new Span<IntPtr>(spanPtr.ToPointer(), spanLength);
unmanagedSpan.CopyTo(managedArray.ToSpan<IntPtr>());
}
[UnmanagedCallersOnly] [UnmanagedCallersOnly]
internal static ManagedHandle LoadAssemblyImage(IntPtr assemblyPathPtr, IntPtr* assemblyName, IntPtr* assemblyFullName) internal static ManagedHandle LoadAssemblyImage(IntPtr assemblyPathPtr, IntPtr* assemblyName, IntPtr* assemblyFullName)
{ {

1
Source/Engine/Scripting/ManagedCLR/MCore.h
View File

@@ -112,6 +112,7 @@ public:
static void WriteRef(void* ptr, MObject* ref); static void WriteRef(void* ptr, MObject* ref);
static void WriteValue(void* dst, void* src, int32 count, const MClass* klass); static void WriteValue(void* dst, void* src, int32 count, const MClass* klass);
static void WriteArrayRef(MArray* dst, MObject* ref, int32 index); static void WriteArrayRef(MArray* dst, MObject* ref, int32 index);
static void WriteArrayRef(MArray* dst, Span<MObject*> span);
#if USE_NETCORE #if USE_NETCORE
static void* AllocateMemory(int32 size, bool coTaskMem = false); static void* AllocateMemory(int32 size, bool coTaskMem = false);
static void FreeMemory(void* ptr, bool coTaskMem = false); static void FreeMemory(void* ptr, bool coTaskMem = false);

66
Source/Engine/Scripting/ManagedCLR/MUtils.h
View File

@@ -104,8 +104,14 @@ struct MConverter<String>
void ToManagedArray(MArray* result, const Span<String>& data) void ToManagedArray(MArray* result, const Span<String>& data)
{ {
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++) for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, (MObject*)MUtils::ToString(data[i]), i); objects[i] = (MObject*)MUtils::ToString(data[i]);
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
} }
void ToNativeArray(Span<String>& result, const MArray* data) void ToNativeArray(Span<String>& result, const MArray* data)
@@ -132,8 +138,14 @@ struct MConverter<StringAnsi>
void ToManagedArray(MArray* result, const Span<StringAnsi>& data) void ToManagedArray(MArray* result, const Span<StringAnsi>& data)
{ {
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++) for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, (MObject*)MUtils::ToString(data[i]), i); objects[i] = (MObject*)MUtils::ToString(data[i]);
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
} }
void ToNativeArray(Span<StringAnsi>& result, const MArray* data) void ToNativeArray(Span<StringAnsi>& result, const MArray* data)
@@ -160,8 +172,14 @@ struct MConverter<StringView>
void ToManagedArray(MArray* result, const Span<StringView>& data) void ToManagedArray(MArray* result, const Span<StringView>& data)
{ {
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++) for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, (MObject*)MUtils::ToString(data[i]), i); objects[i] = (MObject*)MUtils::ToString(data[i]);
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
} }
void ToNativeArray(Span<StringView>& result, const MArray* data) void ToNativeArray(Span<StringView>& result, const MArray* data)
@@ -188,8 +206,14 @@ struct MConverter<Variant>
void ToManagedArray(MArray* result, const Span<Variant>& data) void ToManagedArray(MArray* result, const Span<Variant>& data)
{ {
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++) for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, MUtils::BoxVariant(data[i]), i); objects[i] = MUtils::BoxVariant(data[i]);
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
} }
void ToNativeArray(Span<Variant>& result, const MArray* data) void ToNativeArray(Span<Variant>& result, const MArray* data)
@@ -216,8 +240,14 @@ struct MConverter<T*, typename TEnableIf<TIsBaseOf<class ScriptingObject, T>::Va
void ToManagedArray(MArray* result, const Span<T*>& data) void ToManagedArray(MArray* result, const Span<T*>& data)
{ {
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++) for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, data[i] ? data[i]->GetOrCreateManagedInstance() : nullptr, i); objects[i] = data[i] ? data[i]->GetOrCreateManagedInstance() : nullptr;
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
} }
void ToNativeArray(Span<T*>& result, const MArray* data) void ToNativeArray(Span<T*>& result, const MArray* data)
@@ -239,8 +269,14 @@ struct MConverter<T, typename TEnableIf<TIsBaseOf<class ScriptingObject, T>::Val
void ToManagedArray(MArray* result, const Span<T>& data) void ToManagedArray(MArray* result, const Span<T>& data)
{ {
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++) for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, data[i].GetOrCreateManagedInstance(), i); objects[i] = data[i].GetOrCreateManagedInstance();
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
} }
}; };
@@ -263,8 +299,16 @@ struct MConverter<ScriptingObjectReference<T>>
void ToManagedArray(MArray* result, const Span<ScriptingObjectReference<T>>& data) void ToManagedArray(MArray* result, const Span<ScriptingObjectReference<T>>& data)
{ {
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++) for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, data[i].GetManagedInstance(), i); objects[i] = data[i].GetManagedInstance();
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
//for (int32 i = 0; i < data.Length(); i++)
// MCore::GC::WriteArrayRef(result, data[i].GetManagedInstance(), i);
} }
void ToNativeArray(Span<ScriptingObjectReference<T>>& result, const MArray* data) void ToNativeArray(Span<ScriptingObjectReference<T>>& result, const MArray* data)
@@ -294,8 +338,14 @@ struct MConverter<AssetReference<T>>
void ToManagedArray(MArray* result, const Span<AssetReference<T>>& data) void ToManagedArray(MArray* result, const Span<AssetReference<T>>& data)
{ {
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++) for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, data[i].GetManagedInstance(), i); objects[i] = data[i].GetManagedInstance();
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
} }
void ToNativeArray(Span<AssetReference<T>>& result, const MArray* data) void ToNativeArray(Span<AssetReference<T>>& result, const MArray* data)

10
Source/Engine/Scripting/Runtime/DotNet.cpp
View File

@@ -466,8 +466,14 @@ void MCore::GC::WriteValue(void* dst, void* src, int32 count, const MClass* klas
void MCore::GC::WriteArrayRef(MArray* dst, MObject* ref, int32 index) void MCore::GC::WriteArrayRef(MArray* dst, MObject* ref, int32 index)
{ {
static void* SetArrayValueReferencePtr = GetStaticMethodPointer(TEXT("SetArrayValueReference")); static void* WriteArrayReferencePtr = GetStaticMethodPointer(TEXT("WriteArrayReference"));
CallStaticMethod<void, void*, void*, int32>(SetArrayValueReferencePtr, dst, ref, index); CallStaticMethod<void, void*, void*, int32>(WriteArrayReferencePtr, dst, ref, index);
}
void MCore::GC::WriteArrayRef(MArray* dst, Span<MObject*> refs)
{
static void* WriteArrayReferencesPtr = GetStaticMethodPointer(TEXT("WriteArrayReferences"));
CallStaticMethod<void, void*, void*, int32>(WriteArrayReferencesPtr, dst, refs.Get(), refs.Length());
} }
void* MCore::GC::AllocateMemory(int32 size, bool coTaskMem) void* MCore::GC::AllocateMemory(int32 size, bool coTaskMem)

7
Source/Engine/Scripting/Runtime/Mono.cpp
View File

@@ -869,6 +869,13 @@ void MCore::GC::WriteArrayRef(MArray* dst, MObject* ref, int32 index)
mono_gc_wbarrier_set_arrayref(dst, (byte*)ptr + index * sizeof(void*), ref); mono_gc_wbarrier_set_arrayref(dst, (byte*)ptr + index * sizeof(void*), ref);
} }
void MCore::GC::WriteArrayRef(MArray* dst, Span<MObject*> refs)
{
void* ptr = mono_array_addr_with_size(dst, 0, 0);
for (int32 index = 0; index < refs.Length(); index++)
mono_gc_wbarrier_set_arrayref(dst, (byte*)ptr + index * sizeof(void*), refs[index]);
}
void MCore::Thread::Attach() void MCore::Thread::Attach()
{ {
if (!IsInMainThread() && !mono_domain_get()) if (!IsInMainThread() && !mono_domain_get())

4
Source/Engine/Scripting/Runtime/None.cpp
View File

@@ -185,6 +185,10 @@ void MCore::GC::WriteArrayRef(MArray* dst, MObject* ref, int32 index)
{ {
} }
void MCore::GC::WriteArrayRef(MArray* dst, Span<MObject*> refs)
{
}
void MCore::Thread::Attach() void MCore::Thread::Attach()
{ {
} }

36
Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
View File

@@ -1301,7 +1301,7 @@ namespace Flax.Build.Bindings
#pragma warning disable 1591 #pragma warning disable 1591
public static class NativeToManaged public static class NativeToManaged
{ {
public static {{classInfo.Name}} ConvertToManaged(IntPtr unmanaged) => ({{classInfo.Name}})ManagedHandleMarshaller.NativeToManaged.ConvertToManaged(unmanaged); public static {{classInfo.Name}} ConvertToManaged(IntPtr unmanaged) => Unsafe.As<{{classInfo.Name}}>(ManagedHandleMarshaller.NativeToManaged.ConvertToManaged(unmanaged));
public static void Free(IntPtr unmanaged) => ManagedHandleMarshaller.NativeToManaged.Free(unmanaged); public static void Free(IntPtr unmanaged) => ManagedHandleMarshaller.NativeToManaged.Free(unmanaged);
} }
public static class ManagedToNative public static class ManagedToNative
@@ -1316,14 +1316,14 @@ namespace Flax.Build.Bindings
public void FromManaged({{classInfo.Name}} managed) => marsh.FromManaged(managed); public void FromManaged({{classInfo.Name}} managed) => marsh.FromManaged(managed);
public IntPtr ToUnmanaged() => marsh.ToUnmanaged(); public IntPtr ToUnmanaged() => marsh.ToUnmanaged();
public void FromUnmanaged(IntPtr unmanaged) => marsh.FromUnmanaged(unmanaged); public void FromUnmanaged(IntPtr unmanaged) => marsh.FromUnmanaged(unmanaged);
public {{classInfo.Name}} ToManaged() => ({{classInfo.Name}})marsh.ToManaged(); public {{classInfo.Name}} ToManaged() => Unsafe.As<{{classInfo.Name}}>(marsh.ToManaged());
public void Free() => marsh.Free(); public void Free() => marsh.Free();
} }
internal static {{classInfo.Name}} ConvertToManaged(IntPtr unmanaged) => ({{classInfo.Name}})ManagedHandleMarshaller.ConvertToManaged(unmanaged); internal static {{classInfo.Name}} ConvertToManaged(IntPtr unmanaged) => Unsafe.As<{{classInfo.Name}}>(ManagedHandleMarshaller.ConvertToManaged(unmanaged));
internal static IntPtr ConvertToUnmanaged({{classInfo.Name}} managed) => ManagedHandleMarshaller.ConvertToUnmanaged(managed); internal static IntPtr ConvertToUnmanaged({{classInfo.Name}} managed) => ManagedHandleMarshaller.ConvertToUnmanaged(managed);
internal static void Free(IntPtr unmanaged) => ManagedHandleMarshaller.Free(unmanaged); internal static void Free(IntPtr unmanaged) => ManagedHandleMarshaller.Free(unmanaged);
internal static {{classInfo.Name}} ToManaged(IntPtr managed) => ({{classInfo.Name}})ManagedHandleMarshaller.ToManaged(managed); internal static {{classInfo.Name}} ToManaged(IntPtr managed) => Unsafe.As<{{classInfo.Name}}>(ManagedHandleMarshaller.ToManaged(managed));
internal static IntPtr ToNative({{classInfo.Name}} managed) => ManagedHandleMarshaller.ToNative(managed); internal static IntPtr ToNative({{classInfo.Name}} managed) => ManagedHandleMarshaller.ToNative(managed);
#pragma warning restore 1591 #pragma warning restore 1591
} }
@@ -1504,7 +1504,7 @@ namespace Flax.Build.Bindings
if (fieldInfo.Type.IsObjectRef) if (fieldInfo.Type.IsObjectRef)
{ {
toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? ({fieldInfo.Type.GenericArgs[0].Type})ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target : null"); toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? Unsafe.As<{fieldInfo.Type.GenericArgs[0].Type}>(ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target) : null");
toNativeContent.Append($"managed.{fieldInfo.Name} != null ? ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak) : IntPtr.Zero"); toNativeContent.Append($"managed.{fieldInfo.Name} != null ? ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak) : IntPtr.Zero");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}"); freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}");
@@ -1513,7 +1513,7 @@ namespace Flax.Build.Bindings
} }
else if (fieldInfo.Type.Type == "ScriptingObject") else if (fieldInfo.Type.Type == "ScriptingObject")
{ {
toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? (FlaxEngine.Object)ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target : null"); toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? Unsafe.As<FlaxEngine.Object>(ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target) : null");
toNativeContent.Append($"managed.{fieldInfo.Name} != null ? ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak) : IntPtr.Zero"); toNativeContent.Append($"managed.{fieldInfo.Name} != null ? ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak) : IntPtr.Zero");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}"); freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}");
@@ -1522,7 +1522,7 @@ namespace Flax.Build.Bindings
} }
else if (fieldInfo.Type.IsPtr && originalType != "IntPtr" && !originalType.EndsWith("*")) else if (fieldInfo.Type.IsPtr && originalType != "IntPtr" && !originalType.EndsWith("*"))
{ {
toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? ({originalType})ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target : null"); toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? Unsafe.As<{originalType}>(ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target) : null");
toNativeContent.Append($"managed.{fieldInfo.Name} != null ? ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak) : IntPtr.Zero"); toNativeContent.Append($"managed.{fieldInfo.Name} != null ? ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak) : IntPtr.Zero");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}"); freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}");
@@ -1531,7 +1531,7 @@ namespace Flax.Build.Bindings
} }
else if (fieldInfo.Type.Type == "Dictionary") else if (fieldInfo.Type.Type == "Dictionary")
{ {
toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? ({originalType})ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target : null"); toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? Unsafe.As<{originalType}>(ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target) : null");
toNativeContent.Append($"ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak)"); toNativeContent.Append($"ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak)");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}"); freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}");
freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}"); freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}");
@@ -1544,31 +1544,31 @@ namespace Flax.Build.Bindings
// Marshal blittable array elements back to original non-blittable elements // Marshal blittable array elements back to original non-blittable elements
string originalElementTypeMarshaller = originalElementType + "Marshaller"; string originalElementTypeMarshaller = originalElementType + "Marshaller";
string internalElementType = $"{originalElementTypeMarshaller}.{originalElementType}Internal"; string internalElementType = $"{originalElementTypeMarshaller}.{originalElementType}Internal";
toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? NativeInterop.NativeArrayToManagedArray<{originalElementType}, {internalElementType}>(((ManagedArray)ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target).ToSpan<{internalElementType}>(), {originalElementTypeMarshaller}.ToManaged) : null"); toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? NativeInterop.NativeArrayToManagedArray<{originalElementType}, {internalElementType}>((Unsafe.As<ManagedArray>(ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target)).ToSpan<{internalElementType}>(), {originalElementTypeMarshaller}.ToManaged) : null");
toNativeContent.Append($"ManagedHandle.ToIntPtr(ManagedArray.WrapNewArray(managed.{fieldInfo.Name}), GCHandleType.Weak)"); toNativeContent.Append($"ManagedHandle.ToIntPtr(ManagedArray.WrapNewArray(managed.{fieldInfo.Name}), GCHandleType.Weak)");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<{internalElementType}> values = ((ManagedArray)handle.Target).ToSpan<{internalElementType}>(); foreach (var value in values) {{ {originalElementTypeMarshaller}.Free(value); }} ((ManagedArray)handle.Target).Free(); handle.Free(); }}"); freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<{internalElementType}> values = (Unsafe.As<ManagedArray>(handle.Target)).ToSpan<{internalElementType}>(); foreach (var value in values) {{ {originalElementTypeMarshaller}.Free(value); }} (Unsafe.As<ManagedArray>(handle.Target)).Free(); handle.Free(); }}");
freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<{internalElementType}> values = ((ManagedArray)handle.Target).ToSpan<{internalElementType}>(); foreach (var value in values) {{ {originalElementTypeMarshaller}.Free(value); }} ((ManagedArray)handle.Target).Free(); handle.Free(); }}"); freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<{internalElementType}> values = (Unsafe.As<ManagedArray>(handle.Target)).ToSpan<{internalElementType}>(); foreach (var value in values) {{ {originalElementTypeMarshaller}.Free(value); }} (Unsafe.As<ManagedArray>(handle.Target)).Free(); handle.Free(); }}");
} }
else if (fieldInfo.Type.GenericArgs[0].IsObjectRef) else if (fieldInfo.Type.GenericArgs[0].IsObjectRef)
{ {
// Array elements passed as GCHandles // Array elements passed as GCHandles
toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? NativeInterop.GCHandleArrayToManagedArray<{originalElementType}>((ManagedArray)ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target) : null"); toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? NativeInterop.GCHandleArrayToManagedArray<{originalElementType}>(Unsafe.As<ManagedArray>(ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target)) : null");
toNativeContent.Append($"managed.{fieldInfo.Name}?.Length > 0 ? ManagedHandle.ToIntPtr(NativeInterop.ManagedArrayToGCHandleWrappedArray(managed.{fieldInfo.Name}), GCHandleType.Weak) : IntPtr.Zero"); toNativeContent.Append($"managed.{fieldInfo.Name}?.Length > 0 ? ManagedHandle.ToIntPtr(NativeInterop.ManagedArrayToGCHandleWrappedArray(managed.{fieldInfo.Name}), GCHandleType.Weak) : IntPtr.Zero");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<IntPtr> ptrs = ((ManagedArray)handle.Target).ToSpan<IntPtr>(); foreach (var ptr in ptrs) {{ if (ptr != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(ptr).Free(); }} }} ((ManagedArray)handle.Target).Free(); handle.Free(); }}"); freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<IntPtr> ptrs = (Unsafe.As<ManagedArray>(handle.Target)).ToSpan<IntPtr>(); foreach (var ptr in ptrs) {{ if (ptr != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(ptr).Free(); }} }} (Unsafe.As<ManagedArray>(handle.Target)).Free(); handle.Free(); }}");
freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<IntPtr> ptrs = ((ManagedArray)handle.Target).ToSpan<IntPtr>(); foreach (var ptr in ptrs) {{ if (ptr != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(ptr).Free(); }} }} ((ManagedArray)handle.Target).Free(); handle.Free(); }}"); freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<IntPtr> ptrs = (Unsafe.As<ManagedArray>(handle.Target)).ToSpan<IntPtr>(); foreach (var ptr in ptrs) {{ if (ptr != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(ptr).Free(); }} }} (Unsafe.As<ManagedArray>(handle.Target)).Free(); handle.Free(); }}");
} }
else else
{ {
// Blittable array elements // Blittable array elements
toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? ((ManagedArray)ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target).ToArray<{originalElementType}>() : null"); toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? (Unsafe.As<ManagedArray>(ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target)).ToArray<{originalElementType}>() : null");
toNativeContent.Append($"managed.{fieldInfo.Name}?.Length > 0 ? ManagedHandle.ToIntPtr(ManagedArray.WrapNewArray(managed.{fieldInfo.Name}), GCHandleType.Weak) : IntPtr.Zero"); toNativeContent.Append($"managed.{fieldInfo.Name}?.Length > 0 ? ManagedHandle.ToIntPtr(ManagedArray.WrapNewArray(managed.{fieldInfo.Name}), GCHandleType.Weak) : IntPtr.Zero");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); ((ManagedArray)handle.Target).Free(); handle.Free(); }}"); freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); (Unsafe.As<ManagedArray>(handle.Target)).Free(); handle.Free(); }}");
freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); ((ManagedArray)handle.Target).Free(); handle.Free(); }}"); freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); (Unsafe.As<ManagedArray>(handle.Target)).Free(); handle.Free(); }}");
} }
} }
else if (fieldInfo.Type.Type == "Version") else if (fieldInfo.Type.Type == "Version")
{ {
toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? ({originalType})ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target : null"); toManagedContent.Append($"managed.{fieldInfo.Name} != IntPtr.Zero ? Unsafe.As<{originalType}>(ManagedHandle.FromIntPtr(managed.{fieldInfo.Name}).Target) : null");
toNativeContent.Append($"ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak)"); toNativeContent.Append($"ManagedHandle.ToIntPtr(managed.{fieldInfo.Name}, GCHandleType.Weak)");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}"); freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}");
freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}"); freeContents2.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Free(); }}");