From dde1dcc760c880dbb173d9ce062231182abb66a3 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Fri, 26 Aug 2022 10:24:58 +0300 Subject: [PATCH] [K/N] Fix defFileDependencies --- .../kotlin/native/interop/gen/defFileDependencies.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt b/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt index 8fe749e2f8b..7b32bcc38e4 100644 --- a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt +++ b/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt @@ -1,6 +1,8 @@ package org.jetbrains.kotlin.native.interop.gen +import kotlinx.cinterop.usingJvmCInteropCallbacks import org.jetbrains.kotlin.konan.util.DefFile +import org.jetbrains.kotlin.konan.util.usingNativeMemoryAllocator import org.jetbrains.kotlin.native.interop.gen.jvm.KotlinPlatform import org.jetbrains.kotlin.native.interop.gen.jvm.buildNativeLibrary import org.jetbrains.kotlin.native.interop.gen.jvm.prepareTool @@ -31,8 +33,11 @@ fun defFileDependencies(args: Array, runFromDaemon: Boolean) { } } } - - defFileDependencies(makeDependencyAssigner(targets, defFiles, runFromDaemon)) + usingNativeMemoryAllocator { + usingJvmCInteropCallbacks { + defFileDependencies(makeDependencyAssigner(targets, defFiles, runFromDaemon)) + } + } } private fun makeDependencyAssigner(targets: List, defFiles: List, runFromDaemon: Boolean) =