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

FIR2IR: properly set constant expression type

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-06-26 16:00:53 +03:00
committed by Space Team
parent 09175c7d56
commit 71456c5514
12 changed files with 172 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt
+1 -1
View File
@@ -38,7 +38,7 @@ inline val FirAnnotation.unexpandedClassId: ClassId?
fun <T> buildConstOrErrorExpression(source: KtSourceElement?, kind: ConstantValueKind<T>, value: T?, diagnostic: ConeDiagnostic): FirExpression =
value?.let {
buildConstExpression(source, kind, it)
buildConstExpression(source, kind, it, setType = false)
} ?: buildErrorExpression {
this.source = source
this.diagnostic = diagnostic
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt
+21 -9
View File
@@ -18,18 +18,30 @@ fun <T> buildConstExpression(
kind: ConstantValueKind<T>,
value: T,
annotations: MutableList<FirAnnotation> = mutableListOf(),
setType: Boolean = false
setType: Boolean
): FirConstExpression<T> {
return FirConstExpressionImpl(source, annotations.toMutableOrEmpty(), kind, value).also {
if (setType) {
when (value) {
null -> it.typeRef = FirImplicitNullableAnyTypeRef(null)
is String -> it.typeRef = FirImplicitStringTypeRef(null)
is Long -> it.typeRef = FirImplicitLongTypeRef(null)
is Int -> it.typeRef = FirImplicitIntTypeRef(null)
is Boolean -> it.typeRef = FirImplicitBooleanTypeRef(null)
is Double -> it.typeRef = FirImplicitDoubleTypeRef(null)
is Float -> it.typeRef = FirImplicitFloatTypeRef(null)
when (kind) {
ConstantValueKind.Boolean -> it.typeRef = FirImplicitBooleanTypeRef(null)
ConstantValueKind.Byte -> it.typeRef = FirImplicitByteTypeRef(null)
ConstantValueKind.Char -> it.typeRef = FirImplicitCharTypeRef(null)
ConstantValueKind.Double -> it.typeRef = FirImplicitDoubleTypeRef(null)
ConstantValueKind.Float -> it.typeRef = FirImplicitFloatTypeRef(null)
ConstantValueKind.Int -> it.typeRef = FirImplicitIntTypeRef(null)
ConstantValueKind.Long -> it.typeRef = FirImplicitLongTypeRef(null)
ConstantValueKind.Null -> it.typeRef = FirImplicitNullableAnyTypeRef(null)
ConstantValueKind.Short -> it.typeRef = FirImplicitShortTypeRef(null)
ConstantValueKind.String -> it.typeRef = FirImplicitStringTypeRef(null)
ConstantValueKind.UnsignedByte -> it.typeRef = FirImplicitUByteTypeRef(null)
ConstantValueKind.UnsignedInt -> it.typeRef = FirImplicitUIntTypeRef(null)
ConstantValueKind.UnsignedLong -> it.typeRef = FirImplicitULongTypeRef(null)
ConstantValueKind.UnsignedShort -> it.typeRef = FirImplicitUShortTypeRef(null)
ConstantValueKind.IntegerLiteral,
ConstantValueKind.UnsignedIntegerLiteral,
ConstantValueKind.Error,
-> {
}
}
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt
+10
View File
@@ -106,6 +106,14 @@ class FirImplicitULongTypeRef(
source: KtSourceElement?
) : FirImplicitBuiltinTypeRef(source, StandardClassIds.ULong)
class FirImplicitUShortTypeRef(
source: KtSourceElement?
) : FirImplicitBuiltinTypeRef(source, StandardClassIds.UShort)
class FirImplicitUByteTypeRef(
source: KtSourceElement?
) : FirImplicitBuiltinTypeRef(source, StandardClassIds.UByte)
class FirImplicitNothingTypeRef(
source: KtSourceElement?
) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Nothing)
@@ -241,5 +249,7 @@ fun FirImplicitBuiltinTypeRef.withNewSource(newSource: KtSourceElement?): FirImp
extensionReceiverTypeArgument = type.typeArguments[1],
propertyTypeArgument = type.typeArguments[2]
)
is FirImplicitUByteTypeRef -> FirImplicitUByteTypeRef(newSource)
is FirImplicitUShortTypeRef -> FirImplicitUShortTypeRef(newSource)
}
}