From 764c506aaad8b603aa8b7c9982175d556d6a2bc2 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 23 Apr 2015 20:56:39 +0300 Subject: [PATCH] JS: do not generate break for top level return during inline --- .../kotlin/js/inline/FunctionInlineMutator.kt | 7 ++++ .../kotlin/js/inline/util/collectUtils.kt | 2 +- .../util/collectors/InstanceCollector.kt | 16 +++++++- .../InlineSizeReductionTestGenerated.java | 6 +++ .../js/test/utils/DirectiveTestUtils.java | 7 +++- .../inlineSizeReduction/cases/lastBreak.kt | 37 +++++++++++++++++++ 6 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt index b805e95c11e..8f4a9e57a8c 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt @@ -132,6 +132,13 @@ class FunctionInlineMutator private (private val call: JsInvocation, private val val visitor = ReturnReplacingVisitor(resultExpr as? JsNameRef, breakName.makeRef()) visitor.accept(body) + + val statements = body.getStatements() + val last = statements.lastOrNull() as? JsBreak + + if (last?.getLabel()?.getName() === breakLabel?.getName()) { + statements.remove(statements.lastIndex) + } } private fun getResultReference(): JsNameRef? { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt index 2f6658df74e..86788a86c3a 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt @@ -69,7 +69,7 @@ public fun collectNamedFunctions(scope: JsNode): IdentityHashMap(klass: Class, scope: JsNode): List { - return with(InstanceCollector(klass)) { + return with(InstanceCollector(klass, visitNestedDeclarations = false)) { accept(scope) collected } diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectors/InstanceCollector.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectors/InstanceCollector.kt index d6f882b74ab..a7576a02ed2 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectors/InstanceCollector.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectors/InstanceCollector.kt @@ -16,13 +16,27 @@ package org.jetbrains.kotlin.js.inline.util.collectors +import com.google.dart.compiler.backend.js.ast.JsFunction import com.google.dart.compiler.backend.js.ast.JsNode +import com.google.dart.compiler.backend.js.ast.JsObjectLiteral import com.google.dart.compiler.backend.js.ast.RecursiveJsVisitor import java.util.ArrayList -class InstanceCollector(val klass: Class) : RecursiveJsVisitor() { +class InstanceCollector(val klass: Class, val visitNestedDeclarations: Boolean) : RecursiveJsVisitor() { public val collected: MutableList = ArrayList() + override fun visitFunction(x: JsFunction) { + if (visitNestedDeclarations) { + visitElement(x) + } + } + + override fun visitObjectLiteral(x: JsObjectLiteral) { + if (visitNestedDeclarations) { + visitElement(x) + } + } + override fun visitElement(node: JsNode) { if (klass.isInstance(node)) { collected.add(klass.cast(node)!!) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineSizeReductionTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineSizeReductionTestGenerated.java index 0f622f0aa01..a456338cdb5 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineSizeReductionTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineSizeReductionTestGenerated.java @@ -35,6 +35,12 @@ public class InlineSizeReductionTestGenerated extends AbstractInlineSizeReductio JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineSizeReduction/cases"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("lastBreak.kt") + public void testLastBreak() throws Exception { + String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt"); + doTest(fileName); + } + @TestMetadata("oneTopLevelReturn.kt") public void testOneTopLevelReturn() throws Exception { String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/oneTopLevelReturn.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java index 6dd2986706c..a093a10fe8c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java @@ -104,8 +104,8 @@ public class DirectiveTestUtils { String countStr = arguments.getNamedArgument("count"); int expectedCount = Integer.valueOf(countStr); - JsNode scope = AstSearchUtil.getFunction(ast, functionName); - List nodes = collectInstances(klass, scope); + JsFunction function = AstSearchUtil.getFunction(ast, functionName); + List nodes = collectInstances(klass, function.getBody()); int actualCount = 0; for (T node : nodes) { @@ -138,6 +138,8 @@ public class DirectiveTestUtils { private static final DirectiveHandler COUNT_VARS = new CountNodesDirective("CHECK_VARS_COUNT", JsVars.JsVar.class); + private static final DirectiveHandler COUNT_BREAKS = new CountNodesDirective("CHECK_BREAKS_COUNT", JsBreak.class); + private static final DirectiveHandler HAS_INLINE_METADATA = new DirectiveHandler("CHECK_HAS_INLINE_METADATA") { @Override void processEntry(@NotNull JsNode ast, @NotNull ArgumentsHelper arguments) throws Exception { @@ -166,6 +168,7 @@ public class DirectiveTestUtils { FUNCTIONS_HAVE_SAME_LINES, COUNT_LABELS, COUNT_VARS, + COUNT_BREAKS, HAS_INLINE_METADATA, HAS_NO_INLINE_METADATA ); diff --git a/js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt b/js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt new file mode 100644 index 00000000000..6ed748b76bd --- /dev/null +++ b/js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt @@ -0,0 +1,37 @@ +package foo + +// CHECK_NOT_CALLED: f1 +// CHECK_NOT_CALLED: f2 +// CHECK_BREAKS_COUNT: function=test count=3 + +var even = arrayListOf() +var odd = arrayListOf() + +inline fun f2(x: Int): Unit { + if (x % 2 == 0) { + even.add(x) + return + } + + odd.add(x) + return +} + +inline fun f1(x: Boolean, y: Int, z: Int): Unit { + if (x) { + return f2(y) + } + + return f2(z) +} + +fun test(x: Boolean, y: Int, z: Int): Unit = f1(x, y, z) + +fun box(): String { + test(true, 2, 1) + test(false, 2, 1) + assertEquals(listOf(2), even) + assertEquals(listOf(1), odd) + + return "OK" +} \ No newline at end of file