From c630df3e493f35bc60895dade56e0975767d9590 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 17 May 2019 15:12:06 +0200 Subject: [PATCH] Simplify code --- .../backend/common/lower/ClosureAnnotator.kt | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt index 91430ba7014..e92728f0ec8 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt @@ -166,38 +166,18 @@ class ClosureAnnotator(declaration: IrDeclaration) { super.visitVariable(declaration) } - override fun visitCatch(aCatch: IrCatch) { - closuresStack.peek()?.declareVariable(aCatch.catchParameter) - super.visitCatch(aCatch) - } - - override fun visitDelegatingConstructorCall(expression: IrDelegatingConstructorCall) { - expression.acceptChildrenVoid(this) - processMemberAccess(expression.symbol.owner) - } - - override fun visitCall(expression: IrCall) { - expression.acceptChildrenVoid(this) - processMemberAccess(expression.symbol.owner) - } - - override fun visitConstructorCall(expression: IrConstructorCall) { - expression.acceptChildrenVoid(this) - processMemberAccess(expression.symbol.owner) - } - - override fun visitEnumConstructorCall(expression: IrEnumConstructorCall) { - expression.acceptChildrenVoid(this) + override fun visitFunctionAccess(expression: IrFunctionAccessExpression) { + super.visitFunctionAccess(expression) processMemberAccess(expression.symbol.owner) } override fun visitFunctionReference(expression: IrFunctionReference) { - expression.acceptChildrenVoid(this) + super.visitFunctionReference(expression) processMemberAccess(expression.symbol.owner) } override fun visitPropertyReference(expression: IrPropertyReference) { - expression.acceptChildrenVoid(this) + super.visitPropertyReference(expression) expression.getter?.let { processMemberAccess(it.owner) } expression.setter?.let { processMemberAccess(it.owner) } }