From 48363257baa46fcf5e80e67b20508547f3c7127d Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Fri, 24 Aug 2018 16:16:05 +0300 Subject: [PATCH] [build][warnings] remove needless null checks --- .../KonanDescriptorSerializer.kt | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt index b6c81da32bb..96fa9ee7da4 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt @@ -50,7 +50,6 @@ import org.jetbrains.kotlin.resolve.constants.StringValue import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.typeUtil.contains -import org.jetbrains.kotlin.metadata.serialization.* import org.jetbrains.kotlin.resolve.calls.components.isActualParameterWithAnyExpectedDefault import java.io.ByteArrayOutputStream import java.util.* @@ -161,10 +160,7 @@ class KonanDescriptorSerializer private constructor( builder.typeTable = typeTableProto } - val requirement = serializeVersionRequirements(classDescriptor) - if (requirement != null) { - builder.addAllVersionRequirement(requirement) - } + builder.addAllVersionRequirement(serializeVersionRequirements(classDescriptor)) val versionRequirementTableProto = versionRequirementTable.serialize() if (versionRequirementTableProto != null) { @@ -255,10 +251,8 @@ class KonanDescriptorSerializer private constructor( } } - val requirement = serializeVersionRequirements(descriptor) - if (requirement != null) { - builder.addAllVersionRequirement(requirement) - } + builder.addAllVersionRequirement(serializeVersionRequirements(descriptor)) + if (descriptor.isSuspendOrHasSuspendTypesInSignature()) { builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion()) } @@ -338,10 +332,8 @@ class KonanDescriptorSerializer private constructor( } } - val requirement = serializeVersionRequirements(descriptor) - if (requirement != null) { - builder.addAllVersionRequirement(requirement) - } + builder.addAllVersionRequirement(serializeVersionRequirements(descriptor)) + if (descriptor.isSuspendOrHasSuspendTypesInSignature()) { builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion()) } @@ -376,10 +368,8 @@ class KonanDescriptorSerializer private constructor( builder.addValueParameter(local.valueParameter(valueParameterDescriptor)) } - val requirement = serializeVersionRequirements(descriptor) - if (requirement != null) { - builder.addAllVersionRequirement(requirement) - } + builder.addAllVersionRequirement(serializeVersionRequirements(descriptor)) + if (descriptor.isSuspendOrHasSuspendTypesInSignature()) { builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion()) } @@ -436,10 +426,7 @@ class KonanDescriptorSerializer private constructor( builder.setExpandedType(local.type(expandedType)) } - val requirement = serializeVersionRequirements(descriptor) - if (requirement != null) { - builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion()) - } + builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion()) builder.addAllAnnotation(descriptor.annotations.map { extension.annotationSerializer.serializeAnnotation(it) })