Update the CustomMarshallerAttributeFixer to support adding missing m…

…ethods for stateless marshaller shapes (#72869)
dotnet · Jul 28, 2022 · cf3bf7a · cf3bf7a
1 parent ad58ce5
commit cf3bf7a
Show file tree

Hide file tree

Showing 4 changed files with 946 additions and 72 deletions.
diff --git a/...InteropServices/gen/LibraryImportGenerator/Analyzers/CustomMarshallerAttributeAnalyzer.cs b/...InteropServices/gen/LibraryImportGenerator/Analyzers/CustomMarshallerAttributeAnalyzer.cs
@@ -424,6 +424,7 @@ internal static DiagnosticDescriptor GetDefaultMarshalModeDiagnostic(DiagnosticD
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics =>
             ImmutableArray.Create(
                 MarshallerTypeMustSpecifyManagedTypeRule,
+                MarshallerTypeMustBeStaticClassOrStructRule,
                 UnmanagedTypeMustBeUnmanagedRule,
                 GetPinnableReferenceReturnTypeBlittableRule,
                 TypeMustHaveExplicitCastFromVoidPointerRule,
@@ -653,7 +654,7 @@ void ReportDiagnosticsForMissingMembers(DiagnosticReporter diagnosticReporter)
                             if (isLinearCollectionMarshaller)
                             {
                                 // Verify that all of the following methods are present with valid shapes:
-                                // - AllocateContainerForUnmanagedElements
+                                // - AllocateContainerForManagedElements
                                 // - GetUnmanagedValuesSource
                                 // - GetManagedValuesDestination
                                 if (methods.ToManaged is null && methods.ToManagedFinally is null)
@@ -662,7 +663,7 @@ void ReportDiagnosticsForMissingMembers(DiagnosticReporter diagnosticReporter)
                                         StatelessLinearCollectionRequiresTwoParameterAllocateContainerForManagedElementsRule,
                                         MissingMemberNames.CreateDiagnosticPropertiesForMissingMembersDiagnostic(
                                             mode,
-                                            ShapeMemberNames.LinearCollection.Stateless.AllocateContainerForUnmanagedElements),
+                                            ShapeMemberNames.LinearCollection.Stateless.AllocateContainerForManagedElements),
                                         marshallerType.ToDisplayString(),
                                         mode,
                                         managedType.ToDisplayString());