diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index ac0e834279e..288f8fc46b5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -229,7 +229,7 @@ public class DescriptorResolver { } @NotNull - public SimpleFunctionDescriptor resolveFunctionDescriptorWithAnnotationArguments( + public SimpleFunctionDescriptor resolveFunctionDescriptor( @NotNull DeclarationDescriptor containingDescriptor, @NotNull JetScope scope, @NotNull JetNamedFunction function, @@ -252,18 +252,6 @@ public class DescriptorResolver { annotationResolver.resolveAnnotationsWithArguments(scope, function.getModifierList(), trace), true); } - @NotNull - public SimpleFunctionDescriptor resolveFunctionDescriptor( - @NotNull DeclarationDescriptor containingDescriptor, - @NotNull JetScope scope, - @NotNull JetNamedFunction function, - @NotNull BindingTrace trace, - @NotNull DataFlowInfo dataFlowInfo - ) { - return resolveFunctionDescriptor(containingDescriptor, scope, function, trace, dataFlowInfo, - annotationResolver.resolveAnnotationsWithoutArguments(scope, function.getModifierList(), trace), false); - } - @NotNull private SimpleFunctionDescriptor resolveFunctionDescriptor( @NotNull DeclarationDescriptor containingDescriptor, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index 40cf5f30146..2e2e3f3416d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -69,7 +69,7 @@ public abstract class AbstractLazyMemberScope