diff --git a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt index 1f6f56709fd..cb56451555b 100644 --- a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt +++ b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt @@ -248,7 +248,7 @@ class K2Native : CLICompiler() { parseShortModuleName(arguments, configuration, outputKind)?.let { put(SHORT_MODULE_NAME, it) } - put(DISABLE_FAKE_OVERRIDE_VALIDATOR, arguments.disableFakeOverrideValidator) + put(FAKE_OVERRIDE_VALIDATOR, arguments.fakeOverrideValidator) putIfNotNull(PRE_LINK_CACHES, parsePreLinkCachesValue(configuration, arguments.preLinkCaches)) putIfNotNull(OVERRIDE_KONAN_PROPERTIES, parseOverrideKonanProperties(arguments, configuration)) put(DESTROY_RUNTIME_MODE, when (arguments.destroyRuntimeMode) { diff --git a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt index a44e00ce04c..94d56e501df 100644 --- a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt +++ b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt @@ -142,9 +142,12 @@ class K2NativeCompilerArguments : CommonCompilerArguments() { ) var exportedLibraries: Array? = null - @Argument(value="-Xdisable-fake-override-validator", description = "Disable IR fake override validator") + @Argument(value="-Xdisable-fake-override-validator", description = "This option is deprecated") var disableFakeOverrideValidator: Boolean = false + @Argument(value="-Xfake-override-validator", description = "Enable IR fake override validator") + var fakeOverrideValidator: Boolean = false + @Argument( value = "-Xframework-import-header", valueDescription = "
", diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt index cb302eea9e7..821b079779c 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt @@ -16,8 +16,8 @@ class KonanConfigKeys { = CompilerConfigurationKey.create("check dependencies and download the missing ones") val DEBUG: CompilerConfigurationKey = CompilerConfigurationKey.create("add debug information") - val DISABLE_FAKE_OVERRIDE_VALIDATOR: CompilerConfigurationKey - = CompilerConfigurationKey.create("disable fake override validator") + val FAKE_OVERRIDE_VALIDATOR: CompilerConfigurationKey + = CompilerConfigurationKey.create("fake override validator") val DISABLED_PHASES: CompilerConfigurationKey> = CompilerConfigurationKey.create("disable backend phases") val BITCODE_EMBEDDING_MODE: CompilerConfigurationKey diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt index 1f2e0d02a96..882b92d5d45 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt @@ -175,7 +175,7 @@ internal fun Context.psiToIr( val modules = if (isProducingLibrary) emptyMap() else (irDeserializer as KonanIrLinker).modules - if (!config.configuration.getBoolean(KonanConfigKeys.DISABLE_FAKE_OVERRIDE_VALIDATOR)) { + if (config.configuration.getBoolean(KonanConfigKeys.FAKE_OVERRIDE_VALIDATOR)) { val fakeOverrideChecker = FakeOverrideChecker(KonanManglerIr, KonanManglerDesc) modules.values.forEach { fakeOverrideChecker.check(it) } }