azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IR] Replace some usages of KotlinType to IrType

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-05-26 12:08:03 +03:00
parent 2d842d061e
commit 7c7f87e729
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt
+2 -2
View File
@@ -179,7 +179,7 @@ class DelegatedPropertyGenerator(declarationGenerator: DeclarationGenerator) : D
BackingFieldLValue( BackingFieldLValue(
context, context,
ktDelegate.startOffsetSkippingComments, ktDelegate.endOffset, ktDelegate.startOffsetSkippingComments, ktDelegate.endOffset,
irDelegateField.descriptor.type.toIrType(), irDelegateField.owner.type,
irDelegateField, irDelegateField,
thisValue, thisValue,
null null
@@ -348,7 +348,7 @@ class DelegatedPropertyGenerator(declarationGenerator: DeclarationGenerator) : D
context, context,
ktDelegate.startOffsetSkippingComments, ktDelegate.endOffset, ktDelegate.startOffsetSkippingComments, ktDelegate.endOffset,
irDelegate, irDelegate,
irDelegate.descriptor.type.toIrType() irDelegate.owner.type
) )
private inline fun createLocalPropertyAccessor( private inline fun createLocalPropertyAccessor(
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt
+2 -2
View File
@@ -198,7 +198,7 @@ internal class InsertImplicitCasts(
override fun visitSetVariable(expression: IrSetVariable): IrExpression = override fun visitSetVariable(expression: IrSetVariable): IrExpression =
expression.transformPostfix { expression.transformPostfix {
value = value.cast(expression.symbol.descriptor.type) value = value.cast(expression.symbol.owner.type)
} }
override fun visitGetField(expression: IrGetField): IrExpression = override fun visitGetField(expression: IrGetField): IrExpression =
@@ -215,7 +215,7 @@ internal class InsertImplicitCasts(
override fun visitVariable(declaration: IrVariable): IrVariable = override fun visitVariable(declaration: IrVariable): IrVariable =
declaration.transformPostfix { declaration.transformPostfix {
initializer = initializer?.cast(declaration.descriptor.type) initializer = initializer?.cast(declaration.type)
} }
override fun visitField(declaration: IrField): IrStatement { override fun visitField(declaration: IrField): IrStatement {