From 178b9115924f2bacd0791e2e1bdc048f53779279 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Tue, 16 Aug 2016 12:15:52 +0300 Subject: [PATCH] translator: fix strings, print(string) works --- .../kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt b/translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt index 23aebd8b472..6d22b336718 100644 --- a/translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt +++ b/translator/src/main/kotlin/org/kotlinnative/translator/llvm/LLVMBuilder.kt @@ -84,14 +84,14 @@ class LLVMBuilder(val arm: Boolean = false) { fun addGlobalInitialize(target: LLVMVariable, fields: ArrayList, initializers: Map, classType: LLVMType) { val code = "$target = internal global $classType { ${ - fields.map { it.getType() + " " + if (initializers.containsKey(it)) initializers[it] else "0"}.joinToString() + fields.map { it.getType() + " " + if (initializers.containsKey(it)) initializers[it] else "0" }.joinToString() } }, align ${classType.align}" globalCode.appendln(code) } fun storeString(target: LLVMVariable, source: LLVMVariable, offset: Int) { val stringType = source.type as LLVMStringType - val code = "store ${target.type} getelementptr inbounds (${stringType.fullType()}, " + + val code = "store ${target.type} getelementptr inbounds (" + "${stringType.fullType()}* $source, i32 0, i32 $offset), ${target.getType()} $target, align ${stringType.align}" localCode.appendln(code) }