From 9ad55a0ee390f7a899bb36c495e9fdabce5782fc Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 27 Aug 2020 18:06:58 +0300 Subject: [PATCH] [FIR2IR] Don't create list under the hood in DelegatedMemberGenerator --- .../fir/backend/generators/DelegatedMemberGenerator.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt index ca57593eb9d..7abd4db8f18 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DelegatedMemberGenerator.kt @@ -203,9 +203,9 @@ internal class DelegatedMemberGenerator( val substParameters = mutableListOf() val substArguments = mutableListOf() initializeTypeSubstitution(substParameters, substArguments, irField.type) - superFunction.typeParameters.forEach { typeParameter -> + typeParameters = superFunction.typeParameters.map { typeParameter -> val parameterDescriptor = WrappedTypeParameterDescriptor() - typeParameters += symbolTable.declareScopedTypeParameter( + symbolTable.declareScopedTypeParameter( startOffset, endOffset, origin, parameterDescriptor ) { symbol -> irFactory.createTypeParameter( @@ -232,10 +232,10 @@ internal class DelegatedMemberGenerator( } irTypeSubstitutor = IrTypeSubstitutor(substParameters, substArguments, irBuiltIns) } - superFunction.valueParameters.forEach { valueParameter -> + valueParameters = superFunction.valueParameters.map { valueParameter -> val parameterDescriptor = WrappedValueParameterDescriptor() val substedType = if (addTypeSubstitution) irTypeSubstitutor.substitute(valueParameter.type) else valueParameter.type - valueParameters += symbolTable.declareValueParameter( + symbolTable.declareValueParameter( startOffset, endOffset, origin, parameterDescriptor, substedType ) { symbol -> irFactory.createValueParameter(