Fix the unmarshalling conditions

jkoritzinsky · jkoritzinsky · commit d66549a9342e · 2021-11-16T13:36:53.000-08:00
diff --git a/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/Marshalling/ICustomNativeTypeMarshallingStrategy.cs b/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/Marshalling/ICustomNativeTypeMarshallingStrategy.cs
@@ -235,7 +235,7 @@ public IEnumerable<StatementSyntax> GenerateUnmarshalStatements(TypePositionInfo
         {
             var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);
 
-            if (!info.IsByRef && info.ByValueContentsMarshalKind.HasFlag(ByValueContentsMarshalKind.Out))
+            if (info.IsManagedReturnPosition || (info.IsByRef && info.RefKind != RefKind.In))
             {
                 yield return GenerateValuePropertyAssignment(info, context, subContext);
             }
@@ -568,7 +568,7 @@ public IEnumerable<StatementSyntax> GenerateUnmarshalStatements(TypePositionInfo
         {
             var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);
 
-            if (!info.IsByRef && info.ByValueContentsMarshalKind.HasFlag(ByValueContentsMarshalKind.Out))
+            if (info.IsManagedReturnPosition || (info.IsByRef && info.RefKind != RefKind.In))
             {
                 // <marshalerIdentifier>.Value = <nativeIdentifier>;
                 yield return GenerateValuePropertyAssignment(info, context, subContext);

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public IEnumerable<StatementSyntax> GenerateUnmarshalStatements(TypePositionInfo`
`235`	`235`	`{`
`236`	`236`	`var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);`
`237`	`237`
`238`		`- if (!info.IsByRef && info.ByValueContentsMarshalKind.HasFlag(ByValueContentsMarshalKind.Out))`
	`238`	`+ if (info.IsManagedReturnPosition \|\| (info.IsByRef && info.RefKind != RefKind.In))`
`239`	`239`	`{`
`240`	`240`	`yield return GenerateValuePropertyAssignment(info, context, subContext);`
`241`	`241`	`}`
`@@ -568,7 +568,7 @@ public IEnumerable<StatementSyntax> GenerateUnmarshalStatements(TypePositionInfo`
`568`	`568`	`{`
`569`	`569`	`var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);`
`570`	`570`
`571`		`- if (!info.IsByRef && info.ByValueContentsMarshalKind.HasFlag(ByValueContentsMarshalKind.Out))`
	`571`	`+ if (info.IsManagedReturnPosition \|\| (info.IsByRef && info.RefKind != RefKind.In))`
`572`	`572`	`{`
`573`	`573`	`// <marshalerIdentifier>.Value = <nativeIdentifier>;`
`574`	`574`	`yield return GenerateValuePropertyAssignment(info, context, subContext);`