From 44148107aee20ea86093c35a4c7da94621d848aa Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 12 Feb 2016 15:44:21 +0300 Subject: [PATCH] Optimize SamAdapterOverridabilityCondition Do not calculate it for non-static members, because SAM adapters only exist in static scope now --- .../kotlin/load/java/sam/SamAdapterOverridabilityCondition.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java index 8d8cd981757..7b1e0ebefd2 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java @@ -88,6 +88,8 @@ public class SamAdapterOverridabilityCondition implements ExternalOverridability // if function is or overrides declaration, returns null; otherwise, return original of sam adapter with substituted type parameters @Nullable private static SimpleFunctionDescriptor getOriginalOfSamAdapterFunction(@NotNull SimpleFunctionDescriptor callable) { + if (callable.getDispatchReceiverParameter() != null) return null; + DeclarationDescriptor containingDeclaration = callable.getContainingDeclaration(); if (!(containingDeclaration instanceof ClassDescriptor)) { return null;