Use symbol comparison in CustomMarshallerAttributeAnalyzer (#90850)

* Use symbol comparison in `CustomMarshallerAttributeAnalyzer` * Pass SymbolEqualityComparer
dotnet · Aug 19, 2023 · ac02b66 · ac02b66
1 parent e811599
commit ac02b66
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...InteropServices/gen/LibraryImportGenerator/Analyzers/CustomMarshallerAttributeAnalyzer.cs b/...InteropServices/gen/LibraryImportGenerator/Analyzers/CustomMarshallerAttributeAnalyzer.cs
@@ -618,9 +618,9 @@ public override void Initialize(AnalysisContext context)
 
         private void PrepareForAnalysis(CompilationStartAnalysisContext context)
         {
-            if (context.Compilation.GetBestTypeByMetadataName(TypeNames.CustomMarshallerAttribute) is not null)
+            if (context.Compilation.GetBestTypeByMetadataName(TypeNames.CustomMarshallerAttribute) is { } customMarshallerAttribute)
             {
-                var perCompilationAnalyzer = new PerCompilationAnalyzer(context.Compilation);
+                var perCompilationAnalyzer = new PerCompilationAnalyzer(context.Compilation, customMarshallerAttribute);
                 context.RegisterOperationAction(perCompilationAnalyzer.AnalyzeAttribute, OperationKind.Attribute);
             }
         }
@@ -630,18 +630,20 @@ private sealed partial class PerCompilationAnalyzer
             private readonly Compilation _compilation;
             private readonly INamedTypeSymbol _spanOfT;
             private readonly INamedTypeSymbol _readOnlySpanOfT;
+            private readonly INamedTypeSymbol _customMarshallerAttribute;
 
-            public PerCompilationAnalyzer(Compilation compilation)
+            public PerCompilationAnalyzer(Compilation compilation, INamedTypeSymbol customMarshallerAttribute)
             {
                 _compilation = compilation;
+                _customMarshallerAttribute = customMarshallerAttribute;
                 _spanOfT = compilation.GetBestTypeByMetadataName(TypeNames.System_Span_Metadata);
                 _readOnlySpanOfT = compilation.GetBestTypeByMetadataName(TypeNames.System_ReadOnlySpan_Metadata);
             }
             public void AnalyzeAttribute(OperationAnalysisContext context)
             {
                 IAttributeOperation attr = (IAttributeOperation)context.Operation;
                 if (attr.Operation is IObjectCreationOperation attrCreation
-                    && attrCreation.Type.ToDisplayString() == TypeNames.CustomMarshallerAttribute)
+                    && attrCreation.Type.Equals(_customMarshallerAttribute, SymbolEqualityComparer.Default))
                 {
                     INamedTypeSymbol entryType = (INamedTypeSymbol)context.ContainingSymbol!;
                     IArgumentOperation? managedTypeArgument = attrCreation.GetArgumentByOrdinal(0);