From 60fb50aeb72360813ba6dd8187fe215b2e40c1b1 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 28 Jun 2019 14:48:06 +0300 Subject: [PATCH] Resurrect -Xprint-ir flag. (#3127) --- .../src/org/jetbrains/kotlin/cli/bc/K2Native.kt | 4 +--- .../kotlin/cli/bc/K2NativeCompilerArguments.kt | 3 ++- .../org/jetbrains/kotlin/backend/konan/Context.kt | 12 ------------ 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt index d2e9268944f..649448897d1 100644 --- a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt +++ b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt @@ -218,9 +218,7 @@ class K2Native : CLICompiler() { } } - override fun createArguments(): K2NativeCompilerArguments { - return K2NativeCompilerArguments() - } + override fun createArguments() = K2NativeCompilerArguments() override fun executableScriptFileName() = "kotlinc-native" diff --git a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt index 6736a091073..d80538b2c65 100644 --- a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt +++ b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.cli.bc -import org.jetbrains.kotlin.backend.konan.TestRunnerKind import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.Argument import org.jetbrains.kotlin.cli.common.messages.MessageCollector @@ -198,6 +197,8 @@ class K2NativeCompilerArguments : CommonCompilerArguments() { super.configureAnalysisFlags(collector).also { val useExperimental = it[AnalysisFlags.useExperimental] as List<*> it[AnalysisFlags.useExperimental] = useExperimental + listOf("kotlin.ExperimentalUnsignedTypes") + if (printIr) + phasesToDumpAfter = arrayOf("ALL") } } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt index bcde4e16628..db01232b510 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt @@ -427,20 +427,8 @@ internal class Context(config: KonanConfig) : KonanBackendContext(config) { printIr() printBitCode() } - - fun shouldVerifyDescriptors() = config.configuration.getBoolean(KonanConfigKeys.VERIFY_DESCRIPTORS) - - fun shouldVerifyIr() = config.configuration.getBoolean(KonanConfigKeys.VERIFY_IR) - fun shouldVerifyBitCode() = config.configuration.getBoolean(KonanConfigKeys.VERIFY_BITCODE) - fun shouldPrintDescriptors() = config.configuration.getBoolean(KonanConfigKeys.PRINT_DESCRIPTORS) - - fun shouldPrintIr() = config.configuration.getBoolean(KonanConfigKeys.PRINT_IR) - - fun shouldPrintIrWithDescriptors()= - config.configuration.getBoolean(KonanConfigKeys.PRINT_IR_WITH_DESCRIPTORS) - fun shouldPrintBitCode() = config.configuration.getBoolean(KonanConfigKeys.PRINT_BITCODE) fun shouldPrintLocations() = config.configuration.getBoolean(KonanConfigKeys.PRINT_LOCATIONS)