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

[fir2ir] Refactoring, use 'createIrTypeParameterWithoutBounds()' utility

Browse Source
This commit is contained in:
Yan Zhulanow
2023-07-25 18:19:49 +09:00
committed by Space Team
parent 82855fbf0f
commit 22fc147d60
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
+5 -18
View File
@@ -676,28 +676,15 @@ class Fir2IrClassifierStorage(
if (components.configuration.allowNonCachedDeclarations) { if (components.configuration.allowNonCachedDeclarations) {
val firTypeParameterOwnerSymbol = firTypeParameter.containingDeclarationSymbol val firTypeParameterOwnerSymbol = firTypeParameter.containingDeclarationSymbol
val firTypeParameterOwner = firTypeParameterOwnerSymbol.fir as FirTypeParameterRefsOwner val firTypeParameterOwner = firTypeParameterOwnerSymbol.fir as FirTypeParameterRefsOwner
val index = firTypeParameterOwner.typeParameters.indexOf(firTypeParameter).also { check(it >= 0) } val index = firTypeParameterOwner.typeParameters.indexOf(firTypeParameter).also { check(it >= 0) }
with(firTypeParameter) { val isSetter = firTypeParameterOwner is FirPropertyAccessor && firTypeParameterOwner.isSetter
val symbol = IrTypeParameterSymbolImpl() val conversionTypeOrigin = if (isSetter) ConversionTypeOrigin.SETTER else ConversionTypeOrigin.DEFAULT
convertWithOffsets { startOffset, endOffset ->
irFactory.createTypeParameter(
startOffset, endOffset,
firTypeParameter.computeIrOrigin(),
name,
symbol,
variance,
if (index < 0) 0 else index,
isReified
).apply {
superTypes = firTypeParameter.bounds.map { it.toIrType(typeConverter) }
}
}
return symbol return createIrTypeParameterWithoutBounds(firTypeParameter, index, IrTypeParameterSymbolImpl(), conversionTypeOrigin).apply {
} superTypes = firTypeParameter.bounds.map { it.toIrType(typeConverter) }
}.symbol
} }
error("Cannot find cached type parameter by FIR symbol: ${firTypeParameterSymbol.name} of the owner: ${firTypeParameter.containingDeclarationSymbol}") error("Cannot find cached type parameter by FIR symbol: ${firTypeParameterSymbol.name} of the owner: ${firTypeParameter.containingDeclarationSymbol}")