diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Freezing.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Freezing.kt index f0bcfa033c3..856b1db400e 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Freezing.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Freezing.kt @@ -29,8 +29,4 @@ enum class Freezing(val enableFreezeAtRuntime: Boolean, val freezeImplicit: Bool */ Disabled(false, false, false); - companion object { - // Users might depend on runtime guarantees of freezing, so it should be enabled by default. - val Default = Full - } } \ No newline at end of file diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt index 3abcb40f9c3..d8950b4cceb 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt @@ -100,12 +100,15 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration val freezing: Freezing by lazy { val freezingMode = configuration.get(BinaryOptions.freezing) when { - freezingMode == null -> Freezing.Default - memoryModel != MemoryModel.EXPERIMENTAL && freezingMode != Freezing.Default -> { + freezingMode == null -> when (memoryModel) { + MemoryModel.EXPERIMENTAL -> Freezing.Disabled + else -> Freezing.Full + } + memoryModel != MemoryModel.EXPERIMENTAL && freezingMode != Freezing.Full -> { configuration.report( CompilerMessageSeverity.ERROR, "`freezing` can only be adjusted with experimental MM. Falling back to default behavior.") - Freezing.Default + Freezing.Full } else -> freezingMode }