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

DCE on linked binaries, to avoid huge size due to static cache. (#3715) (#3717)

Browse Source
This commit is contained in:
Nikolay Igotti
2019-12-24 15:58:22 +03:00
committed by GitHub
parent a931b5453a
commit 17c5647ea4
2 changed files with 15 additions and 7 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/Linker.kt
+10 -5
View File
@@ -90,10 +90,15 @@ internal class Linker(val context: Context) {
val executable: String val executable: String
if (context.config.produce != CompilerOutputKind.FRAMEWORK) { if (context.config.produce != CompilerOutputKind.FRAMEWORK) {
if (context.config.produce == CompilerOutputKind.DYNAMIC_CACHE && target.family.isAppleFamily) additionalLinkerArgs = if (target.family.isAppleFamily) {
additionalLinkerArgs = listOf("-install_name", context.config.outputFiles.mainFile) when (context.config.produce) {
else CompilerOutputKind.DYNAMIC_CACHE ->
additionalLinkerArgs = emptyList() listOf("-install_name", context.config.outputFiles.mainFile)
else -> listOf("-dead_strip")
}
} else {
emptyList()
}
executable = context.config.outputFiles.mainFileMangled executable = context.config.outputFiles.mainFileMangled
} else { } else {
val framework = File(context.config.outputFile) val framework = File(context.config.outputFile)
@@ -105,7 +110,7 @@ internal class Linker(val context: Context) {
Family.OSX -> "Versions/A/$dylibName" Family.OSX -> "Versions/A/$dylibName"
else -> error(target) else -> error(target)
} }
additionalLinkerArgs = listOf("-install_name", "@rpath/${framework.name}/$dylibRelativePath") additionalLinkerArgs = listOf("-dead_strip", "-install_name", "@rpath/${framework.name}/$dylibRelativePath")
val dylibPath = framework.child(dylibRelativePath) val dylibPath = framework.child(dylibRelativePath)
dylibPath.parentFile.mkdirs() dylibPath.parentFile.mkdirs()
executable = dylibPath.absolutePath executable = dylibPath.absolutePath
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt
+5 -2
View File
@@ -588,8 +588,11 @@ private fun ObjCExportBlockCodeGenerator.emitBlockToKotlinFunctionConverters() {
val functionClassesByArity = val functionClassesByArity =
context.ir.symbols.functionIrClassFactory.builtFunctionNClasses.associateBy { it.arity } context.ir.symbols.functionIrClassFactory.builtFunctionNClasses.associateBy { it.arity }
val count = (functionClassesByArity.keys.max() ?: -1) + 1 var count = ((functionClassesByArity.keys.max() ?: -1) + 1)
// TODO: ugly hack to avoid huge unneeded adaptors linked into every binary, needs rework.
if (context.config.produce.isCache) {
count = count.coerceAtMost(33)
}
val converters = (0 until count).map { arity -> val converters = (0 until count).map { arity ->
val functionClass = functionClassesByArity[arity] val functionClass = functionClassesByArity[arity]
if (functionClass != null) { if (functionClass != null) {