From 4cb5a4fb6d7c1acd4a5410e81885dc4e5872f437 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 26 Mar 2019 17:08:26 +0100 Subject: [PATCH] Fix misc typos in IR backends --- .../kotlin/cli/common/arguments/CommonCompilerArguments.kt | 2 +- .../kotlin/backend/jvm/lower/CallableReferenceLowering.kt | 2 +- .../src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt | 2 +- compiler/testData/cli/js/jsExtraHelp.out | 2 +- compiler/testData/cli/jvm/extraHelp.out | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt index ba494948e33..8c939b69dce 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt @@ -270,7 +270,7 @@ abstract class CommonCompilerArguments : CommonToolArguments() { @Argument( value = "-Xcheck-sticky-phase-conditions", - description = "Run sticky condition checks on subsequent phases as well. Implies -Xcheck-conditions" + description = "Run sticky condition checks on subsequent phases as well. Implies -Xcheck-phase-conditions" ) var checkStickyPhaseConditions: Boolean by FreezableVar(false) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt index 0986c4c7233..5c4fb04aa5d 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt @@ -213,7 +213,7 @@ internal class CallableReferenceLowering(val context: JvmBackendContext) : FileL val lastParameterType = unboundCalleeParameters.lastOrNull()?.type if ((lastParameterType as? IrSimpleType)?.classifier == continuationClass) { // If the last parameter is Continuation<> inherit from SuspendFunction. - suspendFunctionClass = context.getIrClass(FqName("kotlin.Suspendfunction${numberOfParameters - 1}")).owner + suspendFunctionClass = context.getIrClass(FqName("kotlin.coroutines.SuspendFunction${numberOfParameters - 1}")).owner val suspendFunctionClassTypeParameters = functionParameterTypes.dropLast(1) + (lastParameterType.arguments.single() as IrTypeProjection).type functionReferenceClassSuperTypes += IrSimpleTypeImpl( diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt index 710cec1dd41..824f0dc98d5 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltIns.kt @@ -245,6 +245,6 @@ class IrBuiltIns( const val THROW_CCE = "THROW_CCE" const val THROW_ISE = "THROW_ISE" const val NO_WHEN_BRANCH_MATCHED_EXCEPTION = "noWhenBranchMatchedException" - const val ILLEGAL_ARGUMENT_EXCEPTION = "illegalArgumentException " + const val ILLEGAL_ARGUMENT_EXCEPTION = "illegalArgumentException" } } diff --git a/compiler/testData/cli/js/jsExtraHelp.out b/compiler/testData/cli/js/jsExtraHelp.out index 579140b19ff..da62f1b0172 100644 --- a/compiler/testData/cli/js/jsExtraHelp.out +++ b/compiler/testData/cli/js/jsExtraHelp.out @@ -7,7 +7,7 @@ where advanced options include: -Xallow-result-return-type Allow compiling code when `kotlin.Result` is used as a return type -Xcheck-phase-conditions Check pre- and postconditions on phases -Xcheck-sticky-phase-conditions - Run sticky condition checks on subsequent phases as well. Implies -Xcheck-conditions + Run sticky condition checks on subsequent phases as well. Implies -Xcheck-phase-conditions -Xcommon-sources= Sources of the common module that need to be compiled together with this module in the multi-platform mode. Should be a subset of sources passed as free arguments -Xcoroutines={enable|warn|error} diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out index 7f572b3cbbb..fedea193b4a 100644 --- a/compiler/testData/cli/jvm/extraHelp.out +++ b/compiler/testData/cli/jvm/extraHelp.out @@ -73,7 +73,7 @@ where advanced options include: -Xallow-result-return-type Allow compiling code when `kotlin.Result` is used as a return type -Xcheck-phase-conditions Check pre- and postconditions on phases -Xcheck-sticky-phase-conditions - Run sticky condition checks on subsequent phases as well. Implies -Xcheck-conditions + Run sticky condition checks on subsequent phases as well. Implies -Xcheck-phase-conditions -Xcommon-sources= Sources of the common module that need to be compiled together with this module in the multi-platform mode. Should be a subset of sources passed as free arguments -Xcoroutines={enable|warn|error}