getAllOverriddenDescriptors() moved to DescriptorUtils

compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt

@@ -21,8 +21,8 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.types.JetType
 import kotlin.platform.platformStatic
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
-import org.jetbrains.jet.lang.resolve.OverrideResolver
 import org.jetbrains.jet.utils.keysToMapExceptNulls
+import org.jetbrains.jet.lang.resolve.DescriptorUtils
 
 public object CodegenUtilKt {
 
@@ -43,7 +43,7 @@ public object CodegenUtilKt {
             .keysToMapExceptNulls {
                 delegatingMember ->
 
-                val actualDelegates = OverrideResolver.getAllOverriddenDescriptors(delegatingMember)
+                val actualDelegates = DescriptorUtils.getAllOverriddenDescriptors(delegatingMember)
                         .filter { it.getContainingDeclaration() == toTrait }
                         .map {
                             overriddenDescriptor ->
@@ -53,7 +53,7 @@ public object CodegenUtilKt {
                             // this is the actual member of delegateExpressionType that we are delegating to
                             (scope.getFunctions(name) + scope.getProperties(name))
                                     .first {
-                                        (listOf(it) + OverrideResolver.getAllOverriddenDescriptors(it)).map {it.getOriginal()}.contains(overriddenDescriptor.getOriginal())
+                                        (listOf(it) + DescriptorUtils.getAllOverriddenDescriptors(it)).map { it.getOriginal() }.contains(overriddenDescriptor.getOriginal())
                                     }
                         }
                 assert(actualDelegates.size <= 1) { "Meny delegates found for $delegatingMember: $actualDelegates" }

compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java

@@ -685,7 +685,7 @@ public class JetTypeMapper {
         //noinspection ConstantConditions
         if (!KotlinBuiltIns.getInstance().isPrimitiveType(descriptor.getReturnType())) return false;
 
-        for (FunctionDescriptor overridden : OverrideResolver.getAllOverriddenDescriptors(descriptor)) {
+        for (FunctionDescriptor overridden : getAllOverriddenDescriptors(descriptor)) {
             //noinspection ConstantConditions
             if (!KotlinBuiltIns.getInstance().isPrimitiveType(overridden.getOriginal().getReturnType())) return true;
         }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java

@@ -298,30 +298,12 @@ public class OverrideResolver {
         // As other code relies on no equal descriptors passed here, we guard against f == g, but this may not be necessary
         if (!f.equals(g) && DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(f.getOriginal(), g.getOriginal())) return true;
         CallableDescriptor originalG = g.getOriginal();
-        for (D overriddenFunction : getAllOverriddenDescriptors(f)) {
+        for (D overriddenFunction : DescriptorUtils.getAllOverriddenDescriptors(f)) {
             if (DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(originalG, overriddenFunction.getOriginal())) return true;
         }
         return false;
     }
 
-    @NotNull
-    @SuppressWarnings("unchecked")
-    public static <D extends CallableDescriptor> Set<D> getAllOverriddenDescriptors(@NotNull D f) {
-        Set<D> result = new LinkedHashSet<D>();
-        collectAllOverriddenDescriptors((D) f.getOriginal(), result);
-        return result;
-    }
-
-    private static <D extends CallableDescriptor> void collectAllOverriddenDescriptors(@NotNull D current, @NotNull Set<D> result) {
-        if (result.contains(current)) return;
-        for (CallableDescriptor callableDescriptor : current.getOriginal().getOverriddenDescriptors()) {
-            @SuppressWarnings("unchecked")
-            D descriptor = (D) callableDescriptor;
-            collectAllOverriddenDescriptors(descriptor, result);
-            result.add(descriptor);
-        }
-    }
-
     private static <T extends DeclarationDescriptor> MultiMap<Name, T> groupDescriptorsByName(Collection<T> properties) {
         MultiMap<Name, T> r = new LinkedMultiMap<Name, T>();
         for (T property : properties) {
@@ -999,31 +981,10 @@ public class OverrideResolver {
         return filterOutOverridden(result);
     }
 
-    @NotNull
-    public static <D extends CallableMemberDescriptor> Set<D> getAllOverriddenDeclarations(@NotNull D memberDescriptor) {
-        Set<D> result = Sets.newHashSet();
-        for (CallableMemberDescriptor overriddenDeclaration : memberDescriptor.getOverriddenDescriptors()) {
-            CallableMemberDescriptor.Kind kind = overriddenDeclaration.getKind();
-            if (kind == DECLARATION) {
-                //noinspection unchecked
-                result.add((D) overriddenDeclaration);
-            }
-            else if (kind == DELEGATION || kind == FAKE_OVERRIDE || kind == SYNTHESIZED) {
-                //do nothing
-            }
-            else {
-                throw new AssertionError("Unexpected callable kind " + kind);
-            }
-            //noinspection unchecked
-            result.addAll(getAllOverriddenDeclarations((D) overriddenDeclaration));
-        }
-        return result;
-    }
-
     @NotNull
     @ReadOnly
     public static <D extends CallableMemberDescriptor> Set<D> getDeepestSuperDeclarations(@NotNull D functionDescriptor) {
-        Set<D> overriddenDeclarations = getAllOverriddenDeclarations(functionDescriptor);
+        Set<D> overriddenDeclarations = DescriptorUtils.getAllOverriddenDeclarations(functionDescriptor);
         if (overriddenDeclarations.isEmpty()) {
             return Collections.singleton(functionDescriptor);
         }