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

Infrastructure for source-based code coverage

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-02-04 17:53:34 +07:00
committed by Sergey Bogolepov
parent f043a6bf58
commit b22404c947
38 changed files with 1365 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt
+1 -1
View File
@@ -106,6 +106,6 @@ open class Command(initialCommand: List<String>) {
}
private fun log() {
if (logger != null) logger!! { command.toList<String>().joinToString(" ") }
if (logger != null) logger!! { command.joinToString(" ") }
}
}
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+23 -5
View File
@@ -133,15 +133,32 @@ open class MacOSBasedLinker(targetProperties: AppleConfigurables)
private val libtool = "$absoluteTargetToolchain/usr/bin/libtool"
private val linker = "$absoluteTargetToolchain/usr/bin/ld"
private val dsymutil = "$absoluteLlvmHome/bin/llvm-dsymutil"
private val compilerRtLibrary: String? by lazy {
val suffix = when (configurables.target.family) {
private fun provideCompilerRtLibrary(libraryName: String): String? {
val suffix = if (libraryName.isNotEmpty() && target == KonanTarget.IOS_X64) {
"iossim"
} else {
when (val family = configurables.target.family) {
Family.OSX -> "osx"
Family.IOS -> "ios"
else -> TODO()
else -> error("Family $family is unsupported")
}
val dir = File("$absoluteTargetToolchain/usr/lib/clang/").listFiles.firstOrNull()?.absolutePath
if (dir != null) "$dir/lib/darwin/libclang_rt.$suffix.a" else null
}
val dir = File("$absoluteTargetToolchain/usr/lib/clang/").listFiles.firstOrNull()?.absolutePath
val mangledName = if (libraryName.isEmpty()) "" else "${libraryName}_"
return if (dir != null) "$dir/lib/darwin/libclang_rt.$mangledName$suffix.a" else null
}
private val compilerRtLibrary: String? by lazy {
provideCompilerRtLibrary("")
}
// Code coverage requires this library.
private val profileLibrary: String? by lazy {
provideCompilerRtLibrary("profile")
}
private val osVersionMinFlags: List<String> by lazy {
listOf(osVersionMinFlagLd, osVersionMin + ".0")
}
@@ -171,6 +188,7 @@ open class MacOSBasedLinker(targetProperties: AppleConfigurables)
if (dynamic) +linkerDynamicFlags
+linkerKonanFlags
if (compilerRtLibrary != null) +compilerRtLibrary!!
if (profileLibrary != null) +profileLibrary!!
+libraries
+linkerArgs
+rpath(dynamic)