From 403e9a3df8a946463fb11dea56fcccbf4b5a06ec Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Tue, 6 Feb 2024 18:38:02 +0100 Subject: [PATCH] [FIR2IR] Simplify insertImplicitCasts() calls This method always returns `this`, so no need to reassign. --- .../fir/backend/Fir2IrImplicitCastInserter.kt | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt index faf7cb56265..7fee95f0abf 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt @@ -140,9 +140,7 @@ class Fir2IrImplicitCastInserter( override fun visitWhenBranch(whenBranch: FirWhenBranch, data: IrElement): IrBranch { val irBranch = data as IrBranch - (irBranch.result as? IrContainerExpression)?.let { - irBranch.result = it.insertImplicitCasts() - } + (irBranch.result as? IrContainerExpression)?.insertImplicitCasts() return data } @@ -153,17 +151,13 @@ class Fir2IrImplicitCastInserter( override fun visitDoWhileLoop(doWhileLoop: FirDoWhileLoop, data: IrElement): IrElement { val loop = data as IrDoWhileLoop - (loop.body as? IrContainerExpression)?.let { - loop.body = it.insertImplicitCasts(coerceLastExpressionToUnit = true) - } + (loop.body as? IrContainerExpression)?.insertImplicitCasts(coerceLastExpressionToUnit = true) return data } override fun visitWhileLoop(whileLoop: FirWhileLoop, data: IrElement): IrElement { val loop = data as IrWhileLoop - (loop.body as? IrContainerExpression)?.let { - loop.body = it.insertImplicitCasts(coerceLastExpressionToUnit = true) - } + (loop.body as? IrContainerExpression)?.insertImplicitCasts(coerceLastExpressionToUnit = true) return data } @@ -176,17 +170,11 @@ class Fir2IrImplicitCastInserter( override fun visitTryExpression(tryExpression: FirTryExpression, data: IrElement): IrElement { val irTry = data as IrTry - (irTry.tryResult as? IrContainerExpression)?.let { - irTry.tryResult = it.insertImplicitCasts() - } + (irTry.tryResult as? IrContainerExpression)?.insertImplicitCasts() for (catch in irTry.catches) { - (catch.result as? IrContainerExpression)?.let { - catch.result = it.insertImplicitCasts() - } - } - (irTry.finallyExpression as? IrContainerExpression)?.let { - irTry.finallyExpression = it.insertImplicitCasts(coerceLastExpressionToUnit = true) + (catch.result as? IrContainerExpression)?.insertImplicitCasts() } + (irTry.finallyExpression as? IrContainerExpression)?.insertImplicitCasts(coerceLastExpressionToUnit = true) return data }