diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt index a87f160bf6e..fd8686366b6 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanSerializerExtension.kt @@ -33,15 +33,6 @@ internal class KonanSerializerExtension(val context: Context, override val metad return index?.let { newKonanDescriptorUniqId(it) } } - override fun serializeType(type: KotlinType, proto: ProtoBuf.Type.Builder) { - // TODO: For debugging purpose we store the textual - // representation of serialized types. - // To be removed. - proto.setExtension(KonanProtoBuf.typeText, type.toString()) - - super.serializeType(type, proto) - } - override fun serializeTypeParameter(typeParameter: TypeParameterDescriptor, proto: ProtoBuf.TypeParameter.Builder) { uniqId(typeParameter) ?.let { proto.setExtension(KonanProtoBuf.typeParamUniqId, it) } super.serializeTypeParameter(typeParameter, proto) diff --git a/extracted/konan.metadata/src/KonanProtoBuf.proto b/extracted/konan.metadata/src/KonanProtoBuf.proto index 98bcbebf982..90357e7f68c 100644 --- a/extracted/konan.metadata/src/KonanProtoBuf.proto +++ b/extracted/konan.metadata/src/KonanProtoBuf.proto @@ -31,13 +31,11 @@ extend Class { extend Constructor { repeated Annotation constructor_annotation = 170; - optional InlineIrBody inline_constructor_ir_body = 171; optional DescriptorUniqId constructor_uniq_id = 172; } extend Function { repeated Annotation function_annotation = 170; - optional InlineIrBody inline_ir_body = 171; optional int32 function_file = 172; optional DescriptorUniqId function_uniq_id = 173; } @@ -47,10 +45,7 @@ extend Property { repeated Annotation property_getter_annotation = 177; repeated Annotation property_setter_annotation = 178; optional bool has_backing_field = 171; - optional bool used_as_variable = 172; optional Annotation.Argument.Value compile_time_value = 173; - optional InlineIrBody inline_getter_ir_body = 174; - optional InlineIrBody inline_setter_ir_body = 175; optional int32 property_file = 176; optional DescriptorUniqId property_uniq_id = 179; } @@ -68,7 +63,6 @@ extend ValueParameter { extend Type { repeated Annotation type_annotation = 170; - optional string type_text = 172; // TODO: remove me } extend TypeParameter { @@ -76,16 +70,6 @@ extend TypeParameter { optional DescriptorUniqId type_param_uniq_id = 171; } -message InlineIrBody { - // We need to refer from descriptors to ir inline body. - // And in ir we need to refer local declaration descriptors - // That requires mutual import of KonanIr and KonanLinkData. - // I break the circle here by storing encoded IR. - // May be we need to merge KonanIr into KonanLinkData. - // That'd allow mutually recursive messages. - required string encoded_ir = 11; -} - // Konan Binary Linkdata structures. message LinkDataPackageFragment {