Allow passing interop types to C API, refactoring.

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt

@@ -94,6 +94,13 @@ private val cnameAnnotation = FqName("konan.internal.CName")
 private fun org.jetbrains.kotlin.types.KotlinType.isGeneric() =
         constructor.declarationDescriptor is TypeParameterDescriptor
 
+private val ClassDescriptor.isString
+    get() = fqNameSafe.asString() == "kotlin.String"
+
+private val ClassDescriptor.isValueType
+    get() = this.defaultType.correspondingValueType != null
+
+
 private fun isExportedFunction(descriptor: FunctionDescriptor): Boolean {
     if (!descriptor.isEffectivelyPublicApi || !descriptor.kind.isReal)
         return false
@@ -329,9 +336,8 @@ private class ExportedElement(val kind: ElementKind,
 
     private fun translateArgument(name: String, clazz: ClassDescriptor, direction: Direction,
                                   builder: StringBuilder): String {
-        val fqName = clazz.fqNameSafe.asString()
         return when {
-            fqName == "kotlin.String" ->
+            clazz.isString ->
                 if (direction == Direction.C_TO_KOTLIN) {
                     builder.append("  KObjHolder ${name}_holder;\n")
                     "CreateStringFromCString($name, ${name}_holder.slot())"
@@ -345,7 +351,10 @@ private class ExportedElement(val kind: ElementKind,
                 } else {
                     "((${owner.translateType(clazz)}){ .pinned = CreateStablePointer(${name})})"
                 }
-            else -> name
+            else -> {
+                assert(clazz.isValueType)
+                name
+            }
         }
     }
 
@@ -830,23 +839,24 @@ internal class CAdapterGenerator(
     )
 
     private val primitiveTypeMapping = mapOf(
-            "kotlin.Byte" to "${prefix}_KByte",
+            ValueType.BOOLEAN to "${prefix}_KByte",
-            "kotlin.Short" to "${prefix}_KShort",
+            ValueType.SHORT to "${prefix}_KShort",
-            "kotlin.Int" to "${prefix}_KInt",
+            ValueType.INT to "${prefix}_KInt",
-            "kotlin.Long" to "${prefix}_KLong",
+            ValueType.LONG to "${prefix}_KLong",
-            "kotlin.Float" to "${prefix}_KFloat",
+            ValueType.FLOAT to "${prefix}_KFloat",
-            "kotlin.Double" to "${prefix}_KDouble",
+            ValueType.DOUBLE to "${prefix}_KDouble",
-            "kotlin.Boolean" to "${prefix}_KBoolean",
+            ValueType.CHAR to "${prefix}_KChar",
-            "kotlin.Char" to "${prefix}_KChar"
+            ValueType.C_POINTER to "void*",
+            ValueType.NATIVE_PTR to "void*",
+            ValueType.NATIVE_POINTED to "void*"
     )
 
     internal fun isMappedToString(descriptor: ClassDescriptor) =
             descriptor.fqNameSafe.asString() == "kotlin.String"
 
-    internal fun isMappedToReference(descriptor: ClassDescriptor): Boolean {
+    internal fun isMappedToReference(descriptor: ClassDescriptor) =
-        val name = descriptor.fqNameSafe.asString()
+            !descriptor.isUnit() && !isMappedToString(descriptor) &&
-        return !descriptor.isUnit() && name != "kotlin.String" && !primitiveTypeMapping.contains(name)
+                    !primitiveTypeMapping.contains(descriptor.defaultType.correspondingValueType)
-    }
 
     internal fun isMappedToVoid(descriptor: ClassDescriptor): Boolean {
         return descriptor.isUnit()
@@ -862,10 +872,11 @@ internal class CAdapterGenerator(
 
     private fun translateTypeFull(clazz: ClassDescriptor): Pair<String, String> {
         val fqName = clazz.fqNameSafe.asString()
+        val valueType = clazz.defaultType.correspondingValueType
         return when {
             clazz.isUnit() -> "void" to "void"
             fqName == "kotlin.String" -> "const char*" to "KObjHeader*"
-            primitiveTypeMapping.contains(fqName) -> primitiveTypeMapping[fqName]!! to primitiveTypeMapping[fqName]!!
+            valueType != null && primitiveTypeMapping.contains(valueType) -> primitiveTypeMapping[valueType]!! to primitiveTypeMapping[valueType]!!
             else -> "${prefix}_kref_${translateTypeFqName(clazz.fqNameSafe.asString())}" to "KObjHeader*"
         }
     }

backend.native/tests/produce_dynamic/simple/hello.kt

@@ -1,3 +1,4 @@
+import kotlinx.cinterop.*
 
 // Top level functions.
 fun hello() {
@@ -16,12 +17,14 @@ open class Base {
 
 }
 
+// Top level functions.
 @konan.internal.CName(fullName = "topLevelFunctionFromC", shortName = "topLevelFunctionFromCShort")
 fun topLevelFunction(x1: Int, x2: Int) = x1 - x2
 
 @konan.internal.CName("topLevelFunctionVoidFromC")
-fun topLevelFunctionVoid(x1: Int) {
+fun topLevelFunctionVoid(x1: Int, pointer: COpaquePointer?) {
     assert(x1 == 42)
+    assert(pointer == null)
 }
 
 // Enum.

backend.native/tests/produce_dynamic/simple/main.c

@@ -36,8 +36,8 @@ int main(void) {
 
     printf("object = %d\n",  __ kotlin.root.Codeable.asCode(object1));
 
-    topLevelFunctionVoidFromC(42);
+    topLevelFunctionVoidFromC(42, 0);
-    __ kotlin.root.topLevelFunctionVoid(42);
+    __ kotlin.root.topLevelFunctionVoid(42, 0);
     printf("topLevel = %d %d\n", topLevelFunctionFromC(780, 3), __ kotlin.root.topLevelFunctionFromCShort(5, 2));
 
     __ DisposeString(string);