From 02f08b16d6c864ddc9bd55ddf86858401a307895 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 10 Jul 2020 21:01:44 +0700 Subject: [PATCH] [Commonizer] Ignore CallableDescriptor.hasSynthesizedParameterNames attribute --- .../kotlin/descriptors/commonizer/builder/classDescriptors.kt | 1 - .../descriptors/commonizer/builder/functionDescriptors.kt | 1 - .../kotlin/descriptors/commonizer/cir/CirDeclaration.kt | 1 - .../commonizer/cir/factory/CirClassConstructorFactory.kt | 3 --- .../descriptors/commonizer/cir/factory/CirFunctionFactory.kt | 3 --- .../descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt | 1 - .../kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt | 1 - .../descriptors/commonizer/core/ClassConstructorCommonizer.kt | 3 --- .../kotlin/descriptors/commonizer/core/FunctionCommonizer.kt | 3 --- 9 files changed, 17 deletions(-) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/classDescriptors.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/classDescriptors.kt index dfaebf7dea2..bdbd3aadde8 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/classDescriptors.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/classDescriptors.kt @@ -113,7 +113,6 @@ private fun CirClassConstructor.buildDescriptor( constructorDescriptor.isActual = isActual constructorDescriptor.setHasStableParameterNames(hasStableParameterNames) - constructorDescriptor.setHasSynthesizedParameterNames(hasSynthesizedParameterNames) val classTypeParameters = containingDeclaration.declaredTypeParameters val (constructorTypeParameters, typeParameterResolver) = typeParameters.buildDescriptorsAndTypeParameterResolver( diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt index 84c372fa59c..cef90307746 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt @@ -63,7 +63,6 @@ private fun CirFunction.buildDescriptor( functionDescriptor.isActual = isActual functionDescriptor.setHasStableParameterNames(hasStableParameterNames) - functionDescriptor.setHasSynthesizedParameterNames(hasSynthesizedParameterNames) val (typeParameters, typeParameterResolver) = typeParameters.buildDescriptorsAndTypeParameterResolver( targetComponents, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt index 039a01eb892..ac9899ed592 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt @@ -54,7 +54,6 @@ interface CirHasTypeParameters { interface CirCallableMemberWithParameters { val valueParameters: List val hasStableParameterNames: Boolean - val hasSynthesizedParameterNames: Boolean } /** diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt index b148104428f..648a7d772af 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirClassConstructorFactory.kt @@ -22,7 +22,6 @@ object CirClassConstructorFactory { containingClassDetails = CirContainingClassDetailsFactory.create(source), valueParameters = source.valueParameters.map(CirValueParameterFactory::create), hasStableParameterNames = source.hasStableParameterNames(), - hasSynthesizedParameterNames = source.hasSynthesizedParameterNames(), isPrimary = source.isPrimary, kind = source.kind ) @@ -35,7 +34,6 @@ object CirClassConstructorFactory { containingClassDetails: CirContainingClassDetails, valueParameters: List, hasStableParameterNames: Boolean, - hasSynthesizedParameterNames: Boolean, isPrimary: Boolean, kind: CallableMemberDescriptor.Kind ): CirClassConstructor { @@ -46,7 +44,6 @@ object CirClassConstructorFactory { containingClassDetails = containingClassDetails, valueParameters = valueParameters, hasStableParameterNames = hasStableParameterNames, - hasSynthesizedParameterNames = hasSynthesizedParameterNames, isPrimary = isPrimary, kind = kind ) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt index e1fbed0f931..38306cc35ac 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirFunctionFactory.kt @@ -21,7 +21,6 @@ object CirFunctionFactory { containingClassDetails = CirContainingClassDetailsFactory.create(source), valueParameters = source.valueParameters.map(CirValueParameterFactory::create), hasStableParameterNames = source.hasStableParameterNames(), - hasSynthesizedParameterNames = source.hasSynthesizedParameterNames(), extensionReceiver = source.extensionReceiverParameter?.let(CirExtensionReceiverFactory::create), returnType = CirTypeFactory.create(source.returnType!!), kind = source.kind, @@ -38,7 +37,6 @@ object CirFunctionFactory { containingClassDetails: CirContainingClassDetails?, valueParameters: List, hasStableParameterNames: Boolean, - hasSynthesizedParameterNames: Boolean, extensionReceiver: CirExtensionReceiver?, returnType: CirType, kind: CallableMemberDescriptor.Kind, @@ -53,7 +51,6 @@ object CirFunctionFactory { containingClassDetails = containingClassDetails, valueParameters = valueParameters, hasStableParameterNames = hasStableParameterNames, - hasSynthesizedParameterNames = hasSynthesizedParameterNames, extensionReceiver = extensionReceiver, returnType = returnType, kind = kind, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt index 149582fdf9c..deaa3db9944 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirClassConstructorImpl.kt @@ -16,7 +16,6 @@ data class CirClassConstructorImpl( override val containingClassDetails: CirContainingClassDetails, override val valueParameters: List, override val hasStableParameterNames: Boolean, - override val hasSynthesizedParameterNames: Boolean, override val isPrimary: Boolean, override val kind: CallableMemberDescriptor.Kind ) : CirClassConstructor diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt index 603f816185b..92d35c7d22c 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt @@ -20,7 +20,6 @@ data class CirFunctionImpl( override val containingClassDetails: CirContainingClassDetails?, override val valueParameters: List, override val hasStableParameterNames: Boolean, - override val hasSynthesizedParameterNames: Boolean, override val extensionReceiver: CirExtensionReceiver?, override val returnType: CirType, override val kind: CallableMemberDescriptor.Kind, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt index 9b1eddb08b3..0aaded2d314 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt @@ -19,7 +19,6 @@ class ClassConstructorCommonizer(cache: CirClassifiersCache) : AbstractStandardC private val typeParameters = TypeParameterListCommonizer(cache) private val valueParameters = ValueParameterListCommonizer(cache) private var hasStableParameterNames = true - private var hasSynthesizedParameterNames = false override fun commonizationResult() = CirClassConstructorFactory.create( annotations = emptyList(), @@ -28,7 +27,6 @@ class ClassConstructorCommonizer(cache: CirClassifiersCache) : AbstractStandardC containingClassDetails = CirContainingClassDetailsFactory.DOES_NOT_MATTER, valueParameters = valueParameters.result, hasStableParameterNames = hasStableParameterNames, - hasSynthesizedParameterNames = hasSynthesizedParameterNames, isPrimary = isPrimary, kind = kind ) @@ -49,7 +47,6 @@ class ClassConstructorCommonizer(cache: CirClassifiersCache) : AbstractStandardC if (result) { hasStableParameterNames = hasStableParameterNames && next.hasStableParameterNames - hasSynthesizedParameterNames = hasSynthesizedParameterNames || next.hasSynthesizedParameterNames } return result diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt index e7d6e8a8573..41f38c14a7a 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt @@ -14,7 +14,6 @@ class FunctionCommonizer(cache: CirClassifiersCache) : AbstractFunctionOrPropert private val modifiers = FunctionModifiersCommonizer() private val valueParameters = ValueParameterListCommonizer(cache) private var hasStableParameterNames = true - private var hasSynthesizedParameterNames = false override fun commonizationResult() = CirFunctionFactory.create( annotations = annotations.result, @@ -25,7 +24,6 @@ class FunctionCommonizer(cache: CirClassifiersCache) : AbstractFunctionOrPropert containingClassDetails = null, valueParameters = valueParameters.result, hasStableParameterNames = hasStableParameterNames, - hasSynthesizedParameterNames = hasSynthesizedParameterNames, extensionReceiver = extensionReceiver.result, returnType = returnType.result, kind = kind, @@ -40,7 +38,6 @@ class FunctionCommonizer(cache: CirClassifiersCache) : AbstractFunctionOrPropert if (result) { hasStableParameterNames = hasStableParameterNames && next.hasStableParameterNames - hasSynthesizedParameterNames = hasSynthesizedParameterNames || next.hasSynthesizedParameterNames } return result