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

Optimize/simplify FirJvmTypeMapper.representativeUpperBound

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-12-07 12:00:56 +03:00
parent 42b590d07c
commit 3ab5b57594
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
+6 -4
View File
@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.types.model.SimpleTypeMarker
import org.jetbrains.kotlin.types.model.TypeConstructorMarker import org.jetbrains.kotlin.types.model.TypeConstructorMarker
import org.jetbrains.kotlin.types.model.TypeParameterMarker import org.jetbrains.kotlin.types.model.TypeParameterMarker
import org.jetbrains.kotlin.utils.addToStdlib.runIf import org.jetbrains.kotlin.utils.addToStdlib.runIf
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatureWriter>, FirSessionComponent { class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatureWriter>, FirSessionComponent {
@@ -189,7 +190,8 @@ val FirSession.jvmTypeMapper: FirJvmTypeMapper by FirSession.sessionComponentAcc
class ConeTypeSystemCommonBackendContextForTypeMapping( class ConeTypeSystemCommonBackendContextForTypeMapping(
val context: ConeTypeContext val context: ConeTypeContext
) : TypeSystemCommonBackendContext by context, TypeSystemCommonBackendContextForTypeMapping { ) : TypeSystemCommonBackendContext by context, TypeSystemCommonBackendContextForTypeMapping {
private val symbolProvider = context.session.firSymbolProvider private val session = context.session
private val symbolProvider = session.firSymbolProvider
override fun TypeConstructorMarker.isTypeParameter(): Boolean { override fun TypeConstructorMarker.isTypeParameter(): Boolean {
return this is ConeTypeParameterLookupTag return this is ConeTypeParameterLookupTag
@@ -210,7 +212,7 @@ class ConeTypeSystemCommonBackendContextForTypeMapping(
override fun SimpleTypeMarker.isSuspendFunction(): Boolean { override fun SimpleTypeMarker.isSuspendFunction(): Boolean {
require(this is ConeSimpleKotlinType) require(this is ConeSimpleKotlinType)
return isSuspendFunctionType(context.session) return isSuspendFunctionType(session)
} }
override fun SimpleTypeMarker.isKClass(): Boolean { override fun SimpleTypeMarker.isKClass(): Boolean {
@@ -234,8 +236,8 @@ class ConeTypeSystemCommonBackendContextForTypeMapping(
require(this is ConeTypeParameterLookupTag) require(this is ConeTypeParameterLookupTag)
val bounds = this.typeParameterSymbol.fir.bounds.map { it.coneType } val bounds = this.typeParameterSymbol.fir.bounds.map { it.coneType }
return bounds.firstOrNull { return bounds.firstOrNull {
val classId = it.classId ?: return@firstOrNull false val classSymbol = it.safeAs<ConeClassLikeType>()?.fullyExpandedType(session)
val classSymbol = symbolProvider.getClassLikeSymbolByFqName(classId) as? FirRegularClassSymbol ?: return@firstOrNull false ?.lookupTag?.toSymbol(session) as? FirRegularClassSymbol ?: return@firstOrNull false
val kind = classSymbol.fir.classKind val kind = classSymbol.fir.classKind
kind != ClassKind.INTERFACE && kind != ClassKind.ANNOTATION_CLASS kind != ClassKind.INTERFACE && kind != ClassKind.ANNOTATION_CLASS
} ?: bounds.first() } ?: bounds.first()