From 498c33a4e08db4cbde693a9580b056be2b849557 Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Thu, 9 Mar 2017 15:34:11 +0700
Subject: [PATCH] Interop/StubGenerator: fix some bugs related to `typedef`

---
 .../native/interop/gen/jvm/StubGenerator.kt     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 07123c75b4e..687680d2c90 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
@@ -345,7 +345,7 @@ class StubGenerator(
 
         is PointerType -> {
             val pointeeType = type.pointeeType
-            if (pointeeType is VoidType) {
+            if (pointeeType.unwrapTypedefs() is VoidType) {
                 val info = TypeInfo.Pointer("COpaque")
                 TypeMirror.ByValue("COpaquePointerVar", info, "COpaquePointer")
             } else if (pointeeType is FunctionType) {
@@ -438,7 +438,7 @@ class StubGenerator(
     }
 
     fun getCallbackRetValBinding(type: Type): OutValueBinding {
-        if (type is VoidType) {
+        if (type.unwrapTypedefs() is VoidType) {
             return OutValueBinding(
                     kotlinType = "Unit",
                     kotlinConv = { throw UnsupportedOperationException() },
@@ -468,7 +468,7 @@ class StubGenerator(
     }
 
     fun getCFunctionRetValBinding(type: Type): InValueBinding {
-        when (type) {
+        when (type.unwrapTypedefs()) {
             is VoidType -> return InValueBinding("Unit")
         }
 
@@ -610,7 +610,7 @@ class StubGenerator(
         }.toMutableList()
 
         val retValType = func.returnType
-        if (retValType is RecordType) {
+        if (retValType.unwrapTypedefs() is RecordType) {
             val retValMirror = mirror(retValType)
 
             paramBindings.add(OutValueBinding(
@@ -636,7 +636,7 @@ class StubGenerator(
             }
         }.toMutableList()
 
-        if (func.returnType is RecordType) {
+        if (func.returnType.unwrapTypedefs() is RecordType) {
             paramNames.add("retValPlacement")
         }
 
@@ -730,11 +730,12 @@ class StubGenerator(
                 }
                 getFfiStructType(def.fields.map { it.type })
             }
+            is Typedef -> getFfiType(type.def.aliased)
             else -> throw NotImplementedError(type.toString())
         }
     }
 
-    private fun getArgFfiType(type: Type) = when (type) {
+    private fun getArgFfiType(type: Type) = when (type.unwrapTypedefs()) {
         is ArrayType -> "Pointer"
         else -> getFfiType(type)
     }
@@ -773,7 +774,7 @@ class StubGenerator(
                 val args = type.parameterTypes.mapIndexed { i, paramType ->
                     val pointedTypeName = mirror(paramType).pointedTypeName
                     val ref = "args[$i].value!!.reinterpret<$pointedTypeName>().pointed"
-                    when (paramType) {
+                    when (paramType.unwrapTypedefs()) {
                         is RecordType -> ref
                         else -> "$ref.value"
                     }
@@ -781,7 +782,7 @@ class StubGenerator(
 
                 out("val res = function($args)")
 
-                when (type.returnType) {
+                when (type.returnType.unwrapTypedefs()) {
                     is RecordType -> throw NotImplementedError()
                     is VoidType -> {} // nothing to do
                     else -> {