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

Made -Xfake-override-validator off by default

Browse Source 
Deprected -Xdisable-fake-override-validator

(cherry picked from commit 0abe4e46c497645b07e9e55088135813bd1a7437)
This commit is contained in:
Alexander Gorshenev
2020-11-14 03:31:07 +03:00
committed by Stanislav Erokhin
parent 10a1ea9091
commit 07db1de4da
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
+1 -1
View File
@@ -248,7 +248,7 @@ class K2Native : CLICompiler<K2NativeCompilerArguments>() {
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) {
kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt
+4 -1
View File
@@ -142,9 +142,12 @@ class K2NativeCompilerArguments : CommonCompilerArguments() {
)
var exportedLibraries: Array<String>? = 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 = "<header>",
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt
+2 -2
View File
@@ -16,8 +16,8 @@ class KonanConfigKeys {
= CompilerConfigurationKey.create("check dependencies and download the missing ones")
val DEBUG: CompilerConfigurationKey<Boolean>
= CompilerConfigurationKey.create("add debug information")
val DISABLE_FAKE_OVERRIDE_VALIDATOR: CompilerConfigurationKey<Boolean>
= CompilerConfigurationKey.create("disable fake override validator")
val FAKE_OVERRIDE_VALIDATOR: CompilerConfigurationKey<Boolean>
= CompilerConfigurationKey.create("fake override validator")
val DISABLED_PHASES: CompilerConfigurationKey<List<String>>
= CompilerConfigurationKey.create("disable backend phases")
val BITCODE_EMBEDDING_MODE: CompilerConfigurationKey<BitcodeEmbedding.Mode>
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/PsiToIr.kt
+1 -1
View File
@@ -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) }
}