Skip to content

Commit 0e3327f

Browse files
haitakaSpace Team
authored andcommitted
[K/N] Use coreSymbolicationImageListType=all_loaded by default
With previous default `only_kotlin` symbolication takes significant time on simulators. ^KT-79075 Stuck on Kotlin_getSourceInfo_core_symbolication Now the srouce info might be missing with older macOS versions due to KT-75992 But that, I guess, is once again the lesser evel. This reverts commit 80518f5. Merge-request: KT-MR-22826 Merged-by: Alexey Glushko <[email protected]>
1 parent 21231f5 commit 0e3327f

File tree

2 files changed

+3
-5
lines changed
  • kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan
  • native/native.tests/testData/framework/stacktrace

2 files changed

+3
-5
lines changed

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
160160

161161
val coreSymbolicationUseOnlyKotlinImage: Boolean
162162
get() = when (configuration.get(BinaryOptions.coreSymbolicationImageListType)) {
163-
CoreSymbolicationImageListType.ALL_LOADED -> false
164163
null,
164+
CoreSymbolicationImageListType.ALL_LOADED -> false
165165
CoreSymbolicationImageListType.ONLY_KOTLIN -> true
166166
}
167167

native/native.tests/testData/framework/stacktrace/stacktrace.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ func testStackTrace() throws {
99
try assertTrue(trace[2].contains("stacktrace.kt:8"))
1010
try assertTrue(trace[3].contains("stacktrace.kt:13"))
1111
try assertTrue(trace[4].contains("<compiler-generated>"))
12-
13-
// See https://youtrack.jetbrains.com/issue/KT-76511/Native-Kotlin-stacktraces-dont-show-Swift-line-numbers.
14-
// try assertTrue(trace[5].contains("stacktrace.swift:5"))
15-
// try assertTrue(trace[6].contains("main.swift"))
12+
try assertTrue(trace[5].contains("stacktrace.swift:5"))
13+
try assertTrue(trace[6].contains("main.swift"))
1614
}
1715

1816
class StacktraceTests : TestProvider {

0 commit comments

Comments
 (0)