From 7e1b1db7cc1d54186fd4dbec1c8d1321297e3ffa Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 15 Feb 2018 19:09:12 +0100 Subject: [PATCH] Minor, don't use BitEncoding where it's not necessary --- .../src/org/jetbrains/kotlin/inline/inlineUtil.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt index ac26c0cfd2e..760369cb4cf 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.deserialization.TypeTable import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull -import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil @@ -33,13 +32,13 @@ fun inlineFunctionsJvmNames(header: KotlinClassHeader): Set { return when (header.kind) { KotlinClassHeader.Kind.CLASS -> { - val (nameResolver, classProto) = JvmProtoBufUtil.readClassDataFrom(BitEncoding.decodeBytes(annotationData), strings) + val (nameResolver, classProto) = JvmProtoBufUtil.readClassDataFrom(annotationData, strings) inlineFunctionsJvmNames(classProto.functionList, nameResolver, classProto.typeTable) + inlineAccessorsJvmNames(classProto.propertyList, nameResolver) } KotlinClassHeader.Kind.FILE_FACADE, KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> { - val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(BitEncoding.decodeBytes(annotationData), strings) + val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(annotationData, strings) inlineFunctionsJvmNames(packageProto.functionList, nameResolver, packageProto.typeTable) + inlineAccessorsJvmNames(packageProto.propertyList, nameResolver) }