From 3e42b9d527babd58fa55921aab1c66a4c8f29b47 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 30 Jun 2020 17:17:26 +0700 Subject: [PATCH] [Commonizer] Remove unused property from CirFunction --- .../kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt | 1 - .../jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt | 1 + .../descriptors/commonizer/cir/factory/CirFunctionFactory.kt | 3 --- .../kotlin/descriptors/commonizer/cir/impl/CirFunctionImpl.kt | 1 - .../kotlin/descriptors/commonizer/core/FunctionCommonizer.kt | 1 - .../commonizer/core/LoweringVisibilityCommonizerTest.kt | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt index 1efcaa47e5a..629052e3551 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt @@ -19,7 +19,6 @@ interface CirFunctionOrProperty : CirHasModality, CirMaybeCallableMemberOfClass { - val isExternal: Boolean val extensionReceiver: CirExtensionReceiver? val returnType: CirType val kind: CallableMemberDescriptor.Kind diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt index 32b4c22cd0f..9ffd3065b12 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir import org.jetbrains.kotlin.resolve.constants.ConstantValue interface CirProperty : CirFunctionOrProperty, CirLiftedUpDeclaration { + val isExternal: Boolean val isVar: Boolean val isLateInit: Boolean var isConst: Boolean 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 c240971347c..e1fbed0f931 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 @@ -22,7 +22,6 @@ object CirFunctionFactory { valueParameters = source.valueParameters.map(CirValueParameterFactory::create), hasStableParameterNames = source.hasStableParameterNames(), hasSynthesizedParameterNames = source.hasSynthesizedParameterNames(), - isExternal = source.isExternal, extensionReceiver = source.extensionReceiverParameter?.let(CirExtensionReceiverFactory::create), returnType = CirTypeFactory.create(source.returnType!!), kind = source.kind, @@ -40,7 +39,6 @@ object CirFunctionFactory { valueParameters: List, hasStableParameterNames: Boolean, hasSynthesizedParameterNames: Boolean, - isExternal: Boolean, extensionReceiver: CirExtensionReceiver?, returnType: CirType, kind: CallableMemberDescriptor.Kind, @@ -56,7 +54,6 @@ object CirFunctionFactory { valueParameters = valueParameters, hasStableParameterNames = hasStableParameterNames, hasSynthesizedParameterNames = hasSynthesizedParameterNames, - isExternal = isExternal, extensionReceiver = extensionReceiver, returnType = returnType, kind = kind, 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 f23a36c84b5..603f816185b 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 @@ -21,7 +21,6 @@ data class CirFunctionImpl( override val valueParameters: List, override val hasStableParameterNames: Boolean, override val hasSynthesizedParameterNames: Boolean, - override val isExternal: 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/FunctionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt index a95c1f71b10..e7d6e8a8573 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 @@ -26,7 +26,6 @@ class FunctionCommonizer(cache: CirClassifiersCache) : AbstractFunctionOrPropert valueParameters = valueParameters.result, hasStableParameterNames = hasStableParameterNames, hasSynthesizedParameterNames = hasSynthesizedParameterNames, - isExternal = false, extensionReceiver = extensionReceiver.result, returnType = returnType.result, kind = kind, diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt index d60f9b7b9f4..eeb02794c05 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt @@ -56,7 +56,6 @@ abstract class LoweringVisibilityCommonizerTest( modality = Modality.OPEN, isData = false ) else null - override val isExternal get() = unsupported() override val extensionReceiver get() = unsupported() override val returnType get() = unsupported() override val kind get() = unsupported()