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

Use new getInlineClassRepresentation in some utilities

Browse Source
This commit is contained in:
Alexander Udalov
2021-03-23 14:51:31 +01:00
parent 7fb3f48c67
commit 4c7f207309
10 changed files with 74 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+6 -5
View File
@@ -165,17 +165,18 @@ class DescriptorSerializer private constructor(
builder.typeTable = typeTableProto
}
classDescriptor.underlyingRepresentation()?.let { parameter ->
builder.inlineClassUnderlyingPropertyName = getSimpleNameIndex(parameter.name)
val representation = classDescriptor.inlineClassRepresentation
if (representation != null) {
builder.inlineClassUnderlyingPropertyName = getSimpleNameIndex(representation.underlyingPropertyName)
val property = callableMembers.single {
it is PropertyDescriptor && it.extensionReceiverParameter == null && it.name == parameter.name
it is PropertyDescriptor && it.extensionReceiverParameter == null && it.name == representation.underlyingPropertyName
}
if (!property.visibility.isPublicAPI) {
if (useTypeTable()) {
builder.inlineClassUnderlyingTypeId = typeId(parameter.type)
builder.inlineClassUnderlyingTypeId = typeId(representation.underlyingType)
} else {
builder.setInlineClassUnderlyingType(type(parameter.type))
builder.setInlineClassUnderlyingType(type(representation.underlyingType))
}
}
}