Deduplicate in PythonExtensionBinder instead

IronLanguages · Feb 24, 2023 · ee64134 · ee64134
1 parent e9bb7e5
commit ee64134
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Src/IronPython/Runtime/Binding/PythonExtensionBinder.cs b/Src/IronPython/Runtime/Binding/PythonExtensionBinder.cs
@@ -23,7 +23,8 @@ public PythonExtensionBinder(PythonBinder binder, ExtensionMethodSet extensionMe
         public override MemberGroup GetMember(MemberRequestKind actionKind, Type type, string name) {
             var res = base.GetMember(actionKind, type, name);
             if (res.Count == 0) {
-                List<MemberTracker> trackers = new List<MemberTracker>();
+                // GetExtensionMethods may return duplicate MethodInfo so use a HashSet - https://github.com/IronLanguages/ironpython2/issues/810
+                HashSet<MemberTracker> trackers = null;
 
                 foreach (var method in _extMethodSet.GetExtensionMethods(name)) {
                     var parameters = method.GetParameters();
@@ -34,11 +35,11 @@ public override MemberGroup GetMember(MemberRequestKind actionKind, Type type, s
                     var paramType = parameters[0].ParameterType;
 
                     if (IsApplicableExtensionMethod(type, paramType)) {
-                        trackers.Add(MemberTracker.FromMemberInfo(method, paramType));
+                        (trackers ??= new HashSet<MemberTracker>()).Add(MemberTracker.FromMemberInfo(method, paramType));
                     }
                 }
 
-                if (trackers.Count > 0) {
+                if (trackers is not null) {
                     return new MemberGroup(trackers.ToArray());
                 }
             }

diff --git a/Src/IronPython/Runtime/ExtensionMethodSet.cs b/Src/IronPython/Runtime/ExtensionMethodSet.cs
@@ -176,18 +176,15 @@ public IEnumerable<MethodInfo> GetExtensionMethods(string/*!*/ name) {
             lock (this) {
                 EnsureLoaded();
 
-                var yieldedMethods = new HashSet<MethodInfo>();
-
                 foreach (var keyValue in _loadedAssemblies) {
                     AssemblyLoadInfo info = keyValue.Value;
 
                     Debug.Assert(info.Types != null);
                     foreach (var type in info.Types) {
-                        if (type.ExtensionMethods.TryGetValue(name, out var methods)) {
+                        List<MethodInfo> methods;
+                        if (type.ExtensionMethods.TryGetValue(name, out methods)) {
                             foreach (var method in methods) {
-                                if (yieldedMethods.Add(method)) {
-                                    yield return method;
-                                }
+                                yield return method;
                             }
                         }
                     }