From b0d96eb1403a6ad28c2dddf51ba50e565749f1c7 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Fri, 27 Mar 2020 10:29:35 +0300 Subject: [PATCH] Revert "Workaround for KT-37302" This reverts commit ae208f58a4472bf880ab3954cea5baae519feb50. Issue fixed, workaround no longer needed. --- .../src/kotlin/reflect/jvm/internal/KCallableImpl.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt index c4faa4348e2..3359e46a96e 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt @@ -188,13 +188,12 @@ internal abstract class KCallableImpl : KCallable { private fun defaultPrimitiveValue(type: Type): Any? = if (type is Class<*> && type.isPrimitive) { - @Suppress("RemoveRedundantCallsOfConversionMethods") when (type) { Boolean::class.java -> false Char::class.java -> 0.toChar() Byte::class.java -> 0.toByte() Short::class.java -> 0.toShort() - Int::class.java -> 0.toInt() // .toInt() conversion is workaround for KT-37302 + Int::class.java -> 0 Float::class.java -> 0f Long::class.java -> 0L Double::class.java -> 0.0