diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt index 2337369a7ec..e06abf4c776 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.ir.declarations.impl.* import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.impl.* import org.jetbrains.kotlin.ir.symbols.* -import org.jetbrains.kotlin.ir.util.createParameterDeclarations import org.jetbrains.kotlin.ir.util.transformFlat import org.jetbrains.kotlin.ir.visitors.* import org.jetbrains.kotlin.name.Name diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/IrBuilders.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/IrBuilders.kt index 58f14aa16f8..0ac7c5af126 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/IrBuilders.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/IrBuilders.kt @@ -29,26 +29,26 @@ import org.jetbrains.kotlin.ir.util.defaultType import org.jetbrains.kotlin.types.KotlinType fun IrBuilderWithScope.irWhile(origin: IrStatementOrigin? = null) = - IrWhileLoopImpl(startOffset, endOffset, context.builtIns.unitType, origin) + IrWhileLoopImpl(startOffset, endOffset, context.irBuiltIns.unitType, origin) fun IrBuilderWithScope.irBreak(loop: IrLoop) = - IrBreakImpl(startOffset, endOffset, context.builtIns.nothingType, loop) + IrBreakImpl(startOffset, endOffset, context.irBuiltIns.nothingType, loop) fun IrBuilderWithScope.irContinue(loop: IrLoop) = - IrContinueImpl(startOffset, endOffset, context.builtIns.nothingType, loop) + IrContinueImpl(startOffset, endOffset, context.irBuiltIns.nothingType, loop) -fun IrBuilderWithScope.irTrue() = IrConstImpl.boolean(startOffset, endOffset, context.builtIns.booleanType, true) +fun IrBuilderWithScope.irTrue() = IrConstImpl.boolean(startOffset, endOffset, context.irBuiltIns.booleanType, true) -fun IrBuilderWithScope.irFalse() = IrConstImpl.boolean(startOffset, endOffset, context.builtIns.booleanType, false) +fun IrBuilderWithScope.irFalse() = IrConstImpl.boolean(startOffset, endOffset, context.irBuiltIns.booleanType, false) fun IrBuilderWithScope.irCall(symbol: IrFunctionSymbol, typeArguments: Map) = - IrCallImpl(this.startOffset, this.endOffset, symbol, symbol.descriptor.substitute(typeArguments), typeArguments) + IrCallImpl(this.startOffset, this.endOffset, symbol, symbol.descriptor.substitute(typeArguments), typeArguments) fun IrBuilderWithScope.irCall(symbol: IrFunctionSymbol, typeArguments: List) = irCall(symbol, symbol.descriptor.typeParameters.zip(typeArguments).toMap()) fun IrBuilderWithScope.irGetObject(classSymbol: IrClassSymbol) = - IrGetObjectValueImpl(startOffset, endOffset, classSymbol.owner.defaultType, classSymbol) + IrGetObjectValueImpl(startOffset, endOffset, classSymbol.owner.defaultType, classSymbol) fun IrBuilderWithScope.irGetField(receiver: IrExpression?, symbol: IrFieldSymbol) = - IrGetFieldImpl(startOffset, endOffset, symbol, receiver) \ No newline at end of file + IrGetFieldImpl(startOffset, endOffset, symbol, receiver) \ No newline at end of file