Combine nearby loops to prevent crash building dotnet/runtime

dotnet · Aug 19, 2020 · fd91c43 · fd91c43
1 parent 9cf5d95
commit fd91c43
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEMethodSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEMethodSymbol.cs
@@ -1216,19 +1216,14 @@ public override ImmutableArray<MethodSymbol> ExplicitInterfaceImplementations
                 if (anyToRemove)
                 {
                     var explicitInterfaceImplementationsBuilder = ArrayBuilder<MethodSymbol>.GetInstance();
+                    MethodSymbol uniqueClassOverride = null;
                     foreach (var method in explicitlyOverriddenMethods)
                     {
                         if (method.ContainingType.IsInterface)
                         {
                             explicitInterfaceImplementationsBuilder.Add(method);
                         }
-                    }
-
-                    explicitInterfaceImplementations = explicitInterfaceImplementationsBuilder.ToImmutableAndFree();
 
-                    MethodSymbol uniqueClassOverride = null;
-                    foreach (MethodSymbol method in explicitlyOverriddenMethods)
-                    {
                         if (method.ContainingType.IsClassType())
                         {
                             if (uniqueClassOverride is { })
@@ -1242,6 +1237,8 @@ public override ImmutableArray<MethodSymbol> ExplicitInterfaceImplementations
                         }
                     }
 
+                    explicitInterfaceImplementations = explicitInterfaceImplementationsBuilder.ToImmutableAndFree();
+
                     if (uniqueClassOverride is { })
                     {
                         Interlocked.CompareExchange(ref AccessUncommonFields()._lazyExplicitClassOverride, uniqueClassOverride, null);