fix

dotnet · May 14, 2024 · 780ebde · 780ebde
1 parent b02a3f4
commit 780ebde
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceComplexParameterSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceComplexParameterSymbol.cs
@@ -506,7 +506,7 @@ protected SourceParameterSymbol? PartialDefinitionPart
             }
         }
 
-        internal override SyntaxList<AttributeListSyntax> AttributeDeclarationList
+        internal sealed override SyntaxList<AttributeListSyntax> AttributeDeclarationList
         {
             get
             {
@@ -520,7 +520,6 @@ internal override SyntaxList<AttributeListSyntax> AttributeDeclarationList
         /// </summary>
         internal virtual OneOrMany<SyntaxList<AttributeListSyntax>> GetAttributeDeclarations()
         {
-            // TODO2: should this be non-virtual and subtypes override 'AttributeDeclarationList' instead?
             Debug.Assert(PartialImplementationPart is null);
             if (PartialDefinitionPart is { } definitionPart)
             {

diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertyAccessorSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertyAccessorSymbol.cs
@@ -631,12 +631,19 @@ public sealed override ImmutableArray<MethodSymbol> ExplicitInterfaceImplementat
 
         internal sealed override OneOrMany<SyntaxList<AttributeListSyntax>> GetAttributeDeclarations()
         {
-            Debug.Assert(PartialDefinitionPart is null);
             if (PartialImplementationPart is { } implementation)
             {
                 return OneOrMany.Create(AttributeDeclarationList, ((SourcePropertyAccessorSymbol)implementation).AttributeDeclarationList);
             }
 
+            // If we are asking this question on a partial implementation symbol,
+            // it must be from a context which prefers to order implementation attributes before definition attributes.
+            // For example, the 'value' parameter of a set accessor.
+            if (PartialDefinitionPart is { } definition)
+            {
+                return OneOrMany.Create(AttributeDeclarationList, ((SourcePropertyAccessorSymbol)definition).AttributeDeclarationList);
+            }
+
             return OneOrMany.Create(AttributeDeclarationList);
         }
 

diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedAccessorValueParameterSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedAccessorValueParameterSymbol.cs
@@ -70,13 +70,11 @@ protected override IAttributeTargetSymbol AttributeOwner
             get { return (SourceMemberMethodSymbol)this.ContainingSymbol; }
         }
 
-        internal sealed override SyntaxList<AttributeListSyntax> AttributeDeclarationList
+        internal override OneOrMany<SyntaxList<AttributeListSyntax>> GetAttributeDeclarations()
         {
-            get
-            {
-                var accessor = (SourcePropertyAccessorSymbol)this.ContainingSymbol;
-                return accessor.AttributeDeclarationList;
-            }
+            // Bind the attributes on the accessor's attribute syntax list with "param" target specifier.
+            var accessor = (SourceMemberMethodSymbol)this.ContainingSymbol;
+            return accessor.GetAttributeDeclarations();
         }
 
         internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)