From 961b72682a9e18a7ce4390a6ffced5067a812007 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 12 Feb 2016 15:55:54 +0300 Subject: [PATCH] Drop unnecessary call to substituted 'overriddenDescriptors' --- .../jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt index 4bd29e0ac2f..bdba8b386d0 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt @@ -21,10 +21,10 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue fun FunctionDescriptor.hasJavaOriginInHierarchy(): Boolean { - return if (overriddenDescriptors.isEmpty()) + return if (original.overriddenDescriptors.isEmpty()) containingDeclaration is JavaClassDescriptor else - overriddenDescriptors.any { it.hasJavaOriginInHierarchy() } + original.overriddenDescriptors.any { it.hasJavaOriginInHierarchy() } } fun Visibility.isVisibleOutside() = this != Visibilities.PRIVATE && this != Visibilities.PRIVATE_TO_THIS && this != Visibilities.INVISIBLE_FAKE