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

Workaround inline debug info when compiling to multiple LLVM modules (#3326)

Browse Source
This commit is contained in:
SvyatoslavScherbina
2019-09-11 10:14:52 +03:00
committed by GitHub
parent b7cfdd74d6
commit ccc5cbe378
1 changed files with 8 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
+8 -2
View File
@@ -1587,6 +1587,9 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
val diScope = functionScope ?: return null val diScope = functionScope ?: return null
val outerFileEntry = outerFileEntry() val outerFileEntry = outerFileEntry()
val inlinedAt = outerContext.location(outerFileEntry.line(returnableBlock.startOffset), outerFileEntry.column(returnableBlock.startOffset)) val inlinedAt = outerContext.location(outerFileEntry.line(returnableBlock.startOffset), outerFileEntry.column(returnableBlock.startOffset))
?: error("no location for inlinedAt:\n" +
"${returnableBlock.startOffset} ${returnableBlock.endOffset}\n" +
returnableBlock.render())
LocationInfo(diScope, line, column, inlinedAt) LocationInfo(diScope, line, column, inlinedAt)
} else { } else {
outerContext.location(line, column) outerContext.location(line, column)
@@ -1809,7 +1812,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
private fun IrFunction.scope(startLine:Int): DIScopeOpaqueRef? { private fun IrFunction.scope(startLine:Int): DIScopeOpaqueRef? {
if (codegen.isExternal(this) || !context.shouldContainLocationDebugInfo()) if (!context.shouldContainLocationDebugInfo())
return null return null
val functionLlvmValue = codegen.llvmFunctionOrNull(this) val functionLlvmValue = codegen.llvmFunctionOrNull(this)
return if (functionLlvmValue != null) { return if (functionLlvmValue != null) {
@@ -1818,7 +1821,10 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
val subroutineType = subroutineType(context, codegen.llvmTargetData) val subroutineType = subroutineType(context, codegen.llvmTargetData)
val functionLlvmValue = codegen.llvmFunction(this@scope) val functionLlvmValue = codegen.llvmFunction(this@scope)
diFunctionScope(name.asString(), functionLlvmValue.name!!, startLine, subroutineType).also { diFunctionScope(name.asString(), functionLlvmValue.name!!, startLine, subroutineType).also {
DIFunctionAddSubprogram(functionLlvmValue, it) if (!codegen.isExternal(this@scope)) {
DIFunctionAddSubprogram(functionLlvmValue, it)
// TODO: don't add [functionLlvmValue] itself in this case.
}
} }
} }
} as DIScopeOpaqueRef } as DIScopeOpaqueRef