From e86e128c8a7c250a6f25551276f36a3f77002183 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 15 May 2017 20:00:07 +0200
Subject: [PATCH] Code clean after convertion

---
 .../codegen/inline/InlinedLambdaRemapper.kt   | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.kt
index 5f085baef75..4c859501d5d 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.kt
@@ -25,22 +25,17 @@ class InlinedLambdaRemapper(
         methodParams: Parameters
 ) : FieldRemapper(lambdaInternalName, parent, methodParams) {
 
-    public override fun canProcess(fieldOwner: String, fieldName: String, isFolding: Boolean): Boolean {
-        return isFolding && super.canProcess(fieldOwner, fieldName, true)
-    }
+    public override fun canProcess(fieldOwner: String, fieldName: String, isFolding: Boolean) =
+            isFolding && super.canProcess(fieldOwner, fieldName, true)
 
-    public override fun findField(fieldInsnNode: FieldInsnNode, captured: Collection<CapturedParamInfo>): CapturedParamInfo? {
-        return parent.findField(fieldInsnNode, captured)
-    }
+    public override fun findField(fieldInsnNode: FieldInsnNode, captured: Collection<CapturedParamInfo>) =
+            parent.findField(fieldInsnNode, captured)
 
-    override fun isInsideInliningLambda(): Boolean {
-        return true
-    }
+    override fun isInsideInliningLambda() = true
 
-    override fun getFieldForInline(node: FieldInsnNode, prefix: StackValue?): StackValue? {
-        if (parent.isRoot) {
-            return super.getFieldForInline(node, prefix)
-        }
-        return parent.getFieldForInline(node, prefix)
-    }
+    override fun getFieldForInline(node: FieldInsnNode, prefix: StackValue?) =
+            if (parent.isRoot)
+                super.getFieldForInline(node, prefix)
+            else
+                parent.getFieldForInline(node, prefix)
 }