From 9acdcc7590b73f6eedc1919eccb90ff5c8245b56 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Sat, 7 Aug 2021 08:58:22 +0300 Subject: [PATCH] JVM_IR KT-47984 minor cleanup --- .../org/jetbrains/kotlin/codegen/inline/StackSizeCalculator.kt | 2 +- .../codegen/box/inlineArgsInPlace/breakInArgumentExpression.kt | 1 + .../box/inlineArgsInPlace/continueInArgumentExpression.kt | 1 + compiler/testData/codegen/box/inlineArgsInPlace/mapSet.kt | 1 + .../box/inlineArgsInPlace/mutableCollectionPlusAssign.kt | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/StackSizeCalculator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/StackSizeCalculator.kt index 9a938a55e84..88916855b5d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/StackSizeCalculator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/StackSizeCalculator.kt @@ -71,7 +71,7 @@ internal class StackSizeCalculator(owner: String, method: MethodNode) : } override fun merge(frame: Frame, interpreter: Interpreter): Boolean { - throw UnsupportedOperationException("Stack normalization should not merge frames") + throw UnsupportedOperationException("Stack size calculator should not merge frames") } fun getActualStackSize() = super.getStackSize() + extraStack.sumOf { it.size } diff --git a/compiler/testData/codegen/box/inlineArgsInPlace/breakInArgumentExpression.kt b/compiler/testData/codegen/box/inlineArgsInPlace/breakInArgumentExpression.kt index 5ebb65705a2..efc943598e0 100644 --- a/compiler/testData/codegen/box/inlineArgsInPlace/breakInArgumentExpression.kt +++ b/compiler/testData/codegen/box/inlineArgsInPlace/breakInArgumentExpression.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND: WASM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/inlineArgsInPlace/continueInArgumentExpression.kt b/compiler/testData/codegen/box/inlineArgsInPlace/continueInArgumentExpression.kt index 31b198bc73d..53316451492 100644 --- a/compiler/testData/codegen/box/inlineArgsInPlace/continueInArgumentExpression.kt +++ b/compiler/testData/codegen/box/inlineArgsInPlace/continueInArgumentExpression.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND: WASM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/inlineArgsInPlace/mapSet.kt b/compiler/testData/codegen/box/inlineArgsInPlace/mapSet.kt index 2b371889631..89fc20a423f 100644 --- a/compiler/testData/codegen/box/inlineArgsInPlace/mapSet.kt +++ b/compiler/testData/codegen/box/inlineArgsInPlace/mapSet.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND: WASM // FULL_JDK // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt b/compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt index e52062c2c04..660072bb08e 100644 --- a/compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt +++ b/compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND: WASM // FULL_JDK // WITH_RUNTIME