From 0c909fea6a132223088eac9ee79eee6da45a040c Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 18 Apr 2018 07:32:01 +0100 Subject: [PATCH] Cleanup compilation warnings. (#1510) --- .../kotlin/backend/konan/llvm/IrToBitcode.kt | 5 +---- .../kotlin/backend/konan/llvm/StaticObjects.kt | 2 +- .../backend/konan/serialization/SerializeIr.kt | 15 +++------------ .../jetbrains/kotlin/gradle/plugin/KonanPlugin.kt | 2 +- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt index e431471c3d5..6b18f369493 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt @@ -2194,15 +2194,12 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map`, but `createArrayList` expects `Array`; // however `vararg` is immutable, and in current implementation it has type `Array`, // so let's ignore this mismatch currently for simplicity. - return context.llvm.staticData.createArrayList(elementType, array, length).llvm + return context.llvm.staticData.createArrayList(array, length).llvm } else -> TODO(callee.descriptor.original.toString()) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticObjects.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticObjects.kt index 78fec34b014..4f3757adef0 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticObjects.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticObjects.kt @@ -111,7 +111,7 @@ private fun StaticData.getArrayListClass(): ClassDescriptor { * @param array value for `array: Array` field. * @param length value for `length: Int` field. */ -internal fun StaticData.createArrayList(elementType: TypeProjection, array: ConstPointer, length: Int): ConstPointer { +internal fun StaticData.createArrayList(array: ConstPointer, length: Int): ConstPointer { val arrayListClass = context.ir.symbols.arrayList.owner val arrayListFqName = arrayListClass.fqNameSafe diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt index 6bbf5e6ab8d..7e5687407d7 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt @@ -722,7 +722,7 @@ internal class IrDeserializer(val context: Context, private fun deserializeTypeArguments(proto: KonanIr.TypeArguments): List { context.log{"### deserializeTypeArguments"} val result = mutableListOf() - proto.typeArgumentList.forEachIndexed { index, type -> + proto.typeArgumentList.forEach { type -> val kotlinType = deserializeKotlinType(type) result.add(kotlinType) context.log{"$kotlinType"} @@ -829,8 +829,6 @@ internal class IrDeserializer(val context: Context, deserializeDescriptor(proto.`super`) as ClassDescriptor } else null - val typeArgs = deserializeTypeArguments(proto.memberAccess.typeArguments) - val call: IrCall = when (proto.kind) { KonanIr.IrCall.Primitive.NOT_PRIMITIVE -> // TODO: implement the last three args here. @@ -856,8 +854,8 @@ internal class IrDeserializer(val context: Context, else -> TODO() } - deserializeTypeArguments(proto.typeArguments).forEachIndexed { index, type -> - callable.putTypeArgument(index, type) + deserializeTypeArguments(proto.typeArguments).forEachIndexed { index, argType -> + callable.putTypeArgument(index, argType) } return callable } @@ -879,13 +877,6 @@ internal class IrDeserializer(val context: Context, return call } - fun deserializeEnumConstructorCall(proto: KonanIr.IrEnumConstructorCall, start: Int, end: Int): IrEnumConstructorCall { - val descriptor = deserializeDescriptor(proto.descriptor) as ClassConstructorDescriptor - val call = IrEnumConstructorCallImpl(start, end, IrConstructorSymbolImpl(descriptor), null) - deserializeMemberAccessCommon(call, proto.memberAccess) - return call - } - private fun deserializeGetClass(proto: KonanIr.IrGetClass, start: Int, end: Int, type: KotlinType): IrGetClass { val argument = deserializeExpression(proto.argument) return IrGetClassImpl(start, end, type, argument) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt index c64e2270b3b..507b2210bd4 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt @@ -261,7 +261,7 @@ open class KonanSoftwareComponent(val project: ProjectInternal?): SoftwareCompon private val variants = mutableSetOf() override fun getName() = "main" - override fun getVariants(): Set = variants + override fun getVariants(): Set = variants fun addVariant(component: SoftwareComponent) = variants.add(component) }