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

Improve memory tracing, fix 32-bit platforms (#815)

Browse Source
This commit is contained in:
Nikolay Igotti
2017-08-29 10:21:47 +03:00
committed by GitHub
parent 1d434899cb
commit 7d72beb27c
8 changed files with 86 additions and 124 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/CodeGenerator.kt
+5 -5
View File
@@ -110,7 +110,7 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
private var returnSlot: LLVMValueRef? = null
private var slotsPhi: LLVMValueRef? = null
private val frameOverlaySlotCount =
(LLVMStoreSizeOfType(llvmTargetData, runtime.frameOverlayType) / pointerSize).toInt()
(LLVMStoreSizeOfType(llvmTargetData, runtime.frameOverlayType) / runtime.pointerSize).toInt()
private var slotCount = frameOverlaySlotCount
private var localAllocs = 0
private var arenaSlot: LLVMValueRef? = null
@@ -496,11 +496,10 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
if (needSlots) {
// Zero-init slots.
val slotsMem = bitcast(kInt8Ptr, slots)
val pointerSize = LLVMABISizeOfType(llvmTargetData, kObjHeaderPtr).toInt()
val alignment = LLVMABIAlignmentOfType(llvmTargetData, kObjHeaderPtr)
call(context.llvm.memsetFunction,
listOf(slotsMem, Int8(0).llvm,
Int32(slotCount * pointerSize).llvm, Int32(alignment).llvm,
Int32(slotCount * codegen.runtime.pointerSize).llvm,
Int32(codegen.runtime.pointerAlignment).llvm,
Int1(0).llvm))
call(context.llvm.enterFrameFunction, listOf(slots, Int32(slotCount).llvm))
}
@@ -508,7 +507,8 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
val slotOffset = pointerSize * slotCount
memScoped {
slotToVariableLocation.forEach { slot, variable ->
val expr = longArrayOf(DwarfOp.DW_OP_minus.value, slotOffset + pointerSize * slot.toLong()).toCValues()
val expr = longArrayOf(DwarfOp.DW_OP_minus.value,
slotOffset + runtime.pointerSize * slot.toLong()).toCValues()
DIInsertDeclaration(
builder = codegen.context.debugInfo.builder,
value = slotsPhi,
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt
+9
View File
@@ -58,4 +58,13 @@ class Runtime(bitcodeFile: String) {
val kotlinObjCClassInfo by lazy { getStructType("KotlinObjCClassInfo") }
val objCMethodDescription by lazy { getStructType("ObjCMethodDescription") }
val pointerSize: Int by lazy {
LLVMABISizeOfType(targetData, objHeaderPtrType).toInt()
}
val pointerAlignment: Int by lazy {
LLVMABIAlignmentOfType(targetData, objHeaderPtrType)
}
}