Review feedback: move kotlin_.cinterop package to kotlinx

Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt

@@ -1,6 +1,6 @@
 package clang
 
-import kotlin_.cinterop.*
+import kotlinx.cinterop.*
 
 fun asctime(arg0: CPointer<tm>?): CPointer<CInt8Var>? {
     val _arg0 = arg0.rawValue

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) {

Interop/Runtime/src/callbacks/c/callbacks.c

@@ -4,101 +4,101 @@
 #include <ffi.h>
 
 /*
- * 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);
 }

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.

Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt

@@ -1,4 +1,4 @@
-package kotlin_.cinterop
+package kotlinx.cinterop
 
 import sun.misc.Unsafe
 

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

Interop/Runtime/src/main/kotlin/kotlin_/package-info.java

@@ -1,4 +0,0 @@
-/**
- * TODO: rename to kotlin
- */
-package kotlin_;

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.

Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt

@@ -1,4 +1,4 @@
-package kotlin_.cinterop
+package kotlinx.cinterop
 
 interface NativePlacement {
 

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;

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 {

InteropExample/src/main/kotlin/main.kt

@@ -1,4 +1,4 @@
-import kotlin_.cinterop.*
+import kotlinx.cinterop.*
 import llvm.*
 
 fun main(args: Array<String>) = memScoped {

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

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

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 {

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

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

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

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

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

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) {

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 kotlinx.cinterop.CPointer
-import kotlin_.cinterop.CPointerVarWithValueMappedTo
+import kotlinx.cinterop.CPointerVarWithValueMappedTo
 
 // TODO: the definitions below are required to perform smooth migration to new interop;
 // remove after replacing with LLVM*Ref typedefs