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

[FIR] Properly check FirPropertyAccessExpression in FirConstCheckVisitor

Browse Source
This commit is contained in:
Ivan Kylchik
2023-12-20 22:14:25 +01:00
committed by Space Team
parent 10c687fa32
commit 76268c941a
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt
+31 -13
View File
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirField
import org.jetbrains.kotlin.fir.declarations.hasAnnotation
import org.jetbrains.kotlin.fir.declarations.utils.isConst
import org.jetbrains.kotlin.fir.declarations.utils.isStatic
@@ -53,22 +54,12 @@ internal fun checkConstantArguments(
fun FirExpression.getExpandedType() = resolvedType.fullyExpandedType(session)
when {
expressionSymbol is FirEnumEntrySymbol
|| expressionSymbol?.isConst == true
|| expressionSymbol is FirConstructorSymbol && classKindOfParent == ClassKind.ANNOTATION_CLASS -> {
expressionSymbol is FirConstructorSymbol && classKindOfParent == ClassKind.ANNOTATION_CLASS -> {
return ConstantArgumentKind.VALID_CONST
}
classKindOfParent == ClassKind.ENUM_CLASS -> {
return ConstantArgumentKind.ENUM_NOT_CONST
}
expressionSymbol == null -> {
return ConstantArgumentKind.VALID_CONST
}
expressionSymbol is FirFieldSymbol -> {
if (!expressionSymbol.isStatic || expressionSymbol.modality != Modality.FINAL || !expressionSymbol.hasConstantInitializer) {
return ConstantArgumentKind.NOT_CONST
}
}
expressionSymbol is FirConstructorSymbol -> {
if (expression is FirCallableReferenceAccess) return ConstantArgumentKind.VALID_CONST
if (expression.getExpandedType().isUnsignedType) {
@@ -214,6 +205,34 @@ private class FirConstCheckVisitor(private val session: FirSession) : FirVisitor
return ConstantArgumentKind.NOT_CONST
}
override fun visitPropertyAccessExpression(
propertyAccessExpression: FirPropertyAccessExpression, data: Nothing?
): ConstantArgumentKind {
val propertySymbol = propertyAccessExpression.toReference()?.toResolvedCallableSymbol(discardErrorReference = true)
when (propertySymbol) {
null -> return ConstantArgumentKind.VALID_CONST
is FirPropertySymbol -> {
val classKindOfParent = (propertySymbol.getReferencedClassSymbol() as? FirRegularClassSymbol)?.classKind
if (classKindOfParent == ClassKind.ENUM_CLASS) {
return ConstantArgumentKind.ENUM_NOT_CONST
}
if (propertySymbol.isConst) {
return ConstantArgumentKind.VALID_CONST
}
}
is FirFieldSymbol -> {
if (propertySymbol.isStatic && propertySymbol.modality == Modality.FINAL && propertySymbol.hasConstantInitializer) {
return ConstantArgumentKind.VALID_CONST
}
}
is FirEnumEntrySymbol -> return ConstantArgumentKind.VALID_CONST
}
return ConstantArgumentKind.NOT_CONST
}
override fun visitFunctionCall(functionCall: FirFunctionCall, data: Nothing?): ConstantArgumentKind {
val calleeReference = functionCall.calleeReference
if (calleeReference is FirErrorNamedReference) {
@@ -245,8 +264,7 @@ private class FirConstCheckVisitor(private val session: FirSession) : FirVisitor
}
override fun visitQualifiedAccessExpression(
qualifiedAccessExpression: FirQualifiedAccessExpression,
data: Nothing?
qualifiedAccessExpression: FirQualifiedAccessExpression, data: Nothing?
): ConstantArgumentKind {
val expressionType = qualifiedAccessExpression.getExpandedType()
if (expressionType.isReflectFunctionType(session) || expressionType.isKProperty(session) || expressionType.isKMutableProperty(session)) {