From a0edf2934be1e465abb025eb7a18744362ac3769 Mon Sep 17 00:00:00 2001 From: pyos Date: Thu, 19 Sep 2019 10:47:26 +0200 Subject: [PATCH] JVM_IR: implement isCallInsideSameModuleAsDeclared --- .../kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt index 8a47b459be7..4e8472b5a79 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression import org.jetbrains.kotlin.ir.util.parentAsClass import org.jetbrains.kotlin.ir.util.render import org.jetbrains.kotlin.load.java.JvmAbi +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodGenericSignature import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature @@ -138,8 +139,8 @@ class IrSourceCompilerForInline( } override fun isCallInsideSameModuleAsDeclared(functionDescriptor: FunctionDescriptor): Boolean { - //TODO("not implemented") - return true + // TODO port to IR structures + return DescriptorUtils.areInSameModule(DescriptorUtils.getDirectMember(functionDescriptor), codegen.irFunction.descriptor) } override fun isFinallyMarkerRequired(): Boolean {