Extensions: honor OverloadResolutionPriority attribute (#78219)

Julien Couvreur · web-flow · commit 73f70f4b5d65 · 2025-04-28T01:54:18.000-07:00
diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/OverloadResolution/OverloadResolution.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/OverloadResolution/OverloadResolution.cs
@@ -1878,7 +1878,8 @@ private void RemoveLowerPriorityMembers<TMemberResolution, TMember>(ArrayBuilder
 
             foreach (var result in results)
             {
-                Debug.Assert(result.MemberWithPriority is not null);
+                TMember memberWithPriority = result.MemberWithPriority;
+                Debug.Assert(memberWithPriority is not null);
 
                 // We don't filter out inapplicable members here, as we want to keep them in the list for diagnostics
                 // However, we don't want to take them into account for the priority filtering
@@ -1888,11 +1889,14 @@ private void RemoveLowerPriorityMembers<TMemberResolution, TMember>(ArrayBuilder
                     continue;
                 }
 
-                var containingType = result.MemberWithPriority.ContainingType; // Tracked by https://github.com/dotnet/roslyn/issues/76130 : how should ORPA apply to new extension methods?
+                NamedTypeSymbol containingType = memberWithPriority.GetIsNewExtensionMember()
+                    ? memberWithPriority.ContainingType.ContainingType
+                    : memberWithPriority.ContainingType;
+
                 if (resultsByContainingType.TryGetValue(containingType, out var previousResults))
                 {
                     var previousPriority = previousResults.First().MemberWithPriority.GetOverloadResolutionPriority();
-                    var currentPriority = result.MemberWithPriority.GetOverloadResolutionPriority();
+                    var currentPriority = memberWithPriority.GetOverloadResolutionPriority();
 
                     if (currentPriority > previousPriority)
                     {
diff --git a/src/Compilers/CSharp/Portable/Symbols/Extensions/RewrittenLambdaOrLocalFunctionSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Extensions/RewrittenLambdaOrLocalFunctionSymbol.cs
@@ -30,6 +30,9 @@ internal override bool TryGetThisParameter(out ParameterSymbol? thisParameter)
             return true;
         }
 
+        internal override int TryGetOverloadResolutionPriority()
+            => _originalMethod.TryGetOverloadResolutionPriority();
+
         protected override ImmutableArray<ParameterSymbol> MakeParameters()
         {
             return ImmutableArray<ParameterSymbol>.CastUp(_originalMethod.Parameters.SelectAsArray(static (p, @this) => new RewrittenMethodParameterSymbol(@this, p), this));
diff --git a/src/Compilers/CSharp/Portable/Symbols/Extensions/SourceExtensionImplementationMethodSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Extensions/SourceExtensionImplementationMethodSymbol.cs
@@ -65,6 +65,17 @@ internal override int ParameterCount
 
         internal sealed override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<CSharpAttributeData> attributes)
         {
+            if (_originalMethod is SourcePropertyAccessorSymbol { AssociatedSymbol: SourcePropertySymbolBase extensionProperty })
+            {
+                foreach (CSharpAttributeData attr in extensionProperty.GetAttributes())
+                {
+                    if (attr.IsTargetAttribute(AttributeDescription.OverloadResolutionPriorityAttribute))
+                    {
+                        AddSynthesizedAttribute(ref attributes, attr);
+                    }
+                }
+            }
+
             base.AddSynthesizedAttributes(moduleBuilder, ref attributes);
             SourceMethodSymbol.AddSynthesizedAttributes(this, moduleBuilder, ref attributes);
         }
@@ -110,6 +121,16 @@ internal override bool TryGetThisParameter(out ParameterSymbol? thisParameter)
             return true;
         }
 
+        internal override int TryGetOverloadResolutionPriority()
+        {
+            if (UnderlyingMethod is SourcePropertyAccessorSymbol { AssociatedSymbol: SourcePropertySymbol property })
+            {
+                return property.TryGetOverloadResolutionPriority();
+            }
+
+            return UnderlyingMethod.TryGetOverloadResolutionPriority();
+        }
+
         private sealed class ExtensionMetadataMethodParameterSymbol : RewrittenMethodParameterSymbol
         {
             public ExtensionMetadataMethodParameterSymbol(SourceExtensionImplementationMethodSymbol containingMethod, ParameterSymbol sourceParameter) :
diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEPropertySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEPropertySymbol.cs
@@ -1045,7 +1045,7 @@ internal override bool HasRuntimeSpecialName
 
         internal override int TryGetOverloadResolutionPriority()
         {
-            Debug.Assert(IsIndexer || IsIndexedProperty);
+            Debug.Assert(IsIndexer || IsIndexedProperty || this.GetIsNewExtensionMember());
             if (!_flags.IsOverloadResolutionPriorityPopulated)
             {
                 if (_containingType.ContainingPEModule.Module.TryGetOverloadResolutionPriorityValue(_handle, out int priority) &&
diff --git a/src/Compilers/CSharp/Portable/Symbols/NativeIntegerTypeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/NativeIntegerTypeSymbol.cs
@@ -399,6 +399,9 @@ internal sealed override bool HasAsyncMethodBuilderAttribute(out TypeSymbol? bui
             builderArgument = null;
             return false;
         }
+
+        internal override int TryGetOverloadResolutionPriority()
+            => UnderlyingMethod.TryGetOverloadResolutionPriority();
     }
 
     internal sealed class NativeIntegerParameterSymbol : WrappedParameterSymbol
diff --git a/src/Compilers/CSharp/Portable/Symbols/PropertySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/PropertySymbol.cs
@@ -356,7 +356,8 @@ internal int OverloadResolutionPriority
 
         internal abstract int TryGetOverloadResolutionPriority();
 
-        internal bool CanHaveOverloadResolutionPriority => !IsOverride && !IsExplicitInterfaceImplementation && (IsIndexer || IsIndexedProperty);
+        internal bool CanHaveOverloadResolutionPriority
+            => !IsOverride && !IsExplicitInterfaceImplementation && (IsIndexer || IsIndexedProperty || this.GetIsNewExtensionMember());
 
         /// <summary>
         /// Implements visitor pattern.
diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingMethodSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingMethodSymbol.cs
@@ -269,6 +269,9 @@ internal override bool TryGetThisParameter(out ParameterSymbol? thisParameter)
                 : null;
             return true;
         }
+
+        internal override int TryGetOverloadResolutionPriority()
+            => _underlyingMethod.TryGetOverloadResolutionPriority();
 #nullable disable
 
         public override AssemblySymbol ContainingAssembly
diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbolBase.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertySymbolBase.cs
@@ -1470,7 +1470,7 @@ internal override (CSharpAttributeData?, BoundAttribute?) EarlyDecodeWellKnownAt
 
                 return (null, null);
             }
-            else if (IsIndexer && CSharpAttributeData.IsTargetEarlyAttribute(arguments.AttributeType, arguments.AttributeSyntax, AttributeDescription.OverloadResolutionPriorityAttribute))
+            else if ((IsIndexer || this.GetIsNewExtensionMember()) && CSharpAttributeData.IsTargetEarlyAttribute(arguments.AttributeType, arguments.AttributeSyntax, AttributeDescription.OverloadResolutionPriorityAttribute))
             {
                 (attributeData, boundAttribute) = arguments.Binder.GetAttribute(arguments.AttributeSyntax, arguments.AttributeType, beforeAttributePartBound: null, afterAttributePartBound: null, out var hasAnyDiagnostics);
 
@@ -1733,7 +1733,7 @@ private void ValidateIndexerNameAttribute(CSharpAttributeData attribute, Attribu
 
         internal sealed override int TryGetOverloadResolutionPriority()
         {
-            Debug.Assert(this.IsIndexer);
+            Debug.Assert(this.IsIndexer || this.GetIsNewExtensionMember());
             return GetEarlyDecodedWellKnownAttributeData()?.OverloadResolutionPriority ?? 0;
         }
 
diff --git a/src/Compilers/CSharp/Portable/Symbols/SubstitutedMethodSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/SubstitutedMethodSymbol.cs
@@ -329,6 +329,9 @@ internal sealed override bool TryGetThisParameter(out ParameterSymbol thisParame
             return true;
         }
 
+        internal override int TryGetOverloadResolutionPriority()
+            => OriginalDefinition.TryGetOverloadResolutionPriority();
+
         private ImmutableArray<ParameterSymbol> SubstituteParameters()
         {
             var unsubstitutedParameters = OriginalDefinition.Parameters;
diff --git a/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedMethodSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedMethodSymbol.cs
@@ -364,10 +364,5 @@ internal override bool GenerateDebugInfo
         internal sealed override bool HasUnscopedRefAttribute => UnderlyingMethod.HasUnscopedRefAttribute;
 
         internal sealed override bool UseUpdatedEscapeRules => UnderlyingMethod.UseUpdatedEscapeRules;
-
-        internal sealed override int TryGetOverloadResolutionPriority()
-        {
-            return UnderlyingMethod.TryGetOverloadResolutionPriority();
-        }
     }
 }
diff --git a/src/Compilers/CSharp/Test/Emit3/Semantics/ExtensionTests.cs b/src/Compilers/CSharp/Test/Emit3/Semantics/ExtensionTests.cs
diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EECompilationContextMethod.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EECompilationContextMethod.cs

Original file line number	Diff line number	Diff line change
`@@ -1878,7 +1878,8 @@ private void RemoveLowerPriorityMembers<TMemberResolution, TMember>(ArrayBuilder`
`1878`	`1878`
`1879`	`1879`	`foreach (var result in results)`
`1880`	`1880`	`{`
`1881`		`- Debug.Assert(result.MemberWithPriority is not null);`
	`1881`	`+ TMember memberWithPriority = result.MemberWithPriority;`
	`1882`	`+ Debug.Assert(memberWithPriority is not null);`
`1882`	`1883`
`1883`	`1884`	`// We don't filter out inapplicable members here, as we want to keep them in the list for diagnostics`
`1884`	`1885`	`// However, we don't want to take them into account for the priority filtering`
`@@ -1888,11 +1889,14 @@ private void RemoveLowerPriorityMembers<TMemberResolution, TMember>(ArrayBuilder`
`1888`	`1889`	`continue;`
`1889`	`1890`	`}`
`1890`	`1891`
`1891`		`- var containingType = result.MemberWithPriority.ContainingType; // Tracked by https://github.com/dotnet/roslyn/issues/76130 : how should ORPA apply to new extension methods?`
	`1892`	`+ NamedTypeSymbol containingType = memberWithPriority.GetIsNewExtensionMember()`
	`1893`	`+ ? memberWithPriority.ContainingType.ContainingType`
	`1894`	`+ : memberWithPriority.ContainingType;`
	`1895`	`+`
`1892`	`1896`	`if (resultsByContainingType.TryGetValue(containingType, out var previousResults))`
`1893`	`1897`	`{`
`1894`	`1898`	`var previousPriority = previousResults.First().MemberWithPriority.GetOverloadResolutionPriority();`
`1895`		`- var currentPriority = result.MemberWithPriority.GetOverloadResolutionPriority();`
	`1899`	`+ var currentPriority = memberWithPriority.GetOverloadResolutionPriority();`
`1896`	`1900`
`1897`	`1901`	`if (currentPriority > previousPriority)`
`1898`	`1902`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ internal override bool TryGetThisParameter(out ParameterSymbol? thisParameter)`
`30`	`30`	`return true;`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ internal override int TryGetOverloadResolutionPriority()`
	`34`	`+ => _originalMethod.TryGetOverloadResolutionPriority();`
	`35`	`+`
`33`	`36`	`protected override ImmutableArray<ParameterSymbol> MakeParameters()`
`34`	`37`	`{`
`35`	`38`	`return ImmutableArray<ParameterSymbol>.CastUp(_originalMethod.Parameters.SelectAsArray(static (p, @this) => new RewrittenMethodParameterSymbol(@this, p), this));`
Original file line number	Diff line number	Diff line change
`@@ -1045,7 +1045,7 @@ internal override bool HasRuntimeSpecialName`
`1045`	`1045`
`1046`	`1046`	`internal override int TryGetOverloadResolutionPriority()`
`1047`	`1047`	`{`
`1048`		`- Debug.Assert(IsIndexer \|\| IsIndexedProperty);`
	`1048`	`+ Debug.Assert(IsIndexer \|\| IsIndexedProperty \|\| this.GetIsNewExtensionMember());`
`1049`	`1049`	`if (!_flags.IsOverloadResolutionPriorityPopulated)`
`1050`	`1050`	`{`
`1051`	`1051`	`if (_containingType.ContainingPEModule.Module.TryGetOverloadResolutionPriorityValue(_handle, out int priority) &&`
Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,9 @@ internal sealed override bool HasAsyncMethodBuilderAttribute(out TypeSymbol? bui`
`399`	`399`	`builderArgument = null;`
`400`	`400`	`return false;`
`401`	`401`	`}`
	`402`	`+`
	`403`	`+ internal override int TryGetOverloadResolutionPriority()`
	`404`	`+ => UnderlyingMethod.TryGetOverloadResolutionPriority();`
`402`	`405`	`}`
`403`	`406`
`404`	`407`	`internal sealed class NativeIntegerParameterSymbol : WrappedParameterSymbol`
Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,9 @@ internal override bool TryGetThisParameter(out ParameterSymbol? thisParameter)`
`269`	`269`	`: null;`
`270`	`270`	`return true;`
`271`	`271`	`}`
	`272`	`+`
	`273`	`+ internal override int TryGetOverloadResolutionPriority()`
	`274`	`+ => _underlyingMethod.TryGetOverloadResolutionPriority();`
`272`	`275`	`#nullable disable`
`273`	`276`
`274`	`277`	`public override AssemblySymbol ContainingAssembly`
Original file line number	Diff line number	Diff line change
`@@ -1470,7 +1470,7 @@ internal override (CSharpAttributeData?, BoundAttribute?) EarlyDecodeWellKnownAt`
`1470`	`1470`
`1471`	`1471`	`return (null, null);`
`1472`	`1472`	`}`
`1473`		`- else if (IsIndexer && CSharpAttributeData.IsTargetEarlyAttribute(arguments.AttributeType, arguments.AttributeSyntax, AttributeDescription.OverloadResolutionPriorityAttribute))`
	`1473`	`+ else if ((IsIndexer \|\| this.GetIsNewExtensionMember()) && CSharpAttributeData.IsTargetEarlyAttribute(arguments.AttributeType, arguments.AttributeSyntax, AttributeDescription.OverloadResolutionPriorityAttribute))`
`1474`	`1474`	`{`
`1475`	`1475`	`(attributeData, boundAttribute) = arguments.Binder.GetAttribute(arguments.AttributeSyntax, arguments.AttributeType, beforeAttributePartBound: null, afterAttributePartBound: null, out var hasAnyDiagnostics);`
`1476`	`1476`
`@@ -1733,7 +1733,7 @@ private void ValidateIndexerNameAttribute(CSharpAttributeData attribute, Attribu`
`1733`	`1733`
`1734`	`1734`	`internal sealed override int TryGetOverloadResolutionPriority()`
`1735`	`1735`	`{`
`1736`		`- Debug.Assert(this.IsIndexer);`
	`1736`	`+ Debug.Assert(this.IsIndexer \|\| this.GetIsNewExtensionMember());`
`1737`	`1737`	`return GetEarlyDecodedWellKnownAttributeData()?.OverloadResolutionPriority ?? 0;`
`1738`	`1738`	`}`
`1739`	`1739`
Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,9 @@ internal sealed override bool TryGetThisParameter(out ParameterSymbol thisParame`
`329`	`329`	`return true;`
`330`	`330`	`}`
`331`	`331`
	`332`	`+ internal override int TryGetOverloadResolutionPriority()`
	`333`	`+ => OriginalDefinition.TryGetOverloadResolutionPriority();`
	`334`	`+`
`332`	`335`	`private ImmutableArray<ParameterSymbol> SubstituteParameters()`
`333`	`336`	`{`
`334`	`337`	`var unsubstitutedParameters = OriginalDefinition.Parameters;`
Original file line number	Diff line number	Diff line change
`@@ -364,10 +364,5 @@ internal override bool GenerateDebugInfo`
`364`	`364`	`internal sealed override bool HasUnscopedRefAttribute => UnderlyingMethod.HasUnscopedRefAttribute;`
`365`	`365`
`366`	`366`	`internal sealed override bool UseUpdatedEscapeRules => UnderlyingMethod.UseUpdatedEscapeRules;`
`367`		`-`
`368`		`- internal sealed override int TryGetOverloadResolutionPriority()`
`369`		`- {`
`370`		`- return UnderlyingMethod.TryGetOverloadResolutionPriority();`
`371`		`- }`
`372`	`367`	`}`
`373`	`368`	`}`