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

[IR] Handled degenerate cases of IrStringConcatenation

Browse Source 
It is not needed to create StringBuilder if the number of values
being concatenated is 0 or 1
This commit is contained in:
Igor Chevdar
2020-08-26 11:07:27 +05:00
parent 74dce725cc
commit 5e71068e61
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/StringConcatenationLowering.kt
+30 -13
View File
@@ -20,14 +20,12 @@ import org.jetbrains.kotlin.backend.common.CommonBackendContext
import org.jetbrains.kotlin.backend.common.FileLoweringPass import org.jetbrains.kotlin.backend.common.FileLoweringPass
import org.jetbrains.kotlin.backend.common.atMostOne import org.jetbrains.kotlin.backend.common.atMostOne
import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.IrStatement
import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope import org.jetbrains.kotlin.ir.builders.*
import org.jetbrains.kotlin.ir.builders.createTmpVariable
import org.jetbrains.kotlin.ir.builders.irCall
import org.jetbrains.kotlin.ir.builders.irGet
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.IrStringConcatenation import org.jetbrains.kotlin.ir.expressions.IrStringConcatenation
import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.types.isNullable
import org.jetbrains.kotlin.ir.types.isNullableAny import org.jetbrains.kotlin.ir.types.isNullableAny
import org.jetbrains.kotlin.ir.util.constructors import org.jetbrains.kotlin.ir.util.constructors
import org.jetbrains.kotlin.ir.util.functions import org.jetbrains.kotlin.ir.util.functions
@@ -88,17 +86,36 @@ private class StringConcatenationTransformer(val lower: StringConcatenationLower
expression.transformChildrenVoid(this) expression.transformChildrenVoid(this)
val blockBuilder = buildersStack.last() val blockBuilder = buildersStack.last()
return blockBuilder.irBlock(expression) {
val stringBuilderImpl = createTmpVariable(irCall(constructor)) val arguments = expression.arguments
expression.arguments.forEach { arg -> return when (arguments.size) {
val appendFunction = typeToAppendFunction(arg.type) 0 -> blockBuilder.irString("")
+irCall(appendFunction).apply { 1 -> {
dispatchReceiver = irGet(stringBuilderImpl) val argument = arguments[0]
putValueArgument(0, arg) if (argument.type.isNullable())
blockBuilder.irCall(context.ir.symbols.extensionToString).apply {
extensionReceiver = argument
}
else blockBuilder.irCall(
context.irBuiltIns.anyClass.functions
.single { it.owner.name.asString() == "toString" }).apply {
dispatchReceiver = argument
} }
} }
+irCall(toStringFunction).apply { else -> {
dispatchReceiver = irGet(stringBuilderImpl) blockBuilder.irBlock(expression) {
val stringBuilderImpl = createTmpVariable(irCall(constructor))
expression.arguments.forEach { arg ->
val appendFunction = typeToAppendFunction(arg.type)
+irCall(appendFunction).apply {
dispatchReceiver = irGet(stringBuilderImpl)
putValueArgument(0, arg)
}
}
+irCall(toStringFunction).apply {
dispatchReceiver = irGet(stringBuilderImpl)
}
}
} }
} }
} }