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

Moved production of windws dll .def file to CAdapterGenerator.kt.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-12-12 19:37:17 +03:00
committed by alexander-gorshenev
parent 3984c4ff64
commit dd42c63bd2
1 changed files with 15 additions and 3 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/CAdapterGenerator.kt
+15 -3
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyPublicApi import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyPublicApi
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.konan.file.* import org.jetbrains.kotlin.konan.file.*
import org.jetbrains.kotlin.konan.target.*
private enum class ScopeKind { private enum class ScopeKind {
TOP, TOP,
@@ -292,7 +293,7 @@ private class ExportedElement(val kind: ElementKind,
internal class CAdapterGenerator(val context: Context, internal class CAdapterGenerator(val context: Context,
internal val codegen: CodeGenerator) : IrElementVisitorVoid { internal val codegen: CodeGenerator) : IrElementVisitorVoid {
private val scopes = mutableListOf<ExportedElementScope>() private val scopes = mutableListOf<ExportedElementScope>()
internal val prefix: String = context.config.moduleId internal val prefix = context.config.moduleId
private lateinit var outputStreamWriter: PrintWriter private lateinit var outputStreamWriter: PrintWriter
override fun visitElement(element: IrElement) { override fun visitElement(element: IrElement) {
@@ -429,6 +430,8 @@ internal class CAdapterGenerator(val context: Context,
val headerFile = context.config.tempFiles.cAdapterHeader val headerFile = context.config.tempFiles.cAdapterHeader
outputStreamWriter = headerFile.printWriter() outputStreamWriter = headerFile.printWriter()
val exportedSymbol = "${prefix}_symbols"
output("#ifndef KONAN_${prefix.toUpperCase()}_H") output("#ifndef KONAN_${prefix.toUpperCase()}_H")
output("#define KONAN_${prefix.toUpperCase()}_H") output("#define KONAN_${prefix.toUpperCase()}_H")
// TODO: use namespace for C++ case? // TODO: use namespace for C++ case?
@@ -463,7 +466,7 @@ internal class CAdapterGenerator(val context: Context,
makeScopeDefinitions(top, DefinitionKind.C_HEADER_STRUCT, 1) makeScopeDefinitions(top, DefinitionKind.C_HEADER_STRUCT, 1)
output("} ${prefix}_ExportedSymbols;") output("} ${prefix}_ExportedSymbols;")
output("extern ${prefix}_ExportedSymbols* ${prefix}_symbols(void);") output("extern ${prefix}_ExportedSymbols* $exportedSymbol(void);")
output(""" output("""
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
@@ -536,8 +539,17 @@ internal class CAdapterGenerator(val context: Context,
output(".IsInstance = IsInstanceImpl,", 1) output(".IsInstance = IsInstanceImpl,", 1)
makeScopeDefinitions(top, DefinitionKind.C_SOURCE_STRUCT, 1) makeScopeDefinitions(top, DefinitionKind.C_SOURCE_STRUCT, 1)
output("};") output("};")
output("RUNTIME_USED ${prefix}_ExportedSymbols* ${prefix}_symbols(void) { return &__konan_symbols;}") output("RUNTIME_USED ${prefix}_ExportedSymbols* $exportedSymbol(void) { return &__konan_symbols;}")
outputStreamWriter.close() outputStreamWriter.close()
if (context.config.targetManager.target.family == Family.WINDOWS) {
outputStreamWriter = context.config.tempFiles
.cAdapterDef
.printWriter()
output("EXPORTS")
output(exportedSymbol)
outputStreamWriter.close()
}
} }
private val simpleNameMapping = mapOf( private val simpleNameMapping = mapOf(