From 8c554aa4c7e08860602aec3aee01dac78c102679 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 8 Feb 2017 17:58:03 +0300 Subject: [PATCH] backend: Remove workaround for IrSetterCallImpl problem --- .../backend/common/lower/AbstractClosureAnnotator.kt | 7 ------- .../backend/common/lower/LocalDeclarationsLowering.kt | 7 ------- 2 files changed, 14 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/AbstractClosureAnnotator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/AbstractClosureAnnotator.kt index 50e0194e055..68a217f8cee 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/AbstractClosureAnnotator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/AbstractClosureAnnotator.kt @@ -84,13 +84,6 @@ abstract class AbstractClosureAnnotator : IrElementVisitorVoid { closuresStack.peek()?.addNested(closure) } - // TODO: remove as soon as bug in IrSetterCallImpl is fixed. - override fun visitCall(expression: IrCall) { - super.visitCall(expression) - if (expression is IrSetterCallImpl) - visitElement(expression.getValueArgument(0)!!) - } - override fun visitFunction(declaration: IrFunction) { val functionDescriptor = declaration.descriptor val closureBuilder = FunctionClosureBuilder(functionDescriptor) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt index 896c309263c..fd371547225 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt @@ -645,13 +645,6 @@ class LocalDeclarationsLowering(val context: BackendContext) : DeclarationContai element.acceptChildrenVoid(this) } - // TODO: remove as soon as bug in IrSetterCallImpl is fixed. - override fun visitCall(expression: IrCall) { - super.visitCall(expression) - if (expression is IrSetterCallImpl) - visitElement(expression.getValueArgument(0)!!) - } - private fun DeclarationDescriptor.declaredInFunction() = when (this.containingDeclaration) { is CallableDescriptor -> true is ClassDescriptor -> false