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

FE: commonize logic for value class representation building

Browse Source
This commit is contained in:
pyos
2022-11-09 17:42:04 +01:00
committed by Space Team
parent b6eb2b3620
commit 456fe858a0
2 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+14 -51
View File
@@ -162,7 +162,7 @@ class DeserializedClassDescriptor(
null
),
Annotations.EMPTY
);
)
}
private fun computeCompanionObjectDescriptor(): ClassDescriptor? {
@@ -196,60 +196,23 @@ class DeserializedClassDescriptor(
override fun getValueClassRepresentation(): ValueClassRepresentation<SimpleType>? = valueClassRepresentation()
private fun computeValueClassRepresentation(): ValueClassRepresentation<SimpleType>? {
val inlineClassRepresentation = computeInlineClassRepresentation()
val multiFieldValueClassRepresentation = computeMultiFieldValueClassRepresentation()
return when {
inlineClassRepresentation != null && multiFieldValueClassRepresentation != null ->
throw IllegalArgumentException("Class cannot have both inline class representation and multi field class representation: $this")
(isValue || isInline) && inlineClassRepresentation == null && multiFieldValueClassRepresentation == null ->
throw IllegalArgumentException("Value class has no value class representation: $this")
else -> inlineClassRepresentation ?: multiFieldValueClassRepresentation
}
}
private fun computeInlineClassRepresentation(): InlineClassRepresentation<SimpleType>? {
if (!isInline && !isValue) return null
if (isValue &&
!classProto.hasInlineClassUnderlyingPropertyName() &&
!classProto.hasInlineClassUnderlyingType() &&
!classProto.hasInlineClassUnderlyingTypeId() &&
classProto.multiFieldValueClassUnderlyingNameCount > 0
) return null
val propertyName = when {
classProto.hasInlineClassUnderlyingPropertyName() ->
c.nameResolver.getName(classProto.inlineClassUnderlyingPropertyName)
!metadataVersion.isAtLeast(1, 5, 1) -> {
// Before 1.5, inline classes did not have underlying property name & type in the metadata.
// However, they were experimental, so supposedly this logic can be removed at some point in the future.
val constructor = unsubstitutedPrimaryConstructor ?: error("Inline class has no primary constructor: $this")
constructor.valueParameters.first().name
}
else -> error("Inline class has no underlying property name in metadata: $this")
classProto.loadValueClassRepresentation(c.nameResolver, c.typeTable, c.typeDeserializer::simpleType, ::getValueClassPropertyType)
?.let { return it }
if (!metadataVersion.isAtLeast(1, 5, 1)) {
// Before 1.5, inline classes did not have underlying property name & type in the metadata.
// However, they were experimental, so supposedly this logic can be removed at some point in the future.
val constructor = unsubstitutedPrimaryConstructor ?: error("Inline class has no primary constructor: $this")
val propertyName = constructor.valueParameters.first().name
val propertyType = getValueClassPropertyType(propertyName) ?: error("Value class has no underlying property: $this")
return InlineClassRepresentation(propertyName, propertyType)
}
val type = classProto.inlineClassUnderlyingType(c.typeTable)?.let(c.typeDeserializer::simpleType) ?: run {
val underlyingProperty = memberScope.getContributedVariables(propertyName, NoLookupLocation.FROM_DESERIALIZATION)
.singleOrNull { it.extensionReceiverParameter == null } ?: error("Value class has no underlying property: $this")
underlyingProperty.type as SimpleType
}
return InlineClassRepresentation(propertyName, type)
return null
}
private fun computeMultiFieldValueClassRepresentation(): MultiFieldValueClassRepresentation<SimpleType>? {
val names = classProto.multiFieldValueClassUnderlyingNameList.map { c.nameResolver.getName(it) }.takeIf { it.isNotEmpty() }
?: return null
require(isValue) { "Not a value class: $this" }
val typeIdCount = classProto.multiFieldValueClassUnderlyingTypeIdCount
val typeCount = classProto.multiFieldValueClassUnderlyingTypeCount
val types = when (typeIdCount to typeCount) {
names.size to 0 -> classProto.multiFieldValueClassUnderlyingTypeIdList.map { c.typeTable[it] }
0 to names.size -> classProto.multiFieldValueClassUnderlyingTypeList
else -> error("Illegal multi-field value class representation: $this")
}.map { c.typeDeserializer.simpleType(it) }
return MultiFieldValueClassRepresentation(names zip types)
}
private fun getValueClassPropertyType(propertyName: Name): SimpleType? =
memberScope.getContributedVariables(propertyName, NoLookupLocation.FROM_DESERIALIZATION)
.singleOrNull { it.extensionReceiverParameter == null }?.type as SimpleType?
override fun toString() =
"deserialized ${if (isExpect) "expect " else ""}class $name" // not using descriptor renderer to preserve laziness