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

[FIR] Replace usages of FirExpression.typeRef with coneTypeOrNull

Browse Source 
#KT-59855 Fixed
This commit is contained in:
Kirill Rakhman
2023-08-04 10:43:25 +02:00
committed by Space Team
parent f60d81097c
commit 8d7c5b375e
76 changed files with 538 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
+2 -2
View File
@@ -69,7 +69,7 @@ fun FirRegularClassBuilder.generateValuesFunction(
symbol = FirNamedFunctionSymbol(CallableId(packageFqName, classFqName, ENUM_VALUES))
resolvePhase = this@generateValuesFunction.resolvePhase
body = buildEmptyExpressionBlock().also {
it.replaceType(returnTypeRef.type)
it.replaceConeTypeOrNull(returnTypeRef.type)
}
}.apply {
containingClassForStaticMemberAttr = this@generateValuesFunction.symbol.toLookupTag()
@@ -126,7 +126,7 @@ fun FirRegularClassBuilder.generateValueOfFunction(
}
resolvePhase = this@generateValueOfFunction.resolvePhase
body = buildEmptyExpressionBlock().also {
it.replaceType(returnTypeRef.type)
it.replaceConeTypeOrNull(returnTypeRef.type)
}
}.apply {
containingClassForStaticMemberAttr = this@generateValueOfFunction.symbol.toLookupTag()
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt
+14 -14
View File
@@ -24,20 +24,20 @@ fun <T> buildConstExpression(
return FirConstExpressionImpl(source, null, annotations.toMutableOrEmpty(), kind, value).also {
if (setType) {
when (kind) {
ConstantValueKind.Boolean -> it.type = StandardClassIds.Boolean.constructClassLikeType()
ConstantValueKind.Byte -> it.type = StandardClassIds.Byte.constructClassLikeType()
ConstantValueKind.Char -> it.type = StandardClassIds.Char.constructClassLikeType()
ConstantValueKind.Double -> it.type = StandardClassIds.Double.constructClassLikeType()
ConstantValueKind.Float -> it.type = StandardClassIds.Float.constructClassLikeType()
ConstantValueKind.Int -> it.type = StandardClassIds.Int.constructClassLikeType()
ConstantValueKind.Long -> it.type = StandardClassIds.Long.constructClassLikeType()
ConstantValueKind.Null -> it.type = StandardClassIds.Any.constructClassLikeType(isNullable = true)
ConstantValueKind.Short -> it.type = StandardClassIds.Short.constructClassLikeType()
ConstantValueKind.String -> it.type = StandardClassIds.String.constructClassLikeType()
ConstantValueKind.UnsignedByte -> it.type = StandardClassIds.UByte.constructClassLikeType()
ConstantValueKind.UnsignedInt -> it.type = StandardClassIds.UInt.constructClassLikeType()
ConstantValueKind.UnsignedLong -> it.type = StandardClassIds.ULong.constructClassLikeType()
ConstantValueKind.UnsignedShort -> it.type = StandardClassIds.UShort.constructClassLikeType()
ConstantValueKind.Boolean -> it.coneTypeOrNull = StandardClassIds.Boolean.constructClassLikeType()
ConstantValueKind.Byte -> it.coneTypeOrNull = StandardClassIds.Byte.constructClassLikeType()
ConstantValueKind.Char -> it.coneTypeOrNull = StandardClassIds.Char.constructClassLikeType()
ConstantValueKind.Double -> it.coneTypeOrNull = StandardClassIds.Double.constructClassLikeType()
ConstantValueKind.Float -> it.coneTypeOrNull = StandardClassIds.Float.constructClassLikeType()
ConstantValueKind.Int -> it.coneTypeOrNull = StandardClassIds.Int.constructClassLikeType()
ConstantValueKind.Long -> it.coneTypeOrNull = StandardClassIds.Long.constructClassLikeType()
ConstantValueKind.Null -> it.coneTypeOrNull = StandardClassIds.Any.constructClassLikeType(isNullable = true)
ConstantValueKind.Short -> it.coneTypeOrNull = StandardClassIds.Short.constructClassLikeType()
ConstantValueKind.String -> it.coneTypeOrNull = StandardClassIds.String.constructClassLikeType()
ConstantValueKind.UnsignedByte -> it.coneTypeOrNull = StandardClassIds.UByte.constructClassLikeType()
ConstantValueKind.UnsignedInt -> it.coneTypeOrNull = StandardClassIds.UInt.constructClassLikeType()
ConstantValueKind.UnsignedLong -> it.coneTypeOrNull = StandardClassIds.ULong.constructClassLikeType()
ConstantValueKind.UnsignedShort -> it.coneTypeOrNull = StandardClassIds.UShort.constructClassLikeType()
ConstantValueKind.IntegerLiteral,
ConstantValueKind.UnsignedIntegerLiteral,
ConstantValueKind.Error,