Generate catch-block body within proper scope

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/TryCatchExpressionGenerator.kt

@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.psi2ir.generators
 
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
-import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.impl.IrCatchImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrTryImpl
@@ -37,7 +36,6 @@ class TryCatchExpressionGenerator(statementGenerator: StatementGenerator) : Stat
             val ktCatchParameter = ktCatchClause.catchParameter!!
             val ktCatchBody = ktCatchClause.catchBody!!
             val catchParameterDescriptor = getOrFail(BindingContext.VALUE_PARAMETER, ktCatchParameter)
-            val irCatchResult = statementGenerator.generateExpression(ktCatchBody)
 
             val irCatch = IrCatchImpl(
                     ktCatchClause.startOffset, ktCatchClause.endOffset,
@@ -45,9 +43,11 @@ class TryCatchExpressionGenerator(statementGenerator: StatementGenerator) : Stat
                             ktCatchParameter.startOffset, ktCatchParameter.endOffset,
                             IrDeclarationOrigin.CATCH_PARAMETER,
                             catchParameterDescriptor
-                    ),
-                    irCatchResult
-            )
+                    )
+            ).apply {
+                result = statementGenerator.generateExpression(ktCatchBody)
+            }
+
             irTryCatch.catches.add(irCatch)
         }
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTryImpl.kt

@@ -63,11 +63,22 @@ class IrTryImpl(startOffset: Int, endOffset: Int, type: KotlinType) :
     }
 }
 
-class IrCatchImpl(
-        startOffset: Int, endOffset: Int,
-        override var catchParameter: IrVariable,
-        override var result: IrExpression
-) : IrCatch, IrElementBase(startOffset, endOffset) {
+class IrCatchImpl(startOffset: Int, endOffset: Int)
+    : IrCatch, IrElementBase(startOffset, endOffset)
+{
+    constructor(startOffset: Int, endOffset: Int, catchParameter: IrVariable)
+            : this(startOffset, endOffset) {
+        this.catchParameter = catchParameter
+    }
+
+    constructor(startOffset: Int, endOffset: Int, catchParameter: IrVariable, result: IrExpression)
+            : this(startOffset, endOffset, catchParameter) {
+        this.result = result
+    }
+
+    override lateinit var catchParameter: IrVariable
+    override lateinit var result: IrExpression
+
     override val parameter: VariableDescriptor get() = catchParameter.descriptor
 
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R {