Squash me more.
This commit is contained in:
committed by
alexander-gorshenev
parent
bb40d015d0
commit
77e093354f
+7
-10
@@ -87,11 +87,10 @@ internal class IrDescriptorSerializer(
|
|||||||
val typeParameters = descriptor.propertyIfAccessor.typeParameters
|
val typeParameters = descriptor.propertyIfAccessor.typeParameters
|
||||||
typeParameters.forEach {
|
typeParameters.forEach {
|
||||||
proto.addTypeParameter(serializeDescriptor(it))
|
proto.addTypeParameter(serializeDescriptor(it))
|
||||||
// We explicitly serialize type parameters
|
// We explicitly serialize type parameters as types here so that
|
||||||
// as types here so that they are interned in the
|
// they are interned in the natural order of declaration.
|
||||||
// natural order of declaration. Otherwise
|
// Otherwise they appear in the order of appearence in the body
|
||||||
// they appear in the order of appearence in the
|
// of the function, and get wrong indices.
|
||||||
// body of the function, and get wrong indices.
|
|
||||||
localDeclarationSerializer.typeSerializer(it.defaultType)
|
localDeclarationSerializer.typeSerializer(it.defaultType)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,9 +98,8 @@ internal class IrDescriptorSerializer(
|
|||||||
proto.addValueParameter(serializeDescriptor(it))
|
proto.addValueParameter(serializeDescriptor(it))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Allocate two indicies for the receivers.
|
// Allocate two indicies for the receivers. They are not deserialized
|
||||||
// They are not deserialized from protobuf,
|
// from protobuf, just recreated together with their function.
|
||||||
// just recreated together with their function.
|
|
||||||
|
|
||||||
val dispatchReceiver = descriptor.dispatchReceiverParameter
|
val dispatchReceiver = descriptor.dispatchReceiverParameter
|
||||||
if (dispatchReceiver != null)
|
if (dispatchReceiver != null)
|
||||||
@@ -141,8 +139,7 @@ internal class IrDescriptorSerializer(
|
|||||||
} else null
|
} else null
|
||||||
|
|
||||||
val index = descriptorTable.indexByValue(descriptor)
|
val index = descriptorTable.indexByValue(descriptor)
|
||||||
// For getters and setters we use
|
// For getters and setters we use the *property* original index.
|
||||||
// the *property* original index.
|
|
||||||
val originalIndex = descriptorTable.indexByValue(descriptor.propertyIfAccessor.original)
|
val originalIndex = descriptorTable.indexByValue(descriptor.propertyIfAccessor.original)
|
||||||
|
|
||||||
context.log{"index = $index"}
|
context.log{"index = $index"}
|
||||||
|
|||||||
Reference in New Issue
Block a user