Skip to content

Update GetPinnableReference() usage in multi-step custom type marshalling #61539

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
jkoritzinsky merged 6 commits into from
Nov 20, 2021
Merged

Update GetPinnableReference() usage in multi-step custom type marshalling #61539

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd0351c
Update GetPinnableReference() usage in multi-step custom tyep marshal…
jkoritzinsky Nov 13, 2021
5104216
Apply suggestions from code review
jkoritzinsky Nov 13, 2021
5eb62da
Don't emit the assingment to the Value property in the Unmarshal stag…
jkoritzinsky Nov 15, 2021
d66549a
Fix the unmarshalling conditions
jkoritzinsky Nov 16, 2021
ada0693
Fix Utf16StringMarshaller to correctly handle the "null pointer" case…
jkoritzinsky Nov 17, 2021
5575673
Merge branch 'main' of github.com:dotnet/runtime into getpinnablerefe…
jkoritzinsky Nov 17, 2021
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
Prev Previous commit
Next Next commit
Don't emit the assingment to the Value property in the Unmarshal stag… 
…e when using [Out]
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Nov 15, 2021
commit 5eb62da890c12b7ed66c666d4b99aba17ac1af2b
21 changes: 15 additions & 6 deletions ...en/Microsoft.Interop.SourceGeneration/Marshalling/ICustomNativeTypeMarshallingStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,10 @@ public IEnumerable<StatementSyntax> GenerateUnmarshalStatements(TypePositionInfo
{
var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);

yield return GenerateValuePropertyAssignment(info, context, subContext);
if (!info.IsByRef && info.ByValueContentsMarshalKind.HasFlag(ByValueContentsMarshalKind.Out))
{
yield return GenerateValuePropertyAssignment(info, context, subContext);
}

foreach (StatementSyntax statement in _innerMarshaller.GenerateUnmarshalStatements(info, subContext))
{
Expand Down Expand Up @@ -450,7 +453,7 @@ public bool UsesNativeIdentifier(TypePositionInfo info, StubCodeContext context)
}

/// <summary>
/// Marshaller that enables support for a GetPinnableReference method on a native type, with a Value property fallback.
/// Marshaller that calls the GetPinnableReference method on the marshaller value and enables support for the Value property.
/// </summary>
internal sealed class PinnableMarshallerTypeMarshalling : ICustomNativeTypeMarshallingStrategy
{
Expand Down Expand Up @@ -482,8 +485,11 @@ public IEnumerable<StatementSyntax> GenerateCleanupStatements(TypePositionInfo i
{
var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);

// <marshalerIdentifier>.Value = <nativeIdentifier>;
yield return GenerateValuePropertyAssignment(info, context, subContext);
if (!context.AdditionalTemporaryStateLivesAcrossStages)
{
// <marshalerIdentifier>.Value = <nativeIdentifier>;
yield return GenerateValuePropertyAssignment(info, context, subContext);
}

foreach (StatementSyntax statement in _innerMarshaller.GenerateCleanupStatements(info, subContext))
{
Expand Down Expand Up @@ -562,8 +568,11 @@ public IEnumerable<StatementSyntax> GenerateUnmarshalStatements(TypePositionInfo
{
var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);

// <marshalerIdentifier>.Value = <nativeIdentifier>;
yield return GenerateValuePropertyAssignment(info, context, subContext);
if (!info.IsByRef && info.ByValueContentsMarshalKind.HasFlag(ByValueContentsMarshalKind.Out))
{
// <marshalerIdentifier>.Value = <nativeIdentifier>;
yield return GenerateValuePropertyAssignment(info, context, subContext);
}

foreach (StatementSyntax statement in _innerMarshaller.GenerateUnmarshalStatements(info, subContext))
{
Expand Down