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

[Metadata][Interop] Fix KT-39762

Browse Source 
Do not omit declaration that we couldn't import. Mark in as deprecated instead.
This commit is contained in:
Sergey Bogolepov
2020-07-24 18:22:47 +07:00
committed by Sergey Bogolepov
parent e93c623c40
commit 6efc488084
2 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIr.kt
+7 -3
View File
@@ -216,7 +216,11 @@ sealed class AnnotationStub(val classifier: Classifier) {
AnnotationStub(Classifier.topLevel(cinteropPackage, "CLength")) AnnotationStub(Classifier.topLevel(cinteropPackage, "CLength"))
class Deprecated(val message: String, val replaceWith: String) : class Deprecated(val message: String, val replaceWith: String) :
AnnotationStub(Classifier.topLevel("kotlin", "Deprecated")) AnnotationStub(Classifier.topLevel("kotlin", "Deprecated")) {
companion object {
val unableToImport = Deprecated("Unable to import this declaration", "")
}
}
class CEnumEntryAlias(val entryName: String) : class CEnumEntryAlias(val entryName: String) :
@@ -241,7 +245,7 @@ data class IntegralConstantStub(val value: Long, val size: Int, val isSigned: Bo
data class DoubleConstantStub(val value: Double, val size: Int) : ConstantStub() data class DoubleConstantStub(val value: Double, val size: Int) : ConstantStub()
class PropertyStub( data class PropertyStub(
val name: String, val name: String,
val type: StubType, val type: StubType,
val kind: Kind, val kind: Kind,
@@ -460,7 +464,7 @@ sealed class PropertyAccessor : FunctionalStub {
} }
class FunctionStub( data class FunctionStub(
val name: String, val name: String,
val returnType: StubType, val returnType: StubType,
override val parameters: List<FunctionParameterStub>, override val parameters: List<FunctionParameterStub>,
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt
+54 -49
View File
@@ -152,46 +152,54 @@ internal class ModuleMetadataEmitter(
override fun visitFunction(element: FunctionStub, data: VisitingContext) = override fun visitFunction(element: FunctionStub, data: VisitingContext) =
data.withMappingExtensions { data.withMappingExtensions {
if (bridgeBuilderResult.nativeBridges.isSupported(element)) { val function = if (bridgeBuilderResult.nativeBridges.isSupported(element)) {
KmFunction(element.flags, element.name).also { km -> element
km.receiverParameterType = element.receiver?.type?.map()
element.typeParameters.mapTo(km.typeParameters) { it.map() }
element.parameters.mapTo(km.valueParameters) { it.map() }
element.annotations.mapTo(km.annotations) { it.map() }
km.returnType = element.returnType.map()
km.uniqId = data.uniqIds.uniqIdForFunction(element)
}
} else { } else {
null element.copy(
external = false,
annotations = listOf(AnnotationStub.Deprecated.unableToImport)
)
}
KmFunction(function.flags, function.name).also { km ->
km.receiverParameterType = function.receiver?.type?.map()
function.typeParameters.mapTo(km.typeParameters) { it.map() }
function.parameters.mapTo(km.valueParameters) { it.map() }
function.annotations.mapTo(km.annotations) { it.map() }
km.returnType = function.returnType.map()
km.uniqId = data.uniqIds.uniqIdForFunction(function)
} }
} }
override fun visitProperty(element: PropertyStub, data: VisitingContext) = override fun visitProperty(element: PropertyStub, data: VisitingContext) =
data.withMappingExtensions { data.withMappingExtensions {
val kind = element.bridgeSupportedKind val property = when (val bridgeSupportedKind = element.bridgeSupportedKind) {
if (kind != null) { null -> element.copy(
val name = getPropertyNameInScope(element, data.container) kind = PropertyStub.Kind.Val(PropertyAccessor.Getter.SimpleGetter()),
KmProperty(element.flags, name, kind.getterFlags, kind.setterFlags).also { km -> annotations = listOf(AnnotationStub.Deprecated.unableToImport)
element.annotations.mapTo(km.annotations) { it.map() } )
km.uniqId = data.uniqIds.uniqIdForProperty(element) element.kind -> element
km.receiverParameterType = element.receiverType?.map() else -> element.copy(kind = bridgeSupportedKind)
km.returnType = element.type.map() }
if (kind is PropertyStub.Kind.Var) { val kind = property.kind
kind.setter.annotations.mapTo(km.setterAnnotations) { it.map() } val name = getPropertyNameInScope(property, data.container)
// TODO: Maybe it's better to explicitly add setter parameter in stub. KmProperty(property.flags, name, kind.getterFlags, kind.setterFlags).also { km ->
km.setterParameter = FunctionParameterStub("value", element.type).map() property.annotations.mapTo(km.annotations) { it.map() }
} km.uniqId = data.uniqIds.uniqIdForProperty(property)
km.getterAnnotations += when (kind) { km.receiverParameterType = property.receiverType?.map()
is PropertyStub.Kind.Val -> kind.getter.annotations.map { it.map() } km.returnType = property.type.map()
is PropertyStub.Kind.Var -> kind.getter.annotations.map { it.map() } if (kind is PropertyStub.Kind.Var) {
is PropertyStub.Kind.Constant -> emptyList() kind.setter.annotations.mapTo(km.setterAnnotations) { it.map() }
} // TODO: Maybe it's better to explicitly add setter parameter in stub.
if (kind is PropertyStub.Kind.Constant) { km.setterParameter = FunctionParameterStub("value", property.type).map()
km.compileTimeValue = kind.constant.mapToAnnotationArgument() }
} km.getterAnnotations += when (kind) {
is PropertyStub.Kind.Val -> kind.getter.annotations.map { it.map() }
is PropertyStub.Kind.Var -> kind.getter.annotations.map { it.map() }
is PropertyStub.Kind.Constant -> emptyList()
}
if (kind is PropertyStub.Kind.Constant) {
km.compileTimeValue = kind.constant.mapToAnnotationArgument()
} }
} else {
null
} }
} }
@@ -272,22 +280,19 @@ private class MappingExtensions(
} }
val PropertyStub.flags: Flags val PropertyStub.flags: Flags
get() { get() = flagsOfNotNull(
val kind = bridgeSupportedKind ?: return flagsOf() Flag.IS_PUBLIC,
return flagsOfNotNull( Flag.Property.IS_DECLARATION,
Flag.IS_PUBLIC, Flag.HAS_ANNOTATIONS.takeIf { annotations.isNotEmpty() },
Flag.Property.IS_DECLARATION, Flag.Property.HAS_CONSTANT.takeIf { kind is PropertyStub.Kind.Constant },
Flag.HAS_ANNOTATIONS.takeIf { annotations.isNotEmpty() }, Flag.Property.HAS_GETTER,
Flag.Property.HAS_CONSTANT.takeIf { kind is PropertyStub.Kind.Constant }, Flag.Property.HAS_SETTER.takeIf { kind is PropertyStub.Kind.Var },
Flag.Property.HAS_GETTER, when (kind) {
Flag.Property.HAS_SETTER.takeIf { kind is PropertyStub.Kind.Var }, is PropertyStub.Kind.Val -> null
when (kind) { is PropertyStub.Kind.Var -> Flag.Property.IS_VAR
is PropertyStub.Kind.Val -> null is PropertyStub.Kind.Constant -> Flag.Property.IS_CONST
is PropertyStub.Kind.Var -> Flag.Property.IS_VAR }
is PropertyStub.Kind.Constant -> Flag.Property.IS_CONST ) or modality.flags
}
) or modality.flags
}
val PropertyStub.Kind.getterFlags: Flags val PropertyStub.Kind.getterFlags: Flags
get() = when (this) { get() = when (this) {