diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt index 79dc8206a27..6423acad68b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt @@ -480,7 +480,7 @@ abstract class InlineCodegen( assert(constantValue is Int) { "Mask should be of Integer type, but " + constantValue } maskValues.add(constantValue as Int) if (maskStartIndex == -1) { - maskStartIndex = invocationParamBuilder.listAllParams().sumBy { + maskStartIndex = invocationParamBuilder.listAllParams().sumOf { if (it is CapturedParamInfo) 0 else it.type.size } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt index 970c93c146e..40973307857 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt @@ -1086,7 +1086,7 @@ class MethodInliner( "Number of expected and actual parameters should be equal, but ${actualParams.size} != ${directOrder.size}!" } - var currentShift = shift + directOrder.sumBy { it.size } + var currentShift = shift + directOrder.sumOf { it.size } val safeToUseArgumentKotlinType = directOrder.size == directOrderOfArguments.size && directOrderOfArguments.size == directOrderOfInvokeParameters.size diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.kt index cdf2b732214..63c7a44ff1e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.kt @@ -24,13 +24,13 @@ class Parameters(val parameters: List) : Iterable private val actualDeclShifts: Array private val paramToDeclByteCodeIndex: HashMap = hashMapOf() - val argsSizeOnStack = parameters.sumBy { it.type.size } + val argsSizeOnStack = parameters.sumOf { it.type.size } val realParametersSizeOnStack: Int get() = argsSizeOnStack - capturedParametersSizeOnStack val capturedParametersSizeOnStack by lazy { - captured.sumBy { it.type.size } + captured.sumOf { it.type.size } } val captured by lazy { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt index 36cfd355990..1c4daf33006 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt @@ -109,7 +109,7 @@ private fun ConeKotlinType.enhanceConeKotlinType( } private fun ConeKotlinType.subtreeSize(): Int { - return 1 + typeArguments.sumBy { ((it as? ConeKotlinType)?.subtreeSize() ?: 0) + 1 } + return 1 + typeArguments.sumOf { ((it as? ConeKotlinType)?.subtreeSize() ?: 0) + 1 } } private fun coneFlexibleOrSimpleType( diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/util/Multimap.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/util/Multimap.kt index ce90a9568bc..7881431ffc0 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/util/Multimap.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/util/Multimap.kt @@ -44,7 +44,7 @@ abstract class BaseMultimap, MC : MutableCollection> override val values: Collection get() = object : AbstractCollection() { override val size: Int - get() = map.values.sumBy { it.size } + get() = map.values.sumOf { it.size } override fun iterator(): Iterator { return ChainedIterator(map.values.map { it.iterator() }) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index 21da0f3ea0b..57d25263009 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -809,7 +809,7 @@ class TypeResolver( val restParameters = parameters.subList(result.size, parameters.size) val typeArgumentsCanBeSpecifiedCount = - classifierDescriptor.classifierDescriptorsFromInnerToOuter().sumBy { it.declaredTypeParameters.size } + classifierDescriptor.classifierDescriptorsFromInnerToOuter().sumOf { it.declaredTypeParameters.size } if (restArguments == null && typeArgumentsCanBeSpecifiedCount > result.size) { c.trace.report( diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionCandidate.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionCandidate.kt index ef169699273..48c507415a5 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionCandidate.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionCandidate.kt @@ -87,7 +87,7 @@ class KotlinResolutionCandidate( private var currentApplicability = CandidateApplicability.RESOLVED private var subResolvedAtoms: MutableList = arrayListOf() - private val stepCount = resolutionSequence.sumBy { it.run { workCount() } } + private val stepCount = resolutionSequence.sumOf { it.run { workCount() } } private var step = 0 fun getSystem(): NewConstraintSystem { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt index f8d4db1c2bb..091ac24e3af 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt @@ -72,7 +72,7 @@ class FirResolveBench(val withProgress: Boolean, val listener: BenchListener? = user = sumByLong { it.user } cpu = sumByLong { it.cpu } gcTime = sumByLong { it.gcTime } - gcCollections = sumBy { it.gcCollections } + gcCollections = sumOf { it.gcCollections } files = map { it.files }.average().toInt() } } @@ -161,7 +161,7 @@ class FirResolveBench(val withProgress: Boolean, val listener: BenchListener? = this.files += 1 this.user += diff.userTime this.cpu += diff.cpuTime - this.gcCollections += diff.gcInfo.values.sumBy { it.collections.toInt() } + this.gcCollections += diff.gcInfo.values.sumOf { it.collections.toInt() } this.gcTime += diff.gcInfo.values.sumByLong { it.gcTime } } } diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt index 3102c67dfed..75b8d421ec6 100644 --- a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt +++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt @@ -56,7 +56,7 @@ fun bytesToStrings(bytes: ByteArray): Array { } fun stringsToBytes(strings: Array): ByteArray { - val resultLength = strings.sumBy { it.length } + val resultLength = strings.sumOf { it.length } val result = ByteArray(resultLength) var i = 0 diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/AnnotationConstructorCaller.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/AnnotationConstructorCaller.kt index ee45eb5b4e5..1546775fab2 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/AnnotationConstructorCaller.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/AnnotationConstructorCaller.kt @@ -123,7 +123,7 @@ internal fun createAnnotationInstance( } val hashCode by lazy { - values.entries.sumBy { entry -> + values.entries.sumOf { entry -> val (key, value) = entry val valueHash = when (value) { is BooleanArray -> Arrays.hashCode(value) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerializableCodegenImpl.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerializableCodegenImpl.kt index 3389445db28..5cddc57e5d4 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerializableCodegenImpl.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/SerializableCodegenImpl.kt @@ -280,7 +280,7 @@ class SerializableCodegenImpl( val superProps = bindingContext.serializablePropertiesFor(superClass).serializableProperties val creator = buildInternalConstructorDesc(propStartVar, maskVar, classCodegen, superProps) invokespecial(superType, "", creator, false) - return superProps.size to propStartVar + superProps.sumBy { it.asmType.size } + return superProps.size to propStartVar + superProps.sumOf { it.asmType.size } } }