From 7c7f87e7290707e0ed94650dc7cce924333bca48 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 26 May 2020 12:08:03 +0300
Subject: [PATCH] [IR] Replace some usages of KotlinType to IrType

---
 .../kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt    | 4 ++--
 .../kotlin/psi2ir/transformations/InsertImplicitCasts.kt      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt
index 85ed5dad739..b4dc0608b50 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt
@@ -179,7 +179,7 @@ class DelegatedPropertyGenerator(declarationGenerator: DeclarationGenerator) : D
             BackingFieldLValue(
                 context,
                 ktDelegate.startOffsetSkippingComments, ktDelegate.endOffset,
-                irDelegateField.descriptor.type.toIrType(),
+                irDelegateField.owner.type,
                 irDelegateField,
                 thisValue,
                 null
@@ -348,7 +348,7 @@ class DelegatedPropertyGenerator(declarationGenerator: DeclarationGenerator) : D
             context,
             ktDelegate.startOffsetSkippingComments, ktDelegate.endOffset,
             irDelegate,
-            irDelegate.descriptor.type.toIrType()
+            irDelegate.owner.type
         )
 
     private inline fun createLocalPropertyAccessor(
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt
index 45778d8518e..9e0fd813ad4 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt
@@ -198,7 +198,7 @@ internal class InsertImplicitCasts(
 
     override fun visitSetVariable(expression: IrSetVariable): IrExpression =
         expression.transformPostfix {
-            value = value.cast(expression.symbol.descriptor.type)
+            value = value.cast(expression.symbol.owner.type)
         }
 
     override fun visitGetField(expression: IrGetField): IrExpression =
@@ -215,7 +215,7 @@ internal class InsertImplicitCasts(
 
     override fun visitVariable(declaration: IrVariable): IrVariable =
         declaration.transformPostfix {
-            initializer = initializer?.cast(declaration.descriptor.type)
+            initializer = initializer?.cast(declaration.type)
         }
 
     override fun visitField(declaration: IrField): IrStatement {