Revert "[K2/N] KT-56190 Serialize simple const property initializers"

This reverts commit 2ace8ba9bd.
This commit is contained in:
Vladimir Sukharev
2023-03-29 18:00:09 +02:00
parent 8380a1ed54
commit 639b0cc525
7 changed files with 15 additions and 36 deletions
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.fir.serialization
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.expressions.FirAnnotation
import org.jetbrains.kotlin.fir.expressions.FirConstExpression
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.fir.serialization.constant.ConstantValue
@@ -45,7 +44,4 @@ class FirAnnotationSerializer(private val session: FirSession, internal val stri
FirAnnotationArgumentVisitorData(this@FirAnnotationSerializer, this)
)
}
fun valueProto(constExpression: FirConstExpression<*>): ProtoBuf.Annotation.Argument.Value.Builder? =
constExpression.toConstantValue(session)?.let { valueProto(it) }
}
@@ -373,15 +373,12 @@ class FirElementSerializer private constructor(
}
}
val hasConstant = !property.isVar && property.initializer?.let {
it is FirConstExpression<*> && it.value != null
} ?: false
val flags = Flags.getPropertyFlags(
hasAnnotations,
ProtoEnumFlags.visibility(normalizeVisibility(property)),
ProtoEnumFlags.modality(modality),
ProtoBuf.MemberKind.DECLARATION,
property.isVar, hasGetter, hasSetter, hasConstant, property.isConst, property.isLateInit,
property.isVar, hasGetter, hasSetter, property.isConst, property.isConst, property.isLateInit,
property.isExternal, property.delegateFieldSymbol != null, property.isExpect
)
if (flags != builder.flags) {