Move out jvm-specific part from ir-common

#KT-27005 Fixed

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLower.kt

@@ -23,12 +23,18 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.util.PatchDeclarationParentsVisitor
+import org.jetbrains.kotlin.ir.util.TypeTranslator
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
 import org.jetbrains.kotlin.name.NameUtils
 
 class JvmLower(val context: JvmBackendContext) {
     fun lower(irFile: IrFile) {
         // TODO run lowering passes as callbacks in bottom-up visitor
+        JvmCoercionToUnitPatcher(
+            context.builtIns,
+            context.irBuiltIns,
+            TypeTranslator(context.ir.symbols.externalSymbolTable, context.state.languageVersionSettings)
+        ).lower(irFile)
         FileClassLowering(context).lower(irFile)
         KCallableNamePropertyLowering(context).lower(irFile)
 

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmCoercionToUnitPatcher.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.jvm.lower
+
+import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
+import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.util.TypeTranslator
+import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+import org.jetbrains.kotlin.psi2ir.transformations.InsertImplicitCasts
+
+class JvmCoercionToUnitPatcher(builtIns: KotlinBuiltIns, irBuiltIns: IrBuiltIns, typeTranslator: TypeTranslator) :
+    InsertImplicitCasts(builtIns, irBuiltIns, typeTranslator), FileLoweringPass {
+
+    override fun lower(irFile: IrFile) {
+        irFile.transformChildrenVoid(this)
+    }
+
+    override fun IrExpression.coerceToUnit(): IrExpression {
+        if (isUnitSubtype(getKotlinType(this)) && this is IrCall) {
+            return coerceToUnitIfNeeded(this.symbol.descriptor.original.returnType!!)
+        }
+
+        return this
+    }
+}

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt

@@ -23,11 +23,13 @@ import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrField
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrVariable
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrTypeOperatorCallImpl
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.classifierOrFail
 import org.jetbrains.kotlin.ir.types.impl.originalKotlinType
+import org.jetbrains.kotlin.ir.util.TypeTranslator
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.psi2ir.containsNull
 import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext
@@ -40,15 +42,15 @@ import org.jetbrains.kotlin.types.typeUtil.makeNullable
 import org.jetbrains.kotlin.types.upperIfFlexible
 
 fun insertImplicitCasts(element: IrElement, context: GeneratorContext) {
-    element.transformChildren(InsertImplicitCasts(context), null)
+    element.transformChildren(InsertImplicitCasts(context.builtIns, context.irBuiltIns, context.typeTranslator), null)
 }
 
-class InsertImplicitCasts(context: GeneratorContext) : IrElementTransformerVoid() {
+open class InsertImplicitCasts(
+    private val builtIns: KotlinBuiltIns,
+    private val irBuiltIns: IrBuiltIns,
+    private val typeTranslator: TypeTranslator
+) : IrElementTransformerVoid() {
 
-    private val builtIns = context.builtIns
-    private val irBuiltIns = context.irBuiltIns
-
-    private val typeTranslator = context.typeTranslator
     private fun KotlinType.toIrType() = typeTranslator.translateType(this)
 
     override fun visitCallableReference(expression: IrCallableReference): IrExpression =
@@ -232,10 +234,16 @@ class InsertImplicitCasts(context: GeneratorContext) : IrElementTransformerVoid(
         )
     }
 
-    private fun IrExpression.coerceToUnit(): IrExpression {
+    protected open fun IrExpression.coerceToUnit(): IrExpression {
         val valueType = getKotlinType(this)
+        return coerceToUnitIfNeeded(valueType)
+    }
 
-        return if (KotlinTypeChecker.DEFAULT.isSubtypeOf(valueType, builtIns.unitType))
+    protected fun getKotlinType(irExpression: IrExpression) =
+        irExpression.type.originalKotlinType!!
+
+    protected fun IrExpression.coerceToUnitIfNeeded(valueType: KotlinType): IrExpression {
+        return if (isUnitSubtype(valueType))
             this
         else
             IrTypeOperatorCallImpl(
@@ -247,10 +255,8 @@ class InsertImplicitCasts(context: GeneratorContext) : IrElementTransformerVoid(
             )
     }
 
-    private fun getKotlinType(irExpression: IrExpression) =
-        if (irExpression is IrCall)
-            irExpression.symbol.descriptor.original.returnType!!
-        else irExpression.type.originalKotlinType!!
+    protected fun isUnitSubtype(valueType: KotlinType) =
+        KotlinTypeChecker.DEFAULT.isSubtypeOf(valueType, builtIns.unitType)
 
     private fun KotlinType.isBuiltInIntegerType(): Boolean =
         KotlinBuiltIns.isByte(this) ||