Skip to content
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

[DllImportGenerator] Fix stub generation for char array marshalling #61188

Merged
merged 1 commit into from
Nov 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public IEnumerable<StatementSyntax> Generate(TypePositionInfo info, StubCodeCont
case StubCodeContext.Stage.Setup:
break;
case StubCodeContext.Stage.Marshal:
if (info.IsByRef && info.RefKind != RefKind.Out)
if ((info.IsByRef && info.RefKind != RefKind.Out) || !context.SingleFrameSpansNativeContext)
{
yield return ExpressionStatement(
AssignmentExpression(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ public partial class Arrays
[GeneratedDllImport(NativeExportsNE_Binary, EntryPoint = "create_range_array_out")]
public static partial void CreateRange_Out(int start, int end, out int numValues, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] out int[] res);

[GeneratedDllImport(NativeExportsNE_Binary, EntryPoint = "sum_char_array", CharSet = CharSet.Unicode)]
public static partial int SumChars(char[] chars, int numElements);

[GeneratedDllImport(NativeExportsNE_Binary, EntryPoint = "reverse_char_array", CharSet = CharSet.Unicode)]
public static partial void ReverseChars([MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] ref char[] chars, int numElements);

[GeneratedDllImport(NativeExportsNE_Binary, EntryPoint = "sum_string_lengths")]
public static partial int SumStringLengths([MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.LPWStr)] string[] strArray);

Expand Down Expand Up @@ -118,6 +124,22 @@ public void IntArrayRefParameter()
Assert.Equal((IEnumerable<int>)array, newArray);
}

[Fact]
public void CharArrayMarshalledToNativeAsExpected()
{
char[] array = CharacterTests.CharacterMappings().Select(o => (char)o[0]).ToArray();
Assert.Equal(array.Sum(c => c), NativeExportsNE.Arrays.SumChars(array, array.Length));
}

[Fact]
public void CharArrayRefParameter()
{
char[] array = CharacterTests.CharacterMappings().Select(o => (char)o[0]).ToArray();
var newArray = array;
NativeExportsNE.Arrays.ReverseChars(ref newArray, array.Length);
Assert.Equal(array.Reverse(), newArray);
}

[Fact]
public void ArraysReturnedFromNative()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,34 @@ public static void DoubleValues([DNNE.C99Type("struct int_struct_wrapper*")] Int
}
}

[UnmanagedCallersOnly(EntryPoint = "sum_char_array")]
public static int SumChars(ushort* values, int numValues)
{
if (values == null)
{
return -1;
}

int sum = 0;
for (int i = 0; i < numValues; i++)
{
sum += values[i];
}
return sum;
}

[UnmanagedCallersOnly(EntryPoint = "reverse_char_array")]
public static void ReverseChars(ushort** values, int numValues)
{
if (*values == null)
{
return;
}

var span = new Span<ushort>(*values, numValues);
span.Reverse();
}

[UnmanagedCallersOnly(EntryPoint = "sum_string_lengths")]
public static int SumStringLengths(ushort** strArray)
{
Expand Down