From ce1e651f6473b7c533c6b3f138a25d380f42c825 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 6 Jul 2020 21:53:52 +0200 Subject: [PATCH] IR: remove deprecated constructors of IrVariableImpl (cherry picked from commit 92503830559a735792671f14f7f4d2024779bda0) --- .../konan/optimizations/Devirtualization.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt index b604cf59d7d..0e545e82b35 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.impl.* import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol import org.jetbrains.kotlin.ir.symbols.impl.IrReturnableBlockSymbolImpl +import org.jetbrains.kotlin.ir.symbols.impl.IrVariableSymbolImpl import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.classifierOrFail import org.jetbrains.kotlin.ir.types.impl.originalKotlinType @@ -1343,15 +1344,14 @@ internal object Devirtualization { fun IrStatementsBuilder.irTemporary(value: IrExpression, tempName: String, type: IrType): IrVariable { val originalKotlinType = type.originalKotlinType ?: type.toKotlinType() - val descriptor = IrTemporaryVariableDescriptorImpl( - scope.scopeOwner, Name.identifier(tempName), originalKotlinType, false) + val descriptor = IrTemporaryVariableDescriptorImpl(scope.scopeOwner, Name.identifier(tempName), originalKotlinType, false) val temporary = IrVariableImpl( - value.startOffset, value.endOffset, IrDeclarationOrigin.IR_TEMPORARY_VARIABLE, - descriptor, - type, - value - ) + value.startOffset, value.endOffset, IrDeclarationOrigin.IR_TEMPORARY_VARIABLE, IrVariableSymbolImpl(descriptor), + descriptor.name, type, isVar = false, isConst = false, isLateinit = false + ).apply { + this.initializer = value + } +temporary return temporary