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

[codegen] g/c indentation and warns

Browse Source
This commit is contained in:
Vasily Levchenko
2018-02-06 10:09:34 +03:00
committed by Vasily Levchenko
parent a90ba16aed
commit f7af762dad
1 changed files with 42 additions and 42 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
+42 -42
View File
@@ -54,55 +54,55 @@ import org.jetbrains.kotlin.types.typeUtil.isTypeParameter
import org.jetbrains.kotlin.types.typeUtil.isUnit import org.jetbrains.kotlin.types.typeUtil.isUnit
internal fun emitLLVM(context: Context) { internal fun emitLLVM(context: Context) {
val irModule = context.irModule!! val irModule = context.irModule!!
// Note that we don't set module target explicitly. // Note that we don't set module target explicitly.
// It is determined by the target of runtime.bc // It is determined by the target of runtime.bc
// (see Llvm class in ContextUtils) // (see Llvm class in ContextUtils)
// Which in turn is determined by the clang flags // Which in turn is determined by the clang flags
// used to compile runtime.bc. // used to compile runtime.bc.
val llvmModule = LLVMModuleCreateWithName("out")!! // TODO: dispose val llvmModule = LLVMModuleCreateWithName("out")!! // TODO: dispose
context.llvmModule = llvmModule context.llvmModule = llvmModule
context.debugInfo.builder = DICreateBuilder(llvmModule) context.debugInfo.builder = DICreateBuilder(llvmModule)
context.llvmDeclarations = createLlvmDeclarations(context) context.llvmDeclarations = createLlvmDeclarations(context)
val phaser = PhaseManager(context) val phaser = PhaseManager(context)
phaser.phase(KonanPhase.RTTI) { phaser.phase(KonanPhase.RTTI) {
irModule.acceptVoid(RTTIGeneratorVisitor(context)) irModule.acceptVoid(RTTIGeneratorVisitor(context))
} }
generateDebugInfoHeader(context) generateDebugInfoHeader(context)
var moduleDFG: ModuleDFG? = null var moduleDFG: ModuleDFG? = null
phaser.phase(KonanPhase.BUILD_DFG) { phaser.phase(KonanPhase.BUILD_DFG) {
moduleDFG = ModuleDFGBuilder(context, irModule).build() moduleDFG = ModuleDFGBuilder(context, irModule).build()
} }
phaser.phase(KonanPhase.SERIALIZE_DFG) { phaser.phase(KonanPhase.SERIALIZE_DFG) {
DFGSerializer.serialize(context, moduleDFG!!) DFGSerializer.serialize(context, moduleDFG!!)
} }
@Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE") @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
var externalModulesDFG: ExternalModulesDFG? = null var externalModulesDFG: ExternalModulesDFG? = null
phaser.phase(KonanPhase.DESERIALIZE_DFG) { phaser.phase(KonanPhase.DESERIALIZE_DFG) {
externalModulesDFG = DFGSerializer.deserialize(context, moduleDFG!!.symbolTable.privateTypeIndex, moduleDFG!!.symbolTable.privateFunIndex) externalModulesDFG = DFGSerializer.deserialize(context, moduleDFG!!.symbolTable.privateTypeIndex, moduleDFG!!.symbolTable.privateFunIndex)
} }
val lifetimes = mutableMapOf<IrElement, Lifetime>() val lifetimes = mutableMapOf<IrElement, Lifetime>()
val codegenVisitor = CodeGeneratorVisitor(context, lifetimes) val codegenVisitor = CodeGeneratorVisitor(context, lifetimes)
phaser.phase(KonanPhase.ESCAPE_ANALYSIS) { phaser.phase(KonanPhase.ESCAPE_ANALYSIS) {
val callGraph = CallGraphBuilder(context, moduleDFG!!, externalModulesDFG!!).build() val callGraph = CallGraphBuilder(context, moduleDFG!!, externalModulesDFG!!).build()
EscapeAnalysis.computeLifetimes(moduleDFG!!, externalModulesDFG!!, callGraph, lifetimes) EscapeAnalysis.computeLifetimes(moduleDFG!!, externalModulesDFG!!, callGraph, lifetimes)
} }
phaser.phase(KonanPhase.CODEGEN) { phaser.phase(KonanPhase.CODEGEN) {
irModule.acceptVoid(codegenVisitor) irModule.acceptVoid(codegenVisitor)
} }
if (context.shouldContainDebugInfo()) { if (context.shouldContainDebugInfo()) {
DIFinalize(context.debugInfo.builder) DIFinalize(context.debugInfo.builder)
} }
} }
internal fun verifyModule(llvmModule: LLVMModuleRef, current: String = "") { internal fun verifyModule(llvmModule: LLVMModuleRef, current: String = "") {
@@ -1525,7 +1525,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
DICreateReplaceableCompositeType( DICreateReplaceableCompositeType(
tag = DwarfTag.DW_TAG_structure_type.value, tag = DwarfTag.DW_TAG_structure_type.value,
refBuilder = context.debugInfo.builder, refBuilder = context.debugInfo.builder,
refScope = (currentCodeContext.fileScope() as FileScope)!!.file.file() as DIScopeOpaqueRef, refScope = (currentCodeContext.fileScope() as FileScope).file.file() as DIScopeOpaqueRef,
name = clazz.descriptor.typeInfoSymbolName, name = clazz.descriptor.typeInfoSymbolName,
refFile = file().file(), refFile = file().file(),
line = clazz.startLine()) as DITypeOpaqueRef line = clazz.startLine()) as DITypeOpaqueRef
@@ -2422,8 +2422,8 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
val llvmUsedGlobal = val llvmUsedGlobal =
context.llvm.staticData.placeGlobalArray(name, int8TypePtr, argsCasted) context.llvm.staticData.placeGlobalArray(name, int8TypePtr, argsCasted)
LLVMSetLinkage(llvmUsedGlobal.llvmGlobal, LLVMLinkage.LLVMAppendingLinkage); LLVMSetLinkage(llvmUsedGlobal.llvmGlobal, LLVMLinkage.LLVMAppendingLinkage)
LLVMSetSection(llvmUsedGlobal.llvmGlobal, "llvm.metadata"); LLVMSetSection(llvmUsedGlobal.llvmGlobal, "llvm.metadata")
} }
} }