Fix memory leaks for return values and some out params. (#1200)

Fix some memory leaks we had where we didn't generate code to free native resources for out parameters that use custom native type marshalling or all return values. Also set a flag in the csproj that enables a nice debugging innerloop option for roslyn components in the csproj settings (in our case running the generator on the integration tests)
dotnet · Jun 3, 2021 · b11a26a · b11a26a
1 parent 41bf5d1
commit b11a26a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj b/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj
@@ -10,6 +10,7 @@
     <LangVersion>Preview</LangVersion>
     <Nullable>enable</Nullable>
     <RootNamespace>Microsoft.Interop</RootNamespace>
+    <IsRoslynComponent>true</IsRoslynComponent>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/DllImportGenerator/DllImportGenerator/Marshalling/CustomNativeTypeMarshaller.cs b/DllImportGenerator/DllImportGenerator/Marshalling/CustomNativeTypeMarshaller.cs
@@ -231,7 +231,7 @@ public IEnumerable<StatementSyntax> Generate(TypePositionInfo info, StubCodeCont
                     }
                     break;
                 case StubCodeContext.Stage.Cleanup:
-                    if (info.RefKind != RefKind.Out && _hasFreeNative)
+                    if (_hasFreeNative)
                     {
                         // <marshalerIdentifier>.FreeNative();
                         yield return ExpressionStatement(

diff --git a/DllImportGenerator/DllImportGenerator/Marshalling/SafeHandleMarshaller.cs b/DllImportGenerator/DllImportGenerator/Marshalling/SafeHandleMarshaller.cs
@@ -228,7 +228,7 @@ public IEnumerable<StatementSyntax> Generate(TypePositionInfo info, StubCodeCont
                     }
                     break;
                 case StubCodeContext.Stage.Cleanup:
-                    if (!info.IsByRef || info.RefKind == RefKind.In)
+                    if (!info.IsManagedReturnPosition && (!info.IsByRef || info.RefKind == RefKind.In))
                     {
                         yield return IfStatement(
                             IdentifierName(addRefdIdentifier),

diff --git a/DllImportGenerator/DllImportGenerator/StubCodeGenerator.cs b/DllImportGenerator/DllImportGenerator/StubCodeGenerator.cs
@@ -197,7 +197,7 @@ public BlockSyntax GenerateSyntax()
                 int initialCount = statements.Count;
                 this.CurrentStage = stage;
 
-                if (!invokeReturnsVoid && (stage == Stage.Setup || stage == Stage.Unmarshal || stage == Stage.GuaranteedUnmarshal))
+                if (!invokeReturnsVoid && (stage is Stage.Setup or Stage.Unmarshal or Stage.GuaranteedUnmarshal or Stage.Cleanup))
                 {
                     // Handle setup and unmarshalling for return
                     var retStatements = retMarshaller.Generator.Generate(retMarshaller.TypeInfo, this);