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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirSerializer.kt
-8
View File
@@ -22,8 +22,6 @@ import org.jetbrains.kotlin.fir.serialization.FirElementAwareSerializableStringT
import org.jetbrains.kotlin.fir.serialization.FirElementSerializer
import org.jetbrains.kotlin.fir.serialization.FirKLibSerializerExtension
import org.jetbrains.kotlin.fir.serialization.serializeSingleFirFile
import org.jetbrains.kotlin.fir.expressions.FirConstExpression
import org.jetbrains.kotlin.fir.serialization.*
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.util.IrMessageLogger
@@ -33,11 +31,9 @@ import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
import org.jetbrains.kotlin.library.metadata.resolver.TopologicalLibraryOrder
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
import org.jetbrains.kotlin.metadata.deserialization.Flags
import org.jetbrains.kotlin.metadata.serialization.MutableVersionRequirementTable
import org.jetbrains.kotlin.psi
import org.jetbrains.kotlin.utils.toMetadataVersion
import org.jetbrains.kotlin.resolve.constants.NullValue
internal fun PhaseContext.firSerializer(
input: Fir2IrOutput
@@ -198,10 +194,6 @@ class FirNativeKLibSerializerExtension(
property.setter?.nonSourceAnnotations(session)?.forEach {
proto.addExtension(KlibMetadataProtoBuf.propertySetterAnnotation, annotationSerializer.serializeAnnotation(it))
}
if (Flags.HAS_CONSTANT.get(proto.flags))
annotationSerializer.valueProto(property.initializer as FirConstExpression<*>)?.let { constBuilder ->
proto.setExtension(KlibMetadataProtoBuf.compileTimeValue, constBuilder.build())
}
// TODO KT-56090 Serialize KDocString
super.serializeProperty(property, proto, versionRequirementTable, childSerializer)
}