azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore suspend functions in reverse C interop. (#2189)

Browse Source
This commit is contained in:
Nikolay Igotti
2018-10-10 10:26:36 +03:00
committed by GitHub
parent 26c775938e
commit 0cdd076210
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt
+2 -4
View File
@@ -107,6 +107,8 @@ private fun org.jetbrains.kotlin.types.KotlinType.isGeneric() =
private fun isExportedFunction(descriptor: FunctionDescriptor): Boolean { private fun isExportedFunction(descriptor: FunctionDescriptor): Boolean {
if (!descriptor.isEffectivelyPublicApi || !descriptor.kind.isReal || descriptor.isExpect) if (!descriptor.isEffectivelyPublicApi || !descriptor.kind.isReal || descriptor.isExpect)
return false return false
if (descriptor.isSuspend)
return false
descriptor.allParameters.forEach { descriptor.allParameters.forEach {
if (it.type.isGeneric()) return false if (it.type.isGeneric()) return false
} }
@@ -276,9 +278,6 @@ private class ExportedElement(val kind: ElementKind,
val original = descriptor.original as FunctionDescriptor val original = descriptor.original as FunctionDescriptor
val returned = when { val returned = when {
original is ConstructorDescriptor -> uniqueName(original, shortName) to original.constructedClass original is ConstructorDescriptor -> uniqueName(original, shortName) to original.constructedClass
// Suspend functions actually return 'Any?'.
original.isSuspend -> uniqueName(original, shortName) to
TypeUtils.getClassDescriptor(owner.context.builtIns.nullableAnyType)!!
else -> uniqueName(original, shortName) to TypeUtils.getClassDescriptor(original.returnType!!)!! else -> uniqueName(original, shortName) to TypeUtils.getClassDescriptor(original.returnType!!)!!
} }
val uniqueNames = owner.paramsToUniqueNames(original.explicitParameters) val uniqueNames = owner.paramsToUniqueNames(original.explicitParameters)
@@ -298,7 +297,6 @@ private class ExportedElement(val kind: ElementKind,
val original = descriptor.original as FunctionDescriptor val original = descriptor.original as FunctionDescriptor
val returnedType = when { val returnedType = when {
original is ConstructorDescriptor -> owner.context.builtIns.unitType original is ConstructorDescriptor -> owner.context.builtIns.unitType
original.isSuspend -> owner.context.builtIns.nullableAnyType
else -> original.returnType!! else -> original.returnType!!
} }
val returnedClass = TypeUtils.getClassDescriptor(returnedType)!! val returnedClass = TypeUtils.getClassDescriptor(returnedType)!!