From 3e64baad78c659c5184fa0aefd658dd7bbf434e0 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Thu, 15 Oct 2015 12:45:40 +0300 Subject: [PATCH] Support multifile facades in isCallInsideSameClassAsDeclared --- .../src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 4e7ec3a4530..cce7d844f53 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -23,10 +23,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; -import org.jetbrains.kotlin.codegen.context.CodegenContext; -import org.jetbrains.kotlin.codegen.context.MethodContext; -import org.jetbrains.kotlin.codegen.context.PackageContext; -import org.jetbrains.kotlin.codegen.context.RootContext; +import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; @@ -80,7 +77,7 @@ public class JvmCodegenUtil { return !isFakeOverride && !isDelegate && (((context.hasThisDescriptor() && containingDeclaration == context.getThisDescriptor()) || - (context.getParentContext() instanceof PackageContext + ((context.getParentContext() instanceof PackageContext || context.getParentContext() instanceof MultifileClassPartContext) && isSamePackageInSameModule(context.getParentContext().getContextDescriptor(), containingDeclaration))) && context.getContextKind() != OwnerKind.DEFAULT_IMPLS); }