From 9f0aa7d30cf7ca05ef357288fb954831dcffc9e7 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 24 Jan 2024 15:51:30 +0100 Subject: [PATCH] [ObjCExport] Use K1 convention and do not mark KtErrorType as nullable ^KT-65167 --- .../org/jetbrains/kotlin/objcexport/translateToObjCType.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCType.kt b/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCType.kt index a175b822629..9d445290932 100644 --- a/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCType.kt +++ b/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCType.kt @@ -5,6 +5,7 @@ import org.jetbrains.kotlin.analysis.api.KtStarTypeProjection import org.jetbrains.kotlin.analysis.api.KtTypeArgumentWithVariance import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol +import org.jetbrains.kotlin.analysis.api.types.KtErrorType import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.types.KtTypeParameterType @@ -47,6 +48,9 @@ internal fun KtType.translateToObjCType(typeBridge: TypeBridge): ObjCType { context(KtAnalysisSession) private fun KtType.isBinaryRepresentationNullable(): Boolean { + /* Convention to match K1 implementation */ + if (this is KtErrorType) return false + if (fullyExpandedType.canBeNull) return true getInlineTargetTypeOrNull()?.let { inlineTargetType ->