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

[K/N] Fix debug info in lazy initializers

Browse Source
This commit is contained in:
Pavel Kunyavskiy
2021-08-25 12:45:28 +03:00
committed by Space
parent 7f988bd442
commit 5529713ebe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
+2 -2
View File
@@ -123,8 +123,8 @@ val LLVMValueRef.isConst:Boolean
internal inline fun<R> generateFunction(codegen: CodeGenerator, internal inline fun<R> generateFunction(codegen: CodeGenerator,
function: IrFunction, function: IrFunction,
startLocation: LocationInfo? = null, startLocation: LocationInfo?,
endLocation: LocationInfo? = null, endLocation: LocationInfo?,
code: FunctionGenerationContext.(FunctionGenerationContext) -> R) { code: FunctionGenerationContext.(FunctionGenerationContext) -> R) {
val llvmFunction = codegen.llvmFunction(function) val llvmFunction = codegen.llvmFunction(function)
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+2 -2
View File
@@ -370,7 +370,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
f() f()
context.llvm.initializersGenerationState.globalInitFunction?.let { fileInitFunction -> context.llvm.initializersGenerationState.globalInitFunction?.let { fileInitFunction ->
generateFunction(codegen, fileInitFunction, null, null) { generateFunction(codegen, fileInitFunction, fileInitFunction.location(start = true), fileInitFunction.location(start = false)) {
using(FunctionScope(fileInitFunction, it)) { using(FunctionScope(fileInitFunction, it)) {
val parameterScope = ParameterScope(fileInitFunction, functionGenerationContext) val parameterScope = ParameterScope(fileInitFunction, functionGenerationContext)
using(parameterScope) usingParameterScope@{ using(parameterScope) usingParameterScope@{
@@ -387,7 +387,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
} }
context.llvm.initializersGenerationState.threadLocalInitFunction?.let { fileInitFunction -> context.llvm.initializersGenerationState.threadLocalInitFunction?.let { fileInitFunction ->
generateFunction(codegen, fileInitFunction, null, null) { generateFunction(codegen, fileInitFunction, fileInitFunction.location(start = true), fileInitFunction.location(start = false)) {
using(FunctionScope(fileInitFunction, it)) { using(FunctionScope(fileInitFunction, it)) {
val parameterScope = ParameterScope(fileInitFunction, functionGenerationContext) val parameterScope = ParameterScope(fileInitFunction, functionGenerationContext)
using(parameterScope) usingParameterScope@{ using(parameterScope) usingParameterScope@{