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

* Add missing KonanTarget.IOS_X64 to llvm optimization pipeline (#2980)

Browse Source 
* Fix coverage_basic_library for ios_x64
This commit is contained in:
Sergey Bogolepov
2019-05-16 00:06:12 +07:00
committed by GitHub
parent aebbad4401
commit a1ae034a78
2 changed files with 2 additions and 1 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/OptimizationPipeline.kt
+1
View File
@@ -45,6 +45,7 @@ private class LlvmPipelineConfiguration(context: Context) {
val cpuArchitecture: String = when (target) { val cpuArchitecture: String = when (target) {
KonanTarget.IOS_ARM32 -> "armv7" KonanTarget.IOS_ARM32 -> "armv7"
KonanTarget.IOS_ARM64 -> "arm64" KonanTarget.IOS_ARM64 -> "arm64"
KonanTarget.IOS_X64 -> "core2"
KonanTarget.MACOS_X64 -> "core2" KonanTarget.MACOS_X64 -> "core2"
else -> error("There is no support for ${target.name} target yet.") else -> error("There is no support for ${target.name} target yet.")
} }
backend.native/tests/build.gradle
+1 -1
View File
@@ -3447,7 +3447,7 @@ task coverage_basic_library(type: RunStandaloneKonanTest) {
doFirst { doFirst {
def konancScript = isWindows() ? "konanc.bat" : "konanc" def konancScript = isWindows() ? "konanc.bat" : "konanc"
def konanc = "$dist/bin/$konancScript" def konanc = "$dist/bin/$konancScript"
"$konanc $projectDir/coverage/basic/library/library.kt -p library -o $dir/lib_to_cover".execute().waitFor() "$konanc -target ${getTarget(project).name} $projectDir/coverage/basic/library/library.kt -p library -o $dir/lib_to_cover".execute().waitFor()
} }
flags = ["-Xcoverage-file=$dir/program.profraw", "-l", "$dir/lib_to_cover", "-Xlibrary-to-cover=$dir/lib_to_cover.klib", "-entry", "coverage.basic.library.main"] flags = ["-Xcoverage-file=$dir/program.profraw", "-l", "$dir/lib_to_cover", "-Xlibrary-to-cover=$dir/lib_to_cover.klib", "-entry", "coverage.basic.library.main"]