Use MarshalDirection type in generators and update design doc

jkoritzinsky · jkoritzinsky · commit 7182f4bfff0b · 2022-08-25T11:17:41.000-07:00
diff --git a/docs/design/libraries/ComInterfaceGenerator/VTableStubs.md b/docs/design/libraries/ComInterfaceGenerator/VTableStubs.md
@@ -28,7 +28,7 @@ public class VirtualMethodIndexAttribute : Attribute
 
     public bool ImplicitThisParameter { get; set; } = true;
 
-    public CustomTypeMarshallerDirection Direction { get; set; } = CustomTypeMarshallerDirection.Ref;
+    public MarshalDirection Direction { get; set; } = MarshalDirection.Bidirectional;
 
     /// <summary>
     /// Gets or sets how to marshal string arguments to the method.
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSStubCodeContext.cs b/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSStubCodeContext.cs
@@ -25,7 +25,7 @@ internal sealed record JSImportCodeContext : JSStubCodeContext
         public JSImportCodeContext(JSImportData attributeData, StubCodeContext inner)
         {
             _inner = inner;
-            Direction = CustomTypeMarshallingDirection.In;
+            Direction = MarshalDirection.ManagedToUnmanaged;
             AttributeData = attributeData;
         }
 
@@ -37,7 +37,7 @@ internal sealed record JSExportCodeContext : JSStubCodeContext
         public JSExportCodeContext(JSExportData attributeData, StubCodeContext inner)
         {
             _inner = inner;
-            Direction = CustomTypeMarshallingDirection.Out;
+            Direction = MarshalDirection.UnmanagedToManaged;
             AttributeData = attributeData;
         }
 
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Marshaling/FuncJSGenerator.cs b/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Marshaling/FuncJSGenerator.cs
@@ -53,12 +53,12 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu
                 .Select(a => ParseTypeName(a.FullTypeName))
                 .ToArray();
 
-            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.In && info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.ManagedToUnmanaged && info.IsManagedReturnPosition)
             {
                 yield return ToManagedMethod(target, source, jsty);
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == CustomTypeMarshallingDirection.Out && info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == MarshalDirection.UnmanagedToManaged && info.IsManagedReturnPosition)
             {
                 yield return ToJSMethod(target, source, jsty);
             }
@@ -68,12 +68,12 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu
                 yield return x;
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == CustomTypeMarshallingDirection.In && !info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == MarshalDirection.ManagedToUnmanaged && !info.IsManagedReturnPosition)
             {
                 yield return ToJSMethod(target, source, jsty);
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.Out && !info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.UnmanagedToManaged && !info.IsManagedReturnPosition)
             {
                 yield return ToManagedMethod(target, source, jsty);
             }
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Marshaling/PrimitiveJSGenerator.cs b/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Marshaling/PrimitiveJSGenerator.cs
@@ -32,12 +32,12 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu
                 ? Argument(IdentifierName(context.GetIdentifiers(info).native))
                 : _inner.AsArgument(info, context);
 
-            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.In && info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.ManagedToUnmanaged && info.IsManagedReturnPosition)
             {
                 yield return ToManagedMethod(target, source);
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == CustomTypeMarshallingDirection.Out && info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == MarshalDirection.UnmanagedToManaged && info.IsManagedReturnPosition)
             {
                 yield return ToJSMethod(target, source);
             }
@@ -47,12 +47,12 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu
                 yield return x;
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == CustomTypeMarshallingDirection.In && !info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == MarshalDirection.ManagedToUnmanaged && !info.IsManagedReturnPosition)
             {
                 yield return ToJSMethod(target, source);
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.Out && !info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.UnmanagedToManaged && !info.IsManagedReturnPosition)
             {
                 yield return ToManagedMethod(target, source);
             }
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Marshaling/TaskJSGenerator.cs b/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Marshaling/TaskJSGenerator.cs
@@ -45,14 +45,14 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu
                 ? Argument(IdentifierName(context.GetIdentifiers(info).native))
                 : _inner.AsArgument(info, context);
 
-            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.In && info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.ManagedToUnmanaged && info.IsManagedReturnPosition)
             {
                 yield return jsty.ResultTypeInfo.FullTypeName == "void"
                     ? ToManagedMethodVoid(target, source)
                     : ToManagedMethod(target, source, jsty.ResultTypeInfo.Syntax);
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == CustomTypeMarshallingDirection.Out && info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == MarshalDirection.UnmanagedToManaged && info.IsManagedReturnPosition)
             {
                 yield return jsty.ResultTypeInfo.FullTypeName == "void"
                     ? ToJSMethodVoid(target, source)
@@ -64,14 +64,14 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu
                 yield return x;
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == CustomTypeMarshallingDirection.In && !info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == MarshalDirection.ManagedToUnmanaged && !info.IsManagedReturnPosition)
             {
                 yield return jsty.ResultTypeInfo.FullTypeName == "void"
                     ? ToJSMethodVoid(target, source)
                     : ToJSMethod(target, source, jsty.ResultTypeInfo.Syntax);
             }
 
-            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.Out && !info.IsManagedReturnPosition)
+            if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.UnmanagedToManaged && !info.IsManagedReturnPosition)
             {
                 yield return jsty.ResultTypeInfo.FullTypeName == "void"
                     ? ToManagedMethodVoid(target, source)
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JSImportGenerator.UnitTest/JSImportGenerator.Unit.Tests.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JSImportGenerator.UnitTest/JSImportGenerator.Unit.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)SourceGenerators\LiveReferencePack.cs" Link="Common\SourceGenerators\LiveReferencePack.cs" />
-    <Compile Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\tests\LibraryImportGenerator.UnitTests\TestUtils.cs" Link="LibraryImportGenerator\TestUtils.cs" />
+    <Compile Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\tests\Common\TestUtils.cs" Link="System\Runtime\InteropServices\Common\TestUtils.cs" />
     <Compile Include="CodeSnippets.cs" />
     <Compile Include="Fails.cs" />
     <Compile Include="Compiles.cs" />
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="$(CompilerPlatformTestingVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(CompilerPlatformTestingVersion)" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\tests\Ancillary.Interop\Ancillary.Interop.csproj" />    
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\tests\Ancillary.Interop\Ancillary.Interop.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" />
     <None Include="$(RepoRoot)/NuGet.config" Link="NuGet.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.csproj b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComInterfaceGenerator.csproj
@@ -28,10 +28,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" PrivateAssets="all" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="../../tests/Ancillary.Interop/MarshalDirection.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="$(TargetPath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     <None Include="$(AssemblyName).props" Pack="true" PackagePath="build" />
diff --git a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VirtualMethodIndexData.cs b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VirtualMethodIndexData.cs
@@ -1,11 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using Microsoft.CodeAnalysis;
-
 namespace Microsoft.Interop
 {
     /// <summary>
diff --git a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/VtableIndexStubGenerator.cs
@@ -7,7 +7,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 using System.Text;
 using System.Threading;
 using Microsoft.CodeAnalysis;
diff --git a/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/CustomTypeMarshallingDirection.cs b/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/CustomTypeMarshallingDirection.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/Microsoft.Interop.SourceGeneration.csproj b/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/Microsoft.Interop.SourceGeneration.csproj
@@ -13,6 +13,10 @@
     <Compile Include="$(CoreLibSharedDir)\System\Runtime\InteropServices\Marshalling\MarshalMode.cs" Link="Production\MarshalMode.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="../../tests/Common/MarshalDirection.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion_4_4)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" PrivateAssets="all" />
diff --git a/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/StubCodeContext.cs b/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/StubCodeContext.cs
@@ -80,11 +80,7 @@ public enum Stage
         /// </summary>
         public Stage CurrentStage { get; init; } = Stage.Invalid;
 
-        /// <summary>
-        /// <c>CustomTypeMarshallingDirection.In</c> means method import like <c>[LibraryImport]</c>.
-        /// <c>CustomTypeMarshallingDirection.Out</c> means method export like in <c>[UnmanagedCallersOnly]</c> or in <c>[JSExport]</c>
-        /// </summary>
-        public CustomTypeMarshallingDirection Direction { get; init; } = CustomTypeMarshallingDirection.In;
+        public MarshalDirection Direction { get; init; } = MarshalDirection.ManagedToUnmanaged;
 
         /// <summary>
         /// Gets the currently targeted framework and version for stub code generation.
diff --git a/src/libraries/System.Runtime.InteropServices/tests/Ancillary.Interop/Ancillary.Interop.csproj b/src/libraries/System.Runtime.InteropServices/tests/Ancillary.Interop/Ancillary.Interop.csproj
@@ -7,7 +7,10 @@
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>APIs required for usage of the LibraryImportGenerator and related tools.</Description>
-    <DefineConstants>$(DefineConstants);LIBRARYIMPORT_GENERATOR_TEST</DefineConstants>
+    <DefineConstants>$(DefineConstants);ANCILLARY_INTEROP</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="../Common/MarshalDirection.cs" Link="Common/MarshalDirection.cs" />
+  </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Runtime.InteropServices/tests/Common/MarshalDirection.cs b/src/libraries/System.Runtime.InteropServices/tests/Common/MarshalDirection.cs
@@ -1,13 +1,11 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+#if ANCILLARY_INTEROP
 namespace System.Runtime.InteropServices.Marshalling
+#else
+namespace Microsoft.Interop
+#endif
 {
     public enum MarshalDirection
     {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ internal sealed record JSImportCodeContext : JSStubCodeContext`
`25`	`25`	`public JSImportCodeContext(JSImportData attributeData, StubCodeContext inner)`
`26`	`26`	`{`
`27`	`27`	`_inner = inner;`
`28`		`- Direction = CustomTypeMarshallingDirection.In;`
	`28`	`+ Direction = MarshalDirection.ManagedToUnmanaged;`
`29`	`29`	`AttributeData = attributeData;`
`30`	`30`	`}`
`31`	`31`
`@@ -37,7 +37,7 @@ internal sealed record JSExportCodeContext : JSStubCodeContext`
`37`	`37`	`public JSExportCodeContext(JSExportData attributeData, StubCodeContext inner)`
`38`	`38`	`{`
`39`	`39`	`_inner = inner;`
`40`		`- Direction = CustomTypeMarshallingDirection.Out;`
	`40`	`+ Direction = MarshalDirection.UnmanagedToManaged;`
`41`	`41`	`AttributeData = attributeData;`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,12 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu`
`53`	`53`	`.Select(a => ParseTypeName(a.FullTypeName))`
`54`	`54`	`.ToArray();`
`55`	`55`
`56`		`- if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.In && info.IsManagedReturnPosition)`
	`56`	`+ if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.ManagedToUnmanaged && info.IsManagedReturnPosition)`
`57`	`57`	`{`
`58`	`58`	`yield return ToManagedMethod(target, source, jsty);`
`59`	`59`	`}`
`60`	`60`
`61`		`- if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == CustomTypeMarshallingDirection.Out && info.IsManagedReturnPosition)`
	`61`	`+ if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == MarshalDirection.UnmanagedToManaged && info.IsManagedReturnPosition)`
`62`	`62`	`{`
`63`	`63`	`yield return ToJSMethod(target, source, jsty);`
`64`	`64`	`}`
`@@ -68,12 +68,12 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu`
`68`	`68`	`yield return x;`
`69`	`69`	`}`
`70`	`70`
`71`		`- if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == CustomTypeMarshallingDirection.In && !info.IsManagedReturnPosition)`
	`71`	`+ if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == MarshalDirection.ManagedToUnmanaged && !info.IsManagedReturnPosition)`
`72`	`72`	`{`
`73`	`73`	`yield return ToJSMethod(target, source, jsty);`
`74`	`74`	`}`
`75`	`75`
`76`		`- if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.Out && !info.IsManagedReturnPosition)`
	`76`	`+ if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.UnmanagedToManaged && !info.IsManagedReturnPosition)`
`77`	`77`	`{`
`78`	`78`	`yield return ToManagedMethod(target, source, jsty);`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu`
`32`	`32`	`? Argument(IdentifierName(context.GetIdentifiers(info).native))`
`33`	`33`	`: _inner.AsArgument(info, context);`
`34`	`34`
`35`		`- if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.In && info.IsManagedReturnPosition)`
	`35`	`+ if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.ManagedToUnmanaged && info.IsManagedReturnPosition)`
`36`	`36`	`{`
`37`	`37`	`yield return ToManagedMethod(target, source);`
`38`	`38`	`}`
`39`	`39`
`40`		`- if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == CustomTypeMarshallingDirection.Out && info.IsManagedReturnPosition)`
	`40`	`+ if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == MarshalDirection.UnmanagedToManaged && info.IsManagedReturnPosition)`
`41`	`41`	`{`
`42`	`42`	`yield return ToJSMethod(target, source);`
`43`	`43`	`}`
`@@ -47,12 +47,12 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu`
`47`	`47`	`yield return x;`
`48`	`48`	`}`
`49`	`49`
`50`		`- if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == CustomTypeMarshallingDirection.In && !info.IsManagedReturnPosition)`
	`50`	`+ if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == MarshalDirection.ManagedToUnmanaged && !info.IsManagedReturnPosition)`
`51`	`51`	`{`
`52`	`52`	`yield return ToJSMethod(target, source);`
`53`	`53`	`}`
`54`	`54`
`55`		`- if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.Out && !info.IsManagedReturnPosition)`
	`55`	`+ if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.UnmanagedToManaged && !info.IsManagedReturnPosition)`
`56`	`56`	`{`
`57`	`57`	`yield return ToManagedMethod(target, source);`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,14 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu`
`45`	`45`	`? Argument(IdentifierName(context.GetIdentifiers(info).native))`
`46`	`46`	`: _inner.AsArgument(info, context);`
`47`	`47`
`48`		`- if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.In && info.IsManagedReturnPosition)`
	`48`	`+ if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.ManagedToUnmanaged && info.IsManagedReturnPosition)`
`49`	`49`	`{`
`50`	`50`	`yield return jsty.ResultTypeInfo.FullTypeName == "void"`
`51`	`51`	`? ToManagedMethodVoid(target, source)`
`52`	`52`	`: ToManagedMethod(target, source, jsty.ResultTypeInfo.Syntax);`
`53`	`53`	`}`
`54`	`54`
`55`		`- if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == CustomTypeMarshallingDirection.Out && info.IsManagedReturnPosition)`
	`55`	`+ if (context.CurrentStage == StubCodeContext.Stage.Marshal && context.Direction == MarshalDirection.UnmanagedToManaged && info.IsManagedReturnPosition)`
`56`	`56`	`{`
`57`	`57`	`yield return jsty.ResultTypeInfo.FullTypeName == "void"`
`58`	`58`	`? ToJSMethodVoid(target, source)`
`@@ -64,14 +64,14 @@ public override IEnumerable<StatementSyntax> Generate(TypePositionInfo info, Stu`
`64`	`64`	`yield return x;`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == CustomTypeMarshallingDirection.In && !info.IsManagedReturnPosition)`
	`67`	`+ if (context.CurrentStage == StubCodeContext.Stage.Invoke && context.Direction == MarshalDirection.ManagedToUnmanaged && !info.IsManagedReturnPosition)`
`68`	`68`	`{`
`69`	`69`	`yield return jsty.ResultTypeInfo.FullTypeName == "void"`
`70`	`70`	`? ToJSMethodVoid(target, source)`
`71`	`71`	`: ToJSMethod(target, source, jsty.ResultTypeInfo.Syntax);`
`72`	`72`	`}`
`73`	`73`
`74`		`- if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == CustomTypeMarshallingDirection.Out && !info.IsManagedReturnPosition)`
	`74`	`+ if (context.CurrentStage == StubCodeContext.Stage.Unmarshal && context.Direction == MarshalDirection.UnmanagedToManaged && !info.IsManagedReturnPosition)`
`75`	`75`	`{`
`76`	`76`	`yield return jsty.ResultTypeInfo.FullTypeName == "void"`
`77`	`77`	`? ToManagedMethodVoid(target, source)`