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

CODEGEN: fix of string concatenation issue

Browse Source
This commit is contained in:
Konstantin Anisimov
2016-12-08 11:26:22 +03:00
committed by vvlevchenko
parent 282f4fee07
commit 3bb946e144
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+1 -2
View File
@@ -775,14 +775,13 @@ internal class CodeGeneratorVisitor(val context: Context) : IrElementVisitorVoid
private fun evaluateStringConcatenation(tmpVariableName: String, value: IrStringConcatenation): LLVMValueRef? { private fun evaluateStringConcatenation(tmpVariableName: String, value: IrStringConcatenation): LLVMValueRef? {
val stringPlus = KonanPlatform.builtIns.stringType.memberScope.getContributedFunctions( val stringPlus = KonanPlatform.builtIns.stringType.memberScope.getContributedFunctions(
Name.identifier("plus"), NoLookupLocation.FROM_BACKEND).first() Name.identifier("plus"), NoLookupLocation.FROM_BACKEND).first()
var res:LLVMValueRef? = null
val strings:List<LLVMValueRef> = value.arguments.map { val strings:List<LLVMValueRef> = value.arguments.map {
val descriptor = getToString(it.type) val descriptor = getToString(it.type)
val args = listOf(evaluateExpression(codegen.newVar(), it)!!) val args = listOf(evaluateExpression(codegen.newVar(), it)!!)
return@map evaluateSimpleFunctionCall(codegen.newVar(), descriptor, args) return@map evaluateSimpleFunctionCall(codegen.newVar(), descriptor, args)
} }
val concatResult = strings.take(1).fold(strings.first()) {res, it -> evaluateSimpleFunctionCall(codegen.newVar(), stringPlus, listOf(res, it))} val concatResult = strings.drop(1).fold(strings.first()) {res, it -> evaluateSimpleFunctionCall(codegen.newVar(), stringPlus, listOf(res, it))}
return concatResult return concatResult
} }