From c9881754314b793159dec0daa0b08aa7b959c245 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Wed, 23 Nov 2016 11:34:51 +0700 Subject: [PATCH] Review feedback: move `kotlin_.cinterop` package to `kotlinx` --- .../nativeInteropStubs/kotlin/clang/Clang.kt | 2 +- .../kotlin/native/interop/indexer/Indexer.kt | 2 +- Interop/Runtime/src/callbacks/c/callbacks.c | 66 +++++++++---------- .../cinterop/JvmCallbacks.kt | 2 +- .../cinterop/JvmNativeMem.kt | 2 +- .../{kotlin_ => kotlinx}/cinterop/JvmTypes.kt | 2 +- .../src/main/kotlin/kotlin_/package-info.java | 4 -- .../{kotlin_ => kotlinx}/cinterop/Types.kt | 2 +- .../{kotlin_ => kotlinx}/cinterop/Utils.kt | 2 +- .../kotlin/kotlinx/cinterop/package-info.java | 6 ++ .../native/interop/gen/jvm/StubGenerator.kt | 2 +- InteropExample/src/main/kotlin/main.kt | 2 +- .../backend/konan/llvm/CodeGenerator.kt | 2 +- .../kotlin/backend/konan/llvm/ContextUtils.kt | 2 +- .../kotlin/backend/konan/llvm/HashUtils.kt | 2 +- .../kotlin/backend/konan/llvm/IrToBitcode.kt | 2 +- .../kotlin/backend/konan/llvm/LlvmUtils.kt | 2 +- .../kotlin/backend/konan/llvm/Logger.kt | 2 +- .../backend/konan/llvm/MetadataGenerator.kt | 2 +- .../backend/konan/llvm/RTTIGenerator.kt | 2 +- .../kotlin/backend/konan/llvm/Runtime.kt | 2 +- .../kotlin/backend/konan/llvm/hacks.kt | 4 +- 22 files changed, 59 insertions(+), 57 deletions(-) rename Interop/Runtime/src/jvm/kotlin/{kotlin_ => kotlinx}/cinterop/JvmCallbacks.kt (99%) rename Interop/Runtime/src/jvm/kotlin/{kotlin_ => kotlinx}/cinterop/JvmNativeMem.kt (98%) rename Interop/Runtime/src/jvm/kotlin/{kotlin_ => kotlinx}/cinterop/JvmTypes.kt (97%) delete mode 100644 Interop/Runtime/src/main/kotlin/kotlin_/package-info.java rename Interop/Runtime/src/main/kotlin/{kotlin_ => kotlinx}/cinterop/Types.kt (99%) rename Interop/Runtime/src/main/kotlin/{kotlin_ => kotlinx}/cinterop/Utils.kt (99%) create mode 100644 Interop/Runtime/src/main/kotlin/kotlinx/cinterop/package-info.java diff --git a/Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt b/Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt index ffbef74fc09..8dff8851951 100644 --- a/Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt +++ b/Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt @@ -1,6 +1,6 @@ package clang -import kotlin_.cinterop.* +import kotlinx.cinterop.* fun asctime(arg0: CPointer?): CPointer? { val _arg0 = arg0.rawValue diff --git a/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt index 7444013972a..81ab2e5513e 100644 --- a/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt +++ b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt @@ -3,7 +3,7 @@ package org.jetbrains.kotlin.native.interop.indexer import clang.* import clang.CXIdxEntityKind.* import clang.CXTypeKind.* -import kotlin_.cinterop.* +import kotlinx.cinterop.* import java.io.File private class StructDeclImpl(spelling: String) : StructDecl(spelling) { diff --git a/Interop/Runtime/src/callbacks/c/callbacks.c b/Interop/Runtime/src/callbacks/c/callbacks.c index eef64ee4ad5..426ac7af7cf 100644 --- a/Interop/Runtime/src/callbacks/c/callbacks.c +++ b/Interop/Runtime/src/callbacks/c/callbacks.c @@ -4,101 +4,101 @@ #include /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeVoid * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeVoid(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeVoid(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_void; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeUInt8 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeUInt8(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeUInt8(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_uint8; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeSInt8 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeSInt8(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeSInt8(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_sint8; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeUInt16 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeUInt16(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeUInt16(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_uint16; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeSInt16 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeSInt16(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeSInt16(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_sint16; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeUInt32 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeUInt32(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeUInt32(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_uint32; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeSInt32 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeSInt32(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeSInt32(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_sint32; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeUInt64 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeUInt64(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeUInt64(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_uint64; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeSInt64 * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeSInt64(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeSInt64(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_sint64; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypePointer * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypePointer(JNIEnv *env, jclass cls) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypePointer(JNIEnv *env, jclass cls) { return (jlong) &ffi_type_pointer; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiTypeStruct0 * Signature: (J)J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeStruct0(JNIEnv *env, jclass cls, jlong elements) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiTypeStruct0(JNIEnv *env, jclass cls, jlong elements) { ffi_type* res = malloc(sizeof(ffi_type)); if (res != NULL) { res->size = 0; @@ -110,11 +110,11 @@ JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiTypeStruct0(JNI } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiCreateCif0 * Signature: (IJJ)J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiCreateCif0(JNIEnv *env, jclass cls, jint nArgs, jlong rType, jlong argTypes) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiCreateCif0(JNIEnv *env, jclass cls, jint nArgs, jlong rType, jlong argTypes) { ffi_cif* res = malloc(sizeof(ffi_cif)); if (res != NULL) { ffi_status status = ffi_prep_cif(res, FFI_DEFAULT_ABI, nArgs, (ffi_type*)rType, (ffi_type**)argTypes); @@ -166,7 +166,7 @@ static void ffi_fun(ffi_cif *cif, void *ret, void **args, void *user_data) { static jmethodID ffiFunImpl0 = NULL; static jclass cls = NULL; if (ffiFunImpl0 == NULL) { - jclass clsLocal = (*env)->FindClass(env, "kotlin_/cinterop/JvmCallbacksKt"); + jclass clsLocal = (*env)->FindClass(env, "kotlinx/cinterop/JvmCallbacksKt"); checkException(env); assert(clsLocal != NULL); @@ -184,11 +184,11 @@ static void ffi_fun(ffi_cif *cif, void *ret, void **args, void *user_data) { } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: ffiCreateClosure0 * Signature: (JLjava/lang/Object;)J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiCreateClosure0(JNIEnv *env, jclass cls, jlong ffiCif, jobject userData) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_ffiCreateClosure0(JNIEnv *env, jclass cls, jlong ffiCif, jobject userData) { jobject userDataGlobalRef = (*env)->NewGlobalRef(env, userData); if (userDataGlobalRef == NULL) { return (jlong)0; @@ -211,29 +211,29 @@ JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_ffiCreateClosure0( } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: newGlobalRef * Signature: (Ljava/lang/Object;)J */ -JNIEXPORT jlong JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_newGlobalRef(JNIEnv *env, jclass cls, jobject obj) { +JNIEXPORT jlong JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_newGlobalRef(JNIEnv *env, jclass cls, jobject obj) { jobject res = (*env)->NewGlobalRef(env, obj); return (jlong) res; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: derefGlobalRef * Signature: (J)Ljava/lang/Object; */ -JNIEXPORT jobject JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_derefGlobalRef(JNIEnv *env, jclass cls, jlong ref) { +JNIEXPORT jobject JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_derefGlobalRef(JNIEnv *env, jclass cls, jlong ref) { return (jobject) ref; } /* - * Class: kotlin__cinterop_JvmCallbacksKt + * Class: kotlinx_cinterop_JvmCallbacksKt * Method: deleteGlobalRef * Signature: (J)V */ -JNIEXPORT void JNICALL Java_kotlin_1_cinterop_JvmCallbacksKt_deleteGlobalRef(JNIEnv *env, jclass cls, jlong ref) { +JNIEXPORT void JNICALL Java_kotlinx_cinterop_JvmCallbacksKt_deleteGlobalRef(JNIEnv *env, jclass cls, jlong ref) { (*env)->DeleteGlobalRef(env, (jobject) ref); } diff --git a/Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmCallbacks.kt b/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmCallbacks.kt similarity index 99% rename from Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmCallbacks.kt rename to Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmCallbacks.kt index 5827836e8e6..598fa97700b 100644 --- a/Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmCallbacks.kt +++ b/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmCallbacks.kt @@ -1,4 +1,4 @@ -package kotlin_.cinterop +package kotlinx.cinterop /** * This class provides a way to create a stable handle to any Kotlin object. diff --git a/Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmNativeMem.kt b/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt similarity index 98% rename from Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmNativeMem.kt rename to Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt index 048ded7c1cd..41ddc6e58e1 100644 --- a/Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmNativeMem.kt +++ b/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt @@ -1,4 +1,4 @@ -package kotlin_.cinterop +package kotlinx.cinterop import sun.misc.Unsafe diff --git a/Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmTypes.kt b/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmTypes.kt similarity index 97% rename from Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmTypes.kt rename to Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmTypes.kt index ecf369bc997..f4665fefe3f 100644 --- a/Interop/Runtime/src/jvm/kotlin/kotlin_/cinterop/JvmTypes.kt +++ b/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmTypes.kt @@ -1,4 +1,4 @@ -package kotlin_.cinterop +package kotlinx.cinterop import kotlin.reflect.companionObjectInstance import kotlin.reflect.primaryConstructor diff --git a/Interop/Runtime/src/main/kotlin/kotlin_/package-info.java b/Interop/Runtime/src/main/kotlin/kotlin_/package-info.java deleted file mode 100644 index 8729a26605b..00000000000 --- a/Interop/Runtime/src/main/kotlin/kotlin_/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO: rename to kotlin - */ -package kotlin_; \ No newline at end of file diff --git a/Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Types.kt b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Types.kt similarity index 99% rename from Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Types.kt rename to Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Types.kt index 353bd7791f1..5bcba74cc31 100644 --- a/Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Types.kt +++ b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Types.kt @@ -1,4 +1,4 @@ -package kotlin_.cinterop +package kotlinx.cinterop /** * The entity which has an associated native pointer. diff --git a/Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Utils.kt b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt similarity index 99% rename from Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Utils.kt rename to Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt index 94063f1763e..a97d1fa3a70 100644 --- a/Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Utils.kt +++ b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt @@ -1,4 +1,4 @@ -package kotlin_.cinterop +package kotlinx.cinterop interface NativePlacement { diff --git a/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/package-info.java b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/package-info.java new file mode 100644 index 00000000000..a98e94a8be8 --- /dev/null +++ b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/package-info.java @@ -0,0 +1,6 @@ +/** + * This package contains API and runtime support for calling C code from Kotlin (aka Kotlin C interop). + * + * TODO: decide about package location. + */ +package kotlinx.cinterop; \ No newline at end of file diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt index 97e981b405b..02b02fcddc9 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt @@ -750,7 +750,7 @@ class StubGenerator( out("package $pkgName") out("") } - out("import kotlin_.cinterop.*") + out("import kotlinx.cinterop.*") out("") functionsToBind.forEach { diff --git a/InteropExample/src/main/kotlin/main.kt b/InteropExample/src/main/kotlin/main.kt index a617122187a..a000c9359d7 100644 --- a/InteropExample/src/main/kotlin/main.kt +++ b/InteropExample/src/main/kotlin/main.kt @@ -1,4 +1,4 @@ -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* fun main(args: Array) = memScoped { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt index 7e77b66de05..b3b3a422b9e 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt index 1b870f6b58c..f3d9e9e696c 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.backend.konan.hash.GlobalHash import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt index c1b4f3e99df..59f47e1b49c 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import org.jetbrains.kotlin.backend.konan.hash.* internal fun localHash(data: ByteArray): Long { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt index 964f1a6f291..7cd632490b8 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.backend.konan.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt index d10721d3922..effa55a0629 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt index 68d30c2bd31..f435a1f7248 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.util.DumpIrTreeVisitor diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt index e4921051b5a..4a6361b3957 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.declarations.IrModuleFragment diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt index 37d3898e950..6687ebc45ce 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* import org.jetbrains.kotlin.backend.konan.implementation import org.jetbrains.kotlin.backend.konan.implementedInterfaces diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt index e1bca6c09a5..76a351126eb 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.* +import kotlinx.cinterop.* import llvm.* class Runtime(private val bitcodeFile: String) { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/hacks.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/hacks.kt index 61ae7f895cc..d06c0355cdd 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/hacks.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/hacks.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.backend.konan.llvm -import kotlin_.cinterop.CPointer -import kotlin_.cinterop.CPointerVarWithValueMappedTo +import kotlinx.cinterop.CPointer +import kotlinx.cinterop.CPointerVarWithValueMappedTo // TODO: the definitions below are required to perform smooth migration to new interop; // remove after replacing with LLVM*Ref typedefs