jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-20 15:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

JVM IR: Use correct scope owner in JvmInlineClassLowering

Browse Source
This commit is contained in:
Steven Schäfer
2019-08-22 11:18:46 +02:00
committed by Alexander Udalov
parent 2afbeaa353
commit cdd3f82396
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt
View File

@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.backend.jvm.lower
import org.jetbrains.kotlin.backend.common.FileLoweringPass
import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
import org.jetbrains.kotlin.backend.common.ir.copyParameterDeclarationsFrom
import org.jetbrains.kotlin.backend.common.ir.passTypeArgumentsFrom
import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
@@ -46,7 +47,7 @@ val jvmInlineClassPhase = makeIrFilePhase(
* We do not unfold inline class types here. Instead, the type mapper will lower inline class
* types to the types of their underlying field.
*/
private class JvmInlineClassLowering(private val context: JvmBackendContext) : FileLoweringPass, IrElementTransformerVoid() {
private class JvmInlineClassLowering(private val context: JvmBackendContext) : FileLoweringPass, IrElementTransformerVoidWithContext() {
private val manager = MemoizedInlineClassReplacements()
private val valueMap = mutableMapOf<IrValueSymbol, IrValueDeclaration>()
@@ -54,7 +55,7 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
irFile.transformChildrenVoid()
}
override fun visitClass(declaration: IrClass): IrStatement {
override fun visitClassNew(declaration: IrClass): IrStatement {
// The arguments to the primary constructor are in scope in the initializers of IrFields.
declaration.primaryConstructor?.let {
manager.getReplacementFunction(it)?.let { replacement ->
@@ -231,9 +232,10 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
val function = expression.symbol.owner
val replacement = manager.getReplacementFunction(function)
?: return super.visitFunctionAccess(expression)
return context.createIrBuilder(expression.symbol).irCall(replacement.function).apply {
buildReplacement(function, expression, replacement)
}
return context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol, expression.startOffset, expression.endOffset)
.irCall(replacement.function).apply {
buildReplacement(function, expression, replacement)
}
}
private fun coerceInlineClasses(argument: IrExpression, from: IrType, to: IrType) =
@@ -264,7 +266,7 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
override fun visitReturn(expression: IrReturn): IrExpression {
expression.returnTargetSymbol.owner.safeAs<IrFunction>()?.let { target ->
manager.getReplacementFunction(target)?.let {
return context.createIrBuilder(it.function.symbol).irReturn(
return context.createIrBuilder(it.function.symbol, expression.startOffset, expression.endOffset).irReturn(
expression.value.transform(this, null)
)
}

1
compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultValueOfInlineClassTypeInInlineFun.kt vendored
View File

@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
inline class Z(val int: Int)
inline class L(val long: Long)

1
compiler/testData/codegen/box/inlineClasses/inlineFunctionInsideInlineClass.kt vendored
View File

@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
inline class Foo(val x: Int) {
inline fun inc(): Foo = Foo(x + 1)

1
compiler/testData/codegen/bytecodeText/inlineClasses/noActualCallsOfInlineFunctionsOfInlineClass.kt vendored
View File

@@ -1,5 +1,4 @@
// !LANGUAGE: +InlineClasses
// IGNORE_BACKEND: JVM_IR
inline class Foo(val x: Int) {
inline fun inlineInc(): Foo = Foo(x + 1)