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

Fix type alias problems after rebase.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-06-09 15:51:34 +03:00
parent db3e0798c8
commit 53bf720503
6 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+8 -7
View File
@@ -44,8 +44,8 @@ class DescriptorSerializer private constructor(
}.toByteArray()
}
private fun createChildSerializer(callable: CallableDescriptor): DescriptorSerializer =
DescriptorSerializer(callable, Interner(typeParameters), extension, typeTable, serializeTypeTableToFunction = false)
private fun createChildSerializer(descriptor: DeclarationDescriptor): DescriptorSerializer =
DescriptorSerializer(descriptor, Interner(typeParameters), extension, typeTable, serializeTypeTableToFunction = false)
val stringTable: StringTable
get() = extension.stringTable
@@ -277,6 +277,7 @@ class DescriptorSerializer private constructor(
fun typeAliasProto(descriptor: TypeAliasDescriptor): ProtoBuf.TypeAlias.Builder {
val builder = ProtoBuf.TypeAlias.newBuilder()
val local = createChildSerializer(descriptor)
val flags = Flags.getTypeAliasFlags(hasAnnotations(descriptor), descriptor.visibility)
if (flags != builder.flags) {
@@ -286,23 +287,23 @@ class DescriptorSerializer private constructor(
builder.name = getSimpleNameIndex(descriptor.name)
for (typeParameterDescriptor in descriptor.declaredTypeParameters) {
builder.addTypeParameter(typeParameter(typeParameterDescriptor))
builder.addTypeParameter(local.typeParameter(typeParameterDescriptor))
}
val underlyingType = descriptor.underlyingType
if (useTypeTable()) {
builder.underlyingTypeId = typeId(underlyingType)
builder.underlyingTypeId = local.typeId(underlyingType)
}
else {
builder.setUnderlyingType(type(underlyingType))
builder.setUnderlyingType(local.type(underlyingType))
}
val expandedType = descriptor.expandedType
if (useTypeTable()) {
builder.expandedTypeId = typeId(expandedType)
builder.expandedTypeId = local.typeId(expandedType)
}
else {
builder.setExpandedType(type(expandedType))
builder.setExpandedType(local.type(expandedType))
}
return builder