From f0e64f8e389c9539b2889a55f690d19407f85e1e Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Mon, 6 Jun 2016 12:42:39 +0300 Subject: [PATCH] JS/Inlining: rename IneffectiveStatementElimination to RedundantStatementElimination --- .../jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt | 2 +- ...StatementElimination.kt => RedundantStatementElimination.kt} | 2 +- ...tEliminationTest.kt => RedundantStatementEliminationTest.kt} | 2 +- .../binary.optimized.js | 0 .../binary.original.js | 0 .../conditional.optimized.js | 0 .../conditional.original.js | 0 .../literal.optimized.js | 0 .../literal.original.js | 0 .../parameters.optimized.js | 0 .../parameters.original.js | 0 .../unary.optimized.js | 0 .../unary.original.js | 0 13 files changed, 3 insertions(+), 3 deletions(-) rename js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/{IneffectiveStatementElimination.kt => RedundantStatementElimination.kt} (99%) rename js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/{IneffectiveStatementEliminationTest.kt => RedundantStatementEliminationTest.kt} (89%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/binary.optimized.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/binary.original.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/conditional.optimized.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/conditional.original.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/literal.optimized.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/literal.original.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/parameters.optimized.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/parameters.original.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/unary.optimized.js (100%) rename js/js.translator/testData/js-optimizer/{ineffective-statement-elimination => redundant-statement-elimination}/unary.original.js (100%) diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt index 9a1938d6326..9d06f8fb366 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/FunctionPostProcessor.kt @@ -26,7 +26,7 @@ class FunctionPostProcessor(root: JsFunction) { { IfStatementReduction(root.body).apply() }, { DeadCodeElimination(root.body).apply() }, { RedundantVariableDeclarationElimination(root.body).apply() }, - { IneffectiveStatementElimination(root).apply() } + { RedundantStatementElimination(root).apply() } ) // TODO: reduce to A || B, A && B if possible diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/IneffectiveStatementElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantStatementElimination.kt similarity index 99% rename from js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/IneffectiveStatementElimination.kt rename to js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantStatementElimination.kt index c612300231f..20dc6782661 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/IneffectiveStatementElimination.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/RedundantStatementElimination.kt @@ -23,7 +23,7 @@ import com.google.dart.compiler.backend.js.ast.metadata.synthetic import org.jetbrains.kotlin.js.inline.util.collectLocalVariables import org.jetbrains.kotlin.js.translate.utils.JsAstUtils -class IneffectiveStatementElimination(private val root: JsFunction) { +class RedundantStatementElimination(private val root: JsFunction) { private val localVars = root.collectLocalVariables() private var hasChanges = false diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/IneffectiveStatementEliminationTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/RedundantStatementEliminationTest.kt similarity index 89% rename from js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/IneffectiveStatementEliminationTest.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/RedundantStatementEliminationTest.kt index c88c2fa1ed4..7bba254de7b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/IneffectiveStatementEliminationTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/optimizer/RedundantStatementEliminationTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.optimizer import org.junit.Test -class IneffectiveStatementEliminationTest() : BasicOptimizerTest("ineffective-statement-elimination") { +class RedundantStatementEliminationTest() : BasicOptimizerTest("redundant-statement-elimination") { @Test fun binary() = box() @Test fun unary() = box() diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/binary.optimized.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/binary.optimized.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/binary.optimized.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/binary.optimized.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/binary.original.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/binary.original.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/binary.original.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/binary.original.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/conditional.optimized.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/conditional.optimized.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/conditional.optimized.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/conditional.optimized.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/conditional.original.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/conditional.original.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/conditional.original.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/conditional.original.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/literal.optimized.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/literal.optimized.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/literal.optimized.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/literal.optimized.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/literal.original.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/literal.original.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/literal.original.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/literal.original.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/parameters.optimized.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/parameters.optimized.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/parameters.optimized.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/parameters.optimized.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/parameters.original.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/parameters.original.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/parameters.original.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/parameters.original.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/unary.optimized.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/unary.optimized.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/unary.optimized.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/unary.optimized.js diff --git a/js/js.translator/testData/js-optimizer/ineffective-statement-elimination/unary.original.js b/js/js.translator/testData/js-optimizer/redundant-statement-elimination/unary.original.js similarity index 100% rename from js/js.translator/testData/js-optimizer/ineffective-statement-elimination/unary.original.js rename to js/js.translator/testData/js-optimizer/redundant-statement-elimination/unary.original.js